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/1630] 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 6b42a4f1d..fe992cf35 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 000000000..0a02880b5 --- /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 000000000..7c86a374b --- /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 000000000..c8b550b51 --- /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 000000000..682c633f0 --- /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 000000000..2529011af --- /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 000000000..14faf1990 --- /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 000000000..878ae616b --- /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 000000000..63835bd3f --- /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 000000000..b669b1214 --- /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/1630] 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 000000000..677f54ac8 --- /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 000000000..f720d59e1 --- /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 000000000..b5ee4a5c8 --- /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 000000000..5cd87288b --- /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 000000000..8f580e093 --- /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 000000000..c8453a0e8 --- /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 000000000..8132b8c88 --- /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 000000000..cee5bbbfd --- /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 000000000..1549d28dc --- /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 000000000..9bb8c94ad --- /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 000000000..fda7078f3 --- /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 000000000..42b726877 --- /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 000000000..5efedcc5f --- /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 000000000..af65cff6f --- /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 000000000..e772d467d --- /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 000000000..e772d467d --- /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 000000000..52547b474 --- /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 000000000..69d2a883e --- /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/1630] 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 000000000..0930f1923 --- /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 000000000..331965c22 --- /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 000000000..0cee0d3be --- /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 000000000..84fed5ac3 --- /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 000000000..d5ac3adc2 --- /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/1630] 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 000000000..5e38d0589 --- /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 000000000..47098b07f --- /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 000000000..98f4b55f7 --- /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 000000000..bb1454387 --- /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 000000000..a7cb996b6 --- /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 000000000..d04da1db8 --- /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 000000000..ed7a36020 --- /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 000000000..e13742a10 --- /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 000000000..2fc2077fb --- /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 000000000..6a0aadafd --- /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 000000000..227966166 --- /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 000000000..9987e3e40 --- /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 000000000..48c97dfcc --- /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 000000000..43aa78d08 --- /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/1630] 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 000000000..edab80536 --- /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 000000000..c3e298cb9 --- /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 000000000..ddbb4eaa3 --- /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 000000000..14d85ad18 --- /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 000000000..ef1fb9385 --- /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 000000000..0944cf758 --- /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 000000000..ab0ca0e3f --- /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 000000000..9a89b2e56 --- /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 000000000..c0fd312b0 --- /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 000000000..38f83596c --- /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 000000000..1ed8778d8 --- /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 000000000..82b0d51cc --- /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 000000000..56e0706e2 --- /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 000000000..42326bdcb --- /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 000000000..7e996bb40 --- /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 000000000..a9d8bf775 --- /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 000000000..1c5af18a7 --- /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 000000000..a97933bd3 --- /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 000000000..d62f88b1f --- /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 000000000..916d6991c --- /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 000000000..82cf24395 --- /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 000000000..0e012f7d3 --- /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 000000000..126a09261 --- /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 000000000..29ac52ffb --- /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 000000000..adc9d7b47 --- /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 000000000..0ae6f8501 --- /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 000000000..9ea5cbf92 --- /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 000000000..103ec392a --- /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 000000000..27bb4b36f --- /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 000000000..da4f9e252 --- /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 000000000..b0df2ba53 --- /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 000000000..ed94a250b --- /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 000000000..43731998f --- /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 000000000..f565545f5 --- /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 000000000..0bb953399 --- /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 000000000..d9197f538 --- /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 000000000..f41c0de56 --- /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 000000000..992700b0b --- /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 000000000..28a1b63d1 --- /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 000000000..afa0f628a --- /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 000000000..babaa3eb9 --- /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 000000000..dcbb8d751 --- /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 000000000..140463f79 --- /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 000000000..bff9710a2 --- /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 000000000..4a1b0797d --- /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 000000000..07b8fe6de --- /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 000000000..bb9d7d72e --- /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 000000000..2d7fde53d --- /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 000000000..6aecca7bb --- /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 000000000..b11b6fb8c --- /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 000000000..fa6d9fde2 --- /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 000000000..8a679479f --- /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 000000000..a26a8cf90 --- /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 000000000..93131e26f --- /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 000000000..a9bcacfb5 --- /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 000000000..bdc4599f0 --- /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 000000000..971d344a9 --- /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 000000000..037ab46a0 --- /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 000000000..054ffd89d --- /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 000000000..eb948d080 --- /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 000000000..ffb27ad9e --- /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 000000000..dad6d4c8a --- /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 000000000..fcb0b474e --- /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 000000000..c6118b8a0 --- /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/1630] 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 b5ee4a5c8..000000000 --- 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 000000000..12773dd61 --- /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 cee5bbbfd..bd811d9c1 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 e772d467d..000000000 --- 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/1630] 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 000000000..26cb84ede --- /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 000000000..46295c658 --- /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 000000000..a4e65f92f --- /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/1630] 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 1e49ae91f..252cd0bc1 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/1630] 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 878ae616b..246dd2f9f 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 63835bd3f..d2be3f510 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 b669b1214..dd17bf314 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 af65cff6f..1cab6be36 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 52547b474..776e5703e 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 69d2a883e..10209cb4d 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 331965c22..ed06f02bc 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 0cee0d3be..c44c27cc0 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 29ac52ffb..6d5b8c69e 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 adc9d7b47..c68901354 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 9ea5cbf92..9e3ea1bee 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 103ec392a..53b42b6e7 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 27bb4b36f..43b6de6d4 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 da4f9e252..7b30715e6 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 b0df2ba53..000000000 --- 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 ed94a250b..f10eb83b7 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 bdc4599f0..6fc248c7a 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 971d344a9..6979ce5e9 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 054ffd89d..a59f005c1 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 eb948d080..595c280e7 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 ffb27ad9e..bd671e53b 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 dad6d4c8a..e8ae01b98 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 fcb0b474e..000000000 --- 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 c6118b8a0..584d2805a 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/1630] 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 000000000..a851db885 --- /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 000000000..0e4514f5b --- /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/1630] 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 8f580e093..ce324ec41 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/1630] 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 c44c27cc0..4116f5d9c 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/1630] 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 4116f5d9c..e6b8845cd 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/1630] 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 ce324ec41..f9a20d5b8 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/1630] 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/1630] 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 b92e7fe54..e772d467d 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/1630] 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 e6b8845cd..7673bcfb5 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/1630] 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 d4788c882..8960e5635 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/1630] 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 bf13cd47d..90db57178 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/1630] 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 000000000..925faa5b6 --- /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 96d4b3691..6ba4e8aef 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/1630] 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 bd811d9c1..58a718b95 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/1630] 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 41b780da6..e3b5159f7 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 8960e5635..af4cb95e6 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 90db57178..93e676a12 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/1630] 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 93e676a12..7c10d5c35 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/1630] 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 9ceeb61f6..a3e11fc1d 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/1630] 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 5265a5350..fb7aafe78 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 b75473753..1c974b969 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 3bed7dd59..cfd516bf9 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 c426ffdf8..a88f95d82 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/1630] 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 9d8718556..d5d7ebdb1 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/1630] 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 d5d7ebdb1..fc9cfada3 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/1630] 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 fc9cfada3..44eecb3ad 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/1630] 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 44eecb3ad..107ef7067 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/1630] 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 107ef7067..cb5249b7c 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/1630] 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 1bc6766b7..451034b76 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/1630] 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 000000000..d157119fb --- /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 000000000..722d01a3a --- /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/1630] 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 cfd516bf9..14d2f7f61 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/1630] 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 191a07931..ee1aeb38f 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/1630] 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 28a1b63d1..2907b3646 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/1630] 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 7e3bea16b..97412d3ed 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/1630] 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 7e3bea16b..97412d3ed 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/1630] 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 ee1aeb38f..692bc78cd 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/1630] 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 af4cb95e6..d1e159407 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/1630] 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 2907b3646..feda34074 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/1630] 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 a4e65f92f..fa057f504 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/1630] 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 d1e159407..caed106e9 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/1630] 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 916d6991c..03e4a387b 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 8a679479f..c80c07793 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/1630] 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 191a07931..692bc78cd 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 cfd516bf9..14d2f7f61 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/1630] 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 82b0d51cc..c279c8be3 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 bff9710a2..569aef499 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/1630] 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 dec6b2572..edf825f42 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/1630] 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 000000000..72a0fcccf --- /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 000000000..7aa9811ef --- /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/1630] 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 72a0fcccf..948726191 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/1630] 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 692bc78cd..4c1d9a8bf 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/1630] 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 4c1d9a8bf..c23d3793c 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/1630] 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 c23d3793c..042631fa0 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/1630] 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 a88f95d82..99c8df769 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/1630] 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 a88f95d82..99c8df769 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/1630] 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 692bc78cd..41e7790ca 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/1630] 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 042631fa0..cafe72b68 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/1630] 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 41e7790ca..36eb1b88f 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/1630] 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 cafe72b68..ba86fb23c 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/1630] 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 edf825f42..bc3c90e73 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/1630] 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 03e4a387b..e4d5bf1e3 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/1630] 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 c80c07793..eb63e3ffc 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/1630] 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 ab0ca0e3f..e1850e0a8 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 2907b3646..324936e7c 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/1630] 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 e1850e0a8..c515d6797 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/1630] 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 d62f88b1f..8c5b420a2 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 fa6d9fde2..c0eafc3e2 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/1630] 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 8c5b420a2..45a435591 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/1630] 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 bc3c90e73..6d85fce5b 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/1630] 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 2529011af..782a7db1d 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/1630] 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 126a09261..91797a380 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 a9bcacfb5..a6c6df6e8 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/1630] 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 451034b76..b7a169b66 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/1630] 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 c279c8be3..56d58200b 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 45a435591..489560460 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 569aef499..09ab7a55b 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/1630] 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 56d58200b..d2590140d 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/1630] 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 782a7db1d..0a809a460 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/1630] 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 0a809a460..4aeaa243f 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/1630] 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 4aeaa243f..e2a767025 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/1630] 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 06f0ae03a..90467bcda 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/1630] 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 e2a767025..7cfba01bc 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/1630] 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 7cfba01bc..ce16198f8 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/1630] 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 ce16198f8..8237afbcd 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/1630] 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 8237afbcd..79d2f3867 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/1630] 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 79d2f3867..debabcbe0 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/1630] 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 debabcbe0..51e394f18 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/1630] 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 51e394f18..05c8b4fa7 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/1630] 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 caed106e9..e14fab282 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/1630] 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 c0eafc3e2..8190ebef2 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/1630] 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 7c10d5c35..7e41c01c9 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/1630] 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 e14fab282..13084bcc5 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/1630] 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 05c8b4fa7..c7421e613 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/1630] 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 6d85fce5b..a605d19e2 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/1630] 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 eb63e3ffc..7f48f6ce8 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 a6c6df6e8..7e98496d3 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/1630] 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 d2590140d..a5c040e01 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 09ab7a55b..23bf9ea72 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/1630] 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 a5c040e01..bfb28ea20 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/1630] 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 c7421e613..d679c3c9d 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/1630] 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 451034b76..b7a169b66 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/1630] 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 c515d6797..0b8d3e62b 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 90467bcda..02600b302 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/1630] 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 0b8d3e62b..5b4ebc0de 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/1630] 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 7e98496d3..2288bd827 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/1630] 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 91797a380..04c68c6b2 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/1630] 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 e4d5bf1e3..04864a0bd 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/1630] 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 489560460..58ec1825a 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/1630] 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 8190ebef2..859667a1d 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/1630] 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 7e41c01c9..37039d673 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/1630] 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 13084bcc5..d3e5fb5f8 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/1630] 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 7f48f6ce8..b0ed1fd17 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/1630] 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 04864a0bd..2a8760109 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/1630] 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 2fc2077fb..934bb5937 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/1630] 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 2a8760109..5047698dd 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/1630] 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 04c68c6b2..08634021d 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/1630] 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 b0ed1fd17..93d07643a 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/1630] 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 2288bd827..2c30fa268 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/1630] 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 d3e5fb5f8..45f655404 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/1630] 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 ba86fb23c..1ba474c2d 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/1630] 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 45f655404..a07cdde45 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/1630] 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 37039d673..26576b28b 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/1630] 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 93d07643a..040c9e902 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/1630] 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 08634021d..c286daf0c 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/1630] 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 5b4ebc0de..6423ededf 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 58ec1825a..f7e938e27 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 04864a0bd..e6d259d10 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 04c68c6b2..145d21930 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 afa0f628a..623f282e8 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 859667a1d..2eb43e814 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 7f48f6ce8..040c9e902 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 2288bd827..81c88b5da 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/1630] 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 6423ededf..1b747720e 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 f7e938e27..58ec1825a 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 02600b302..35a3126c0 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/1630] 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 aa03ffa03..3f9b12048 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/1630] 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 040c9e902..de510c02e 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 2ff460cf0..63f40a318 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/1630] 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 58ec1825a..7673bf3f8 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/1630] 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 e6d259d10..6202b9e00 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/1630] 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 de510c02e..00e34f099 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/1630] 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 00e34f099..89ea01b3e 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/1630] 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 000000000..a8ffeb018 --- /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 000000000..c7c85163a --- /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 000000000..08bdd8de2 --- /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 000000000..3c3629e64 --- /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 000000000..4f9f8bf48 --- /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 000000000..c7c85163a --- /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 000000000..3514c63d7 --- /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 000000000..95cba3d13 --- /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 000000000..130ba4c90 --- /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 000000000..568554fc2 --- /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 000000000..f49122be0 --- /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 000000000..d19b007b1 --- /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 000000000..4cbfa5d6b --- /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 000000000..f6382bba4 --- /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 000000000..e7290ac10 --- /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 000000000..1fd5f4f29 --- /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 000000000..63d942602 --- /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 000000000..9f6c78bb9 --- /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 000000000..e261ae124 --- /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 000000000..6abd99f73 --- /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/1630] 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 7673bf3f8..814294602 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/1630] 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 6202b9e00..1ba64860f 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/1630] 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 e4ee1ec43..19d53a921 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/1630] 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 a605d19e2..e510c1f5f 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/1630] 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 3f9b12048..f21b13c61 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/1630] 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 63f40a318..d9cc2c71e 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/1630] 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 814294602..7673bf3f8 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/1630] 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 1ba64860f..6202b9e00 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/1630] 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 934bb5937..92cc46f0a 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/1630] 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 1ba474c2d..04ae86179 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/1630] 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 bfb28ea20..ffccd6f32 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 23bf9ea72..58746df3d 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/1630] 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 a605d19e2..8d26beada 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/1630] 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 d9cc2c71e..b71c21112 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/1630] 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 89ea01b3e..0a9d59548 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/1630] 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 4f9f8bf48..6cacf563a 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 568554fc2..dde984815 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 f49122be0..adfe942c2 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 6abd99f73..04493197b 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/1630] 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 a07cdde45..11585473f 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/1630] 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 10efb9dd0..1206b9c14 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 a8ffeb018..08a376d4b 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 c7c85163a..37c7dacde 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/1630] 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 04ae86179..184349795 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/1630] 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 b534e2539..567d3f370 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 dde984815..4a3de901e 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/1630] 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 4a3de901e..fbca112b2 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/1630] 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 fbca112b2..f26600455 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/1630] 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 f26600455..5650a688d 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/1630] 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 5650a688d..7be27fe4a 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/1630] 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 7be27fe4a..51ad3e77f 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/1630] 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 62120fe55..7ae90cd69 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/1630] 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 51ad3e77f..c105d8577 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/1630] 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 c105d8577..2b631763a 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/1630] 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 2b631763a..790fdfe5d 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/1630] 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 790fdfe5d..bb24594fe 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/1630] 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 bb24594fe..fd917f0d0 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/1630] 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 fd917f0d0..deb7fac03 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/1630] 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 11585473f..5cebec1ad 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/1630] 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 7ae90cd69..b1376b466 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/1630] 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 e3b5159f7..369439319 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/1630] 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 92cc46f0a..220238466 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/1630] 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 5cebec1ad..3c722be36 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/1630] 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 1b747720e..63bb701f7 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/1630] 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 35a3126c0..8392f2ced 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/1630] 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 8392f2ced..8918f8ac8 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/1630] 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 63bb701f7..f481dc6af 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/1630] 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 8918f8ac8..66a37eb85 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/1630] 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 66a37eb85..cf3f594fc 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/1630] 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 220238466..6f0adc036 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/1630] 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 6f0adc036..8cf860fde 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/1630] 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 8cf860fde..e924dab80 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/1630] 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 e924dab80..2d3bc9dc2 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/1630] 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 2d3bc9dc2..eb8a37c7b 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/1630] 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 3c722be36..5cebec1ad 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/1630] 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 6202b9e00..bc5164251 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/1630] 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 5cebec1ad..e6805440a 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/1630] 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 e6805440a..5cebec1ad 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/1630] 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 cf3f594fc..13372fd2d 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/1630] 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 b71c21112..99aa26adf 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/1630] 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 ffccd6f32..2c969ef2a 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/1630] 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 5cebec1ad..2e5b880cc 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/1630] 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 2c969ef2a..25d97bd4f 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/1630] 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 13372fd2d..df0979d97 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 473cd68da3900fe169a248b8ffcc0010979981e4 Mon Sep 17 00:00:00 2001 From: egovmis Date: Sun, 6 Sep 2020 13:09:58 +0530 Subject: [PATCH 0181/1630] pdf for property-receipt and consolidated --- configs/pdf-service/format-config/consolidatedreceipt.json | 2 +- configs/pdf-service/format-config/property-receipt.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index df0979d97..02777ea3f 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -27,7 +27,7 @@ "style": "receipt-logo-header" }, { - "text": "{{serviceType}} {{payment_receipt}} (Citizen Copy)", + "text": "{{serviceType}} {{payment_receipt}} (Employee Copy)", "style": "receipt-logo-sub-header" } ], diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 58746df3d..ac560fffe 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -2,7 +2,7 @@ "key": "property-receipt", "config": { "defaultStyle": { - "font": "Cambay" + "font": "Roboto" }, "content": [ { From 4a15668adc760518c9db0f11c6d8ab0003d26101 Mon Sep 17 00:00:00 2001 From: egovmis Date: Sun, 6 Sep 2020 14:08:54 +0530 Subject: [PATCH 0182/1630] property-receipt pdf change --- configs/pdf-service/format-config/property-receipt.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index ac560fffe..b0071177a 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -710,10 +710,10 @@ "style": "next-noc-table", "table": { "widths": [ + "15%", "*", - "*", - "*", - "*" + "20%", + "20%" ], "body": [ From c7b8427dae5ca026291a0ab017b6fc5c6a6b9889 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sun, 6 Sep 2020 16:01:19 +0530 Subject: [PATCH 0183/1630] removed decryptionPathId from ulblevelstatus_v2 --- 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 2e5b880cc..a1577b030 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -1891,7 +1891,6 @@ ReportDefinitions: - reportName: ULBLevelStatus_v2 - decryptionPathId: ULBLevelStatus_v2 summary: Nummber of applications by there status ULB level version: 1.0.0 moduleName: rainmaker-tl 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 0184/1630] 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 b1376b466..92789adb5 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 5528a4a841bf63809db2bb51c744afd0b3077858 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sun, 6 Sep 2020 16:27:21 +0530 Subject: [PATCH 0185/1630] removed decryptionPathId where not needed --- configs/reports/configs/tl-reports.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index a1577b030..cccba4616 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 @@ -1843,7 +1840,6 @@ ReportDefinitions: - reportName: StateLevelStatus_v2 - decryptionPathId: StateLevelStatus_v2 summary: Nummber of applications by there status state level version: 1.0.0 moduleName: rainmaker-tl @@ -1930,7 +1926,6 @@ ReportDefinitions: - reportName: StateLevelTradeWiseCollection_v2 - decryptionPathId: StateLevelTradeWiseCollection_v2 summary: Collection according to tradeTypes state level version: 1.0.0 moduleName: rainmaker-tl From 243abbe22fa232c44480f51d58a88f061fc426de Mon Sep 17 00:00:00 2001 From: egovmis Date: Sun, 6 Sep 2020 16:29:42 +0530 Subject: [PATCH 0186/1630] pdf change --- .../format-config/property-receipt.json | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index b0071177a..823780d9c 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -2,7 +2,7 @@ "key": "property-receipt", "config": { "defaultStyle": { - "font": "Roboto" + "font": "Cambay" }, "content": [ { @@ -812,7 +812,7 @@ ] }, "block-head": { - "fontSize": 8, + "fontSize": 7, "bold": true, "letterSpacing": 0.74, "margin": [ @@ -823,7 +823,7 @@ ] }, "pt-reciept-citizen-table": { - "fontSize": 8, + "fontSize": 7, "color": "#484848" }, "receipt-assess-table-header": { @@ -833,7 +833,7 @@ }, "receipt-logo-header": { "color": "#000000", - "fontSize": 10, + "fontSize": 8.5, "bold": true, "letterSpacing": 0.74, "margin": [ @@ -845,11 +845,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 +859,7 @@ ] }, "next-noc-table": { - "fontSize": 8, + "fontSize": 7, "color": "#000000", "margin": [ -25, @@ -871,7 +871,7 @@ "receipt-table-value": { "color": "#000000", "bold": true, - "fontSize": 8, + "fontSize": 7, "fontWeight": 500, "margin": [ 8, @@ -883,7 +883,7 @@ "receipt-table": { "color": "#000000", "bold": false, - "fontSize": 8, + "fontSize": 7, "fontWeight": 400, "margin": [ 0, @@ -893,7 +893,7 @@ ] }, "receipt-approver": { - "fontSize": 8, + "fontSize": 7, "bold": true, "margin": [ -27, @@ -904,7 +904,7 @@ "color": "#484848" }, "no-signature": { - "fontSize": 8, + "fontSize": 7, "margin": [ -27, 20, 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 0187/1630] 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 92789adb5..03b578cdd 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 0188/1630] 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 03b578cdd..f1d7666d7 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 0189/1630] 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 f1d7666d7..bf0349deb 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 0190/1630] 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 bf0349deb..48ed2873f 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 0191/1630] 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 48ed2873f..bf0349deb 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 832facad380133334bb0ba4b0baae188b5760639 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 7 Sep 2020 09:36:51 +0530 Subject: [PATCH 0192/1630] Update property-receipt.json --- .../format-config/property-receipt.json | 385 +++++++++--------- 1 file changed, 201 insertions(+), 184 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 823780d9c..e0e384fea 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -72,6 +72,188 @@ "text":"PROPERTY INFORMATION", "style":"block-head" }, + { + "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": {} + }, { "style": "next-noc-table", "table": { @@ -212,188 +394,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 +589,7 @@ "style": "next-noc-table", "table": { "widths": [ - "*","*","*","*","*","*","*","*","*","*" + "8%","8%","8%","8%","8%","8%","8%","8%","8%","8%","8%","*" ], "body": [ @@ -624,6 +625,14 @@ { "text": "Special Category Exemption", "style": "amounts" + }, + { + "text": "Adhoc Penalty", + "style": "amounts" + }, + { + "text": "Adhoc Rebate", + "style": "amounts" }, { "text": "Round Off", @@ -668,6 +677,14 @@ { "text": "{{SpecialCategoryExemption}}", "style": "amounts" + }, + { + "text": "{{adhocPenalty}}", + "style": "amounts" + }, + { + "text": "{{adhocRebate}}", + "style": "amounts" }, { "text": "{{RoundOff}}", @@ -939,4 +956,4 @@ } } } -} \ No newline at end of file +} From 6f7b1762b54477e2d1b8e043c43e00359ba471e7 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 7 Sep 2020 09:38:05 +0530 Subject: [PATCH 0193/1630] Update property-receipt.json --- .../pdf-service/data-config/property-receipt.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 25d97bd4f..93825302d 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", 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 0194/1630] 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 bf0349deb..03b578cdd 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 0195/1630] 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 03b578cdd..fb201165f 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 0196/1630] 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 fb201165f..7c7f7d3bd 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 0197/1630] 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 7c7f7d3bd..70822be36 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 393f00061381c10d5a53288d64eddff35661af38 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 7 Sep 2020 13:58:50 +0530 Subject: [PATCH 0198/1630] removed DecryptionPathId from receiptRegister_V2 --- 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 b1376b466..3c99380e5 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2069,7 +2069,6 @@ ReportDefinitions: - reportName: ReceiptRegister_V2 - decryptionPathId: ReceiptRegister_V2 summary: Receipt Register version: 1.0.0 moduleName: rainmaker-pt 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 0199/1630] 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 70822be36..8c16ba8a6 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 0200/1630] 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 8c16ba8a6..e6e1dac03 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 d9a76e58df161c54d02569a16c2b89a3d9b25554 Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 7 Sep 2020 15:07:02 +0530 Subject: [PATCH 0201/1630] property-receipt changes --- .../format-config/property-receipt.json | 395 +++++++++--------- 1 file changed, 206 insertions(+), 189 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 823780d9c..6c571b19c 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -72,8 +72,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%", @@ -87,7 +269,7 @@ "text": "House/Door No. : ", "border": [ true, - true, + false, false, false ], @@ -97,7 +279,7 @@ "text": "{{doorNo}}", "border": [ false, - true, + false, false, false ], @@ -107,7 +289,7 @@ "text": "Building/Colony Name: ", "border": [ false, - true, + false, false, false ], @@ -117,7 +299,7 @@ "text": "{{buildingName}}", "border": [ false, - true, + false, true, false ], @@ -212,188 +394,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 +589,7 @@ "style": "next-noc-table", "table": { "widths": [ - "*","*","*","*","*","*","*","*","*","*" + "8%","8%","8%","8%","8%","8%","8%","8%","8%","8%","8%","*" ], "body": [ @@ -624,6 +625,14 @@ { "text": "Special Category Exemption", "style": "amounts" + }, + { + "text": "Adhoc Penalty", + "style": "amounts" + }, + { + "text": "Adhoc Rebate", + "style": "amounts" }, { "text": "Round Off", @@ -668,6 +677,14 @@ { "text": "{{SpecialCategoryExemption}}", "style": "amounts" + }, + { + "text": "{{adhocPenalty}}", + "style": "amounts" + }, + { + "text": "{{adhocRebate}}", + "style": "amounts" }, { "text": "{{RoundOff}}", @@ -796,7 +813,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/" ] } ] 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 0202/1630] 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 e6e1dac03..b6052c1d6 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 9961e0f887766f41faf8fde61434a5705b373b81 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 7 Sep 2020 16:36:31 +0530 Subject: [PATCH 0203/1630] Update property-receipt.json --- 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 93825302d..a6746e988 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -480,6 +480,10 @@ "variable":"website", "value":"$.MdmsRes.tenant.tenants[0].domainUrl" }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.ulbGrade" + }, { "variable":"email", "value":"$.MdmsRes.tenant.tenants[0].emailId" From fffe2da3ad27aa690c50ea96754b42e95cada0cf Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 7 Sep 2020 16:37:43 +0530 Subject: [PATCH 0204/1630] Update property-receipt.json --- .../format-config/property-receipt.json | 40 +++++++++++-------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index e0e384fea..646ef41b1 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", @@ -73,7 +81,7 @@ "style":"block-head" }, { - "style": "noc-table", + "style": "next-noc-table", "table": { "widths": [ "25%", @@ -87,7 +95,7 @@ "text": "{{receipt_no}}.", "border": [ true, - false, + true, false, false ], @@ -97,7 +105,7 @@ "text": "{{receiptNo}}", "border": [ false, - false, + true, false, false ], @@ -107,7 +115,7 @@ "text": "{{consumer_id}}", "border": [ false, - false, + true, false, false ], @@ -116,9 +124,9 @@ { "text": "{{consumerID}}", "border": [ - false, false, true, + true, false ], "style": "receipt-table" @@ -255,7 +263,7 @@ "layout": {} }, { - "style": "next-noc-table", + "style": "noc-table", "table": { "widths": [ "25%", @@ -268,9 +276,9 @@ { "text": "House/Door No. : ", "border": [ - true, true, false, + false, false ], "style": "receipt-table-value" @@ -279,7 +287,7 @@ "text": "{{doorNo}}", "border": [ false, - true, + false, false, false ], @@ -289,7 +297,7 @@ "text": "Building/Colony Name: ", "border": [ false, - true, + false, false, false ], @@ -299,7 +307,7 @@ "text": "{{buildingName}}", "border": [ false, - true, + false, true, false ], @@ -813,7 +821,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/" ] } ] 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 0205/1630] 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 b6052c1d6..477411ca7 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 0949f8ee500ae979c40df60ddf8b3f7eb4d3144b Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Mon, 7 Sep 2020 18:17:55 +0530 Subject: [PATCH 0206/1630] Update ReceiptRegister_V2 Report Update ReceiptRegister_V2 Report --- configs/reports/configs/pt-reports.yml | 72 +++++++++----------------- 1 file changed, 24 insertions(+), 48 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 3c99380e5..a39dc8065 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2156,7 +2156,7 @@ ReportDefinitions: type: string source: pt total: true - - name: propertyid + - name: consumercode label: reports.pt.propertyId type: string source: pt @@ -2166,16 +2166,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 @@ -2201,11 +2191,16 @@ ReportDefinitions: type: string source: pt total: false - - name: remarks - label: reports.pt.remarks + - 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 @@ -2225,15 +2220,7 @@ 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 + searchClause: AND payment.paymentmode = $paymentMode - name: localityArray label: reports.pt.zoneList type: boundarylist @@ -2243,8 +2230,8 @@ ReportDefinitions: query: | -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( - SELECT - billdetailid AS receiptheader, pd.id as pdid, + 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, @@ -2263,40 +2250,29 @@ ReportDefinitions: 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 + GROUP BY pdid ) SELECT - pd.tenantid AS tenantid, - pd.id, - pt_detail.property AS propertyid, - pt_detail.assessmentnumber AS assessmentnumber, + 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, + 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, - 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 + 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: CancelledReceiptRegister_V2 decryptionPathId: CancelledReceiptRegister_V2 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 0207/1630] 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 477411ca7..1b8fc04f0 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 c19d262476cb5d5a4def18a42be65cd845f9809c Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 7 Sep 2020 18:50:41 +0530 Subject: [PATCH 0208/1630] 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 a6746e988..230f237a2 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -482,7 +482,7 @@ }, { "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.ulbGrade" + "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" }, { "variable":"email", 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 0209/1630] 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 1b8fc04f0..2c62555fd 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 76b8d627c482c81c4d586e6e8d59dc07b2484871 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 7 Sep 2020 19:29:44 +0530 Subject: [PATCH 0210/1630] Update property-receipt.json --- 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 646ef41b1..cc20f3239 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -597,7 +597,7 @@ "style": "next-noc-table", "table": { "widths": [ - "8%","8%","8%","8%","8%","8%","8%","8%","8%","8%","8%","*" + "8%","8%","7%","7%","7%","7%","10%","10%","8%","8%","8%","*" ], "body": [ From 37e510cf68c055eee97f1fab263bf598f794baf6 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Mon, 7 Sep 2020 19:32:09 +0530 Subject: [PATCH 0211/1630] Update CancelledReceiptRegister_V2 Report Update CancelledReceiptRegister_V2 Report --- configs/reports/configs/pt-reports.yml | 162 ++++++++++++------------- 1 file changed, 77 insertions(+), 85 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index a39dc8065..96f94e5ba 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2275,7 +2275,6 @@ ReportDefinitions: orerby: ORDER BY pd.receiptdate DESC; - reportName: CancelledReceiptRegister_V2 - decryptionPathId: CancelledReceiptRegister_V2 summary: Receipt Register for cancelled Receipts version: 1.0.0 moduleName: rainmaker-pt @@ -2284,16 +2283,11 @@ ReportDefinitions: pdfPageSize: "A1" sourceColumns: - name: receiptnumber - label: reports.pt.receiptnumber - type: string - source: pt - total: false - - name: status - label: reports.pt.status + label: reports.pt.receiptNo type: string source: pt total: false - - name: receiptDate + - name: receiptdate label: reports.pt.receiptDate type: string source: pt @@ -2314,17 +2308,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 @@ -2359,12 +2353,17 @@ 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 + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: consumercode + label: reports.pt.propertyId type: string source: pt total: false @@ -2373,43 +2372,53 @@ ReportDefinitions: type: string source: pt total: false - - name: assessmentnumber - label: reports.pt.assessmentnumber + - name: instrumenttype + label: reports.pt.paymentMode type: string source: pt total: false - - name: financialyear - label: reports.pt.financialyear + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo type: string source: pt total: false - - name: instrumenttype - label: reports.pt.instrumenttype + - name: transactiondate + label: reports.pt.ddChequeTransactionDate type: string source: pt total: false - - name: transactionnumber - label: reports.pt.transactionnumber + - name: bankname + label: reports.pt.bankName type: string source: pt total: false - - name: bankname - label: reports.pt.bankname + - 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 + isMandatory: true searchClause: AND pd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt - isMandatory: false + isMandatory: true searchClause: AND pd.receiptdate <= $toDate - name: paymentMode label: Payment Mode @@ -2417,15 +2426,7 @@ 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 + searchClause: AND payment.paymentmode = $paymentMode - name: localityArray label: reports.pt.zoneList type: boundarylist @@ -2434,60 +2435,51 @@ 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) + 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 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 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, - 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 - + 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.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, + 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, + 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 version: 1.0.0 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 0212/1630] 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 2c62555fd..3c300ba28 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 0213/1630] 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 3c300ba28..2d30d29cd 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 5a8f795d4dcc84a5a4ae0228be7de8cfddb0ca79 Mon Sep 17 00:00:00 2001 From: Deependra-egov <47975393+Deependra-egov@users.noreply.github.com> Date: Mon, 7 Sep 2020 21:53:49 +0530 Subject: [PATCH 0214/1630] Update pt-reports.yml --- 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 96f94e5ba..e418a4c1b 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 @@ -2221,12 +2222,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 eb9dc59b62d48f1e159b77960c4f6c564f12e6c7 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Mon, 7 Sep 2020 22:07:28 +0530 Subject: [PATCH 0215/1630] Update ReceiptRegister_V2 and CancelReceiptRegister_V2 Update ReceiptRegister_V2 and CancelReceiptRegister_V2 --- configs/reports/configs/pt-reports.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index e418a4c1b..652ab14dc 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2069,7 +2069,6 @@ ReportDefinitions: - reportName: ReceiptRegister_V2 - decryptionPathId: ReceiptRegister_V2 summary: Receipt Register version: 1.0.0 moduleName: rainmaker-pt @@ -2264,7 +2263,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; @@ -2422,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 ( @@ -2470,7 +2463,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 36ba96a504ab5768d01b6be52bfa4be8f93a58e4 Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Mon, 7 Sep 2020 23:32:09 +0530 Subject: [PATCH 0216/1630] 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 2d30d29cd..35c7bd83a 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 be809da4dfcc9b4ec28fc812aa4d87ebb2ce8688 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 8 Sep 2020 07:13:46 +0530 Subject: [PATCH 0217/1630] CollectName 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 652ab14dc..bdba2d635 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2261,7 +2261,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, + 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 @@ -2461,7 +2461,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, + 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 From 76db9bec6d7b9b8c17a65c82c5f11774b164bca6 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 8 Sep 2020 09:00:51 +0530 Subject: [PATCH 0218/1630] added decyption paths --- 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 bdba2d635..7b706f7ed 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 @@ -2269,6 +2270,7 @@ ReportDefinitions: orerby: 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 4c058998df4b3ce969071ef608e9e9c0cdb6c11a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 8 Sep 2020 09:45:48 +0530 Subject: [PATCH 0219/1630] removed decryptionKey --- 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 7b706f7ed..bdba2d635 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2069,7 +2069,6 @@ ReportDefinitions: - reportName: ReceiptRegister_V2 - decryptionPathId: ReceiptRegister_V2 summary: Receipt Register version: 1.0.0 moduleName: rainmaker-pt @@ -2270,7 +2269,6 @@ ReportDefinitions: orerby: 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 bedb71f214104722fa4407687b621a2b2c7f4d17 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 8 Sep 2020 10:52:23 +0530 Subject: [PATCH 0220/1630] decryptionPath --- 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 bdba2d635..7b706f7ed 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 @@ -2269,6 +2270,7 @@ ReportDefinitions: orerby: 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 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 0221/1630] 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 35c7bd83a..47e09c69f 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 4524491eb6abe4abaac12ef0c733e65ff358c908 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 8 Sep 2020 14:24:05 +0530 Subject: [PATCH 0222/1630] Update property-receipt.json --- 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 230f237a2..589d05081 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -552,7 +552,7 @@ }, { "variable": "var_owners", - "value":"$.Properties[0].owners.*", + "value":"$.Properties[0].owners[?(@.active== true)]", "type":"array", "format":{ "type":"string", @@ -569,7 +569,7 @@ }, { "variable": "var_floors", - "value":"$.Properties[0].units.*", + "value":"$.Properties[0].units[?(@.active== true)]", "type":"array", "format":{ "type":"string", 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 0223/1630] 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 47e09c69f..e45de5f06 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 0224/1630] 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 e45de5f06..dcb4864cc 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 3eb1f86f1c74a87d65ed7f6cc84e1ab796373529 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 8 Sep 2020 15:01:27 +0530 Subject: [PATCH 0225/1630] receiptregister updated --- 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 7b706f7ed..36a648f2b 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2237,23 +2237,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, @@ -2264,11 +2264,17 @@ ReportDefinitions: 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, 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; - + 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' + orderby: ORDER BY pd.receiptdate DESC; + + - reportName: CancelledReceiptRegister_V2 decryptionPathId: CancelledReceiptRegister_V2 summary: Receipt Register for cancelled Receipts From dba0189620a92b5852791058ad77181e7b281d8f Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 8 Sep 2020 15:03:45 +0530 Subject: [PATCH 0226/1630] Update property-receipt.json --- 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 cc20f3239..8ad3ab805 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -756,7 +756,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" } ], From 8518f1a5c759cfef46a1c87e1c87654faf5cc9a5 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 8 Sep 2020 15:07:38 +0530 Subject: [PATCH 0227/1630] Update property-receipt.json --- 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 8ad3ab805..2901a841a 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -597,7 +597,7 @@ "style": "next-noc-table", "table": { "widths": [ - "8%","8%","7%","7%","7%","7%","10%","10%","8%","8%","8%","*" + "9%","8%","7%","7%","8%","7%","10%","10%","8%","8%","8%","*" ], "body": [ From 2e870afa25213875aee2357c5c71b0157ab3263b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 8 Sep 2020 15:31:21 +0530 Subject: [PATCH 0228/1630] updated tenantid --- 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 36a648f2b..5fc74e8a3 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 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 0229/1630] 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 dcb4864cc..12694778c 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 0230/1630] 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 12694778c..62c9e181e 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 0231/1630] 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 62c9e181e..4ccfa7b4b 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 c88476a1d5f0288461fce0c8d0afed317a56e4da Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 8 Sep 2020 17:03:06 +0530 Subject: [PATCH 0232/1630] Update consolidatedreceipt.json --- .../format-config/consolidatedreceipt.json | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 02777ea3f..f574918f8 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -23,7 +23,7 @@ { "stack": [ { - "text": "{{logo-header}} {{Municipal_Corporation}}", + "text": "{{logo-header}} {{mcGrade}}", "style": "receipt-logo-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, @@ -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 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 0233/1630] 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 4ccfa7b4b..e52635b07 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 c84d5929bfff787ceba40d1c86397b3ae1f6546a Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 8 Sep 2020 17:04:10 +0530 Subject: [PATCH 0234/1630] 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 f481dc6af..6adf4a8bd 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -506,6 +506,10 @@ { "variable":"email", "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" }, { "variable": "logoImage", From b6e4268baa34483399f436d733552fbb89ba6a60 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 8 Sep 2020 17:12:50 +0530 Subject: [PATCH 0235/1630] 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 f574918f8..73b8fccd3 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -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, From 1969b0ac4b7035b07a6e3113c5a7a1405ff8e932 Mon Sep 17 00:00:00 2001 From: Kabir Date: Tue, 8 Sep 2020 17:19:22 +0530 Subject: [PATCH 0236/1630] 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 e52635b07..f16f81644 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 67fc2439e312a924bd21ff0edb6a1e3e5b8cc053 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 8 Sep 2020 17:20:46 +0530 Subject: [PATCH 0237/1630] paymentmode filter updated and cancelledreceipts --- configs/reports/configs/pt-reports.yml | 31 +++++++++++++++----------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 5fc74e8a3..f5dbdf994 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 ( @@ -2276,8 +2276,7 @@ ReportDefinitions: - reportName: CancelledReceiptRegister_V2 - decryptionPathId: CancelledReceiptRegister_V2 - summary: Receipt Register for cancelled Receipts + summary: Cancelled Receipt Register version: 1.0.0 moduleName: rainmaker-pt additionalConfig: @@ -2428,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 ( @@ -2444,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, @@ -2471,10 +2470,16 @@ ReportDefinitions: 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, 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; + 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 summary: ULB-wise PT Collection @@ -3975,7 +3980,7 @@ ReportDefinitions: 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 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 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 0238/1630] 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 df0979d97..73b8fccd3 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 0239/1630] 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 f481dc6af..e9d0540b3 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 0240/1630] 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 f16f81644..b991e847e 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 f35a9d6bb77c99b640f8c149ab950b5ba3537f29 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 8 Sep 2020 21:34:07 +0530 Subject: [PATCH 0241/1630] zonewise FY Collection report Added --- configs/reports/configs/pt-reports.yml | 270 +++++++++++++++++++++++++ 1 file changed, 270 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index f5dbdf994..6decde5a4 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3988,3 +3988,273 @@ 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')) + +- reportName: ZoneFYReport + summary: Zone FY Collection Pt report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: zonecode + label: reports.pt.znecode + type: string + source: pt + total: false + - name: zonename + label: reports.pt.zonename + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.FinancialYear + 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 + 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 financialYear,',') as financialyear, + count(*) as totalptr, + sum(totalamount) as amountcollected + FROM egcl_receiptheader_v1 AS rh + 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 + JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode=pt_addr.locality + LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER + WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and financialyear='2013-14' + GROUP BY zonecode + ), + fy2014 as + ( + SELECT + zonecode, + string_agg(distinct zonename,',') as zonename, + string_agg(distinct financialYear,',') as financialyear, + count(*) as totalptr, + sum(totalamount) as amountcollected + FROM egcl_receiptheader_v1 AS rh + 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 + JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode=pt_addr.locality + LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER + WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and financialyear='2014-15' + GROUP BY zonecode + ), + fy2015 as + ( + SELECT + zonecode, + string_agg(distinct zonename,',') as zonename, + string_agg(distinct financialYear,',') as financialyear, + count(*) as totalptr, + sum(totalamount) as amountcollected + FROM egcl_receiptheader_v1 AS rh + 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 + JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode=pt_addr.locality + LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER + WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and financialyear='2015-16' + GROUP BY zonecode + ), + fy2016 as + ( + SELECT + zonecode, + string_agg(distinct zonename,',') as zonename, + string_agg(distinct financialYear,',') as financialyear, + count(*) as totalptr, + sum(totalamount) as amountcollected + FROM egcl_receiptheader_v1 AS rh + 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 + JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode=pt_addr.locality + LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER + WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and financialyear='2016-17' + GROUP BY zonecode + ), + fy2017 as + ( + SELECT + zonecode, + string_agg(distinct zonename,',') as zonename, + string_agg(distinct financialYear,',') as financialyear, + count(*) as totalptr, + sum(totalamount) as amountcollected + FROM egcl_receiptheader_v1 AS rh + 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 + JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode=pt_addr.locality + LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER + WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and financialyear='2017-18' + GROUP BY zonecode + ), + fy2018 as + ( + SELECT + zonecode, + string_agg(distinct zonename,',') as zonename, + string_agg(distinct financialYear,',') as financialyear, + count(*) as totalptr, + sum(totalamount) as amountcollected + FROM egcl_receiptheader_v1 AS rh + 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 + JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode=pt_addr.locality + LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER + WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and financialyear='2018-19' + GROUP BY zonecode + ), + fy2019 as + ( + SELECT + zonecode, + string_agg(distinct zonename,',') as zonename, + string_agg(distinct financialYear,',') as financialyear, + count(*) as totalptr, + sum(totalamount) as amountcollected + FROM egcl_receiptheader_v1 AS rh + 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 + JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode=pt_addr.locality + LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER + WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and financialyear='2019-20' + GROUP BY zonecode + ), + fy2020 as + ( + SELECT + zonecode, + string_agg(distinct zonename,',') as zonename, + string_agg(distinct financialYear,',') as financialyear, + count(*) as totalptr, + sum(totalamount) as amountcollected + FROM egcl_receiptheader_v1 AS rh + 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 + JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode=pt_addr.locality + LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER + WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and financialyear='2020-21' + GROUP BY zonecode + ) + SELECT + fy2019.zonecode, + fy2019.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 fy2019 -- selected fy2019 because having all zone enteries + left outer join fy2013 on fy2013.zonecode=fy2019.zonecode + left outer join fy2014 on fy2014.zonecode=fy2019.zonecode + left outer join fy2015 on fy2015.zonecode=fy2019.zonecode + left outer join fy2016 on fy2016.zonecode=fy2019.zonecode + left outer join fy2017 on fy2017.zonecode=fy2019.zonecode + left outer join fy2018 on fy2018.zonecode=fy2019.zonecode + left outer join fy2020 on fy2020.zonecode=fy2019.zonecode From 0312e1a6de5e335c858880e335fd292b6355c45f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 8 Sep 2020 21:43:17 +0530 Subject: [PATCH 0242/1630] updated pt reports --- configs/reports/configs/pt-reports.yml | 74 +++++++++++++------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 6decde5a4..b212f44b2 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2837,22 +2837,22 @@ ReportDefinitions: groupby: GROUP BY tenantid 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 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 @@ -2909,8 +2909,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, @@ -2919,13 +2918,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 @@ -3766,7 +3764,6 @@ ReportDefinitions: - reportName: FYCollectionsReport_V2 - decryptionPathId: FYCollectionsReport_V2 summary: FY Collections version: 1.0.0 moduleName: rainmaker-pt @@ -3818,7 +3815,7 @@ ReportDefinitions: label: reports.pt.totalcount type: string source: pt - total: true + total: true - name: online label: reports.pt.online type: string @@ -3860,26 +3857,29 @@ 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='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", + 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 From d33a57e35214e336e32c8234dac6e155f0260f5a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 8 Sep 2020 21:45:15 +0530 Subject: [PATCH 0243/1630] decrytionKeyPath added cancelledreceiptregister_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 b212f44b2..cb42c9b48 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2276,6 +2276,7 @@ ReportDefinitions: - reportName: CancelledReceiptRegister_V2 + decryptionPathId: CancelledReceiptRegister_V2 summary: Cancelled Receipt Register version: 1.0.0 moduleName: rainmaker-pt From 7f5f78fda81b80f70d57e10e6eba7ee11e9cca9f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 8 Sep 2020 23:55:32 +0530 Subject: [PATCH 0244/1630] FY collection report date flter fix --- 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 cb42c9b48..7a2b7d690 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3843,13 +3843,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: false - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND receiptdate <= $toDate - name: localityArray label: reports.pt.zoneList type: boundarylist From 4cd075a0295d37e146b429af112193b651c3b0f4 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Wed, 9 Sep 2020 00:06:28 +0530 Subject: [PATCH 0245/1630] added decryptionKey added decryptionKey --- configs/reports/configs/uc-reports.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 26576b28b..598d68062 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 @@ -1453,6 +1454,7 @@ ReportDefinitions: - reportName: MiscReceiptULBCancelled_v2 + decryptionPathId: MiscReceiptULBCancelled_v2 summary: Cancelled Receipt Miscellaneous version: 1.0.0 moduleName: rainmaker-uc @@ -1588,6 +1590,7 @@ ReportDefinitions: - reportName: MiscReceiptULBShort_v2 + decryptionPathId: MiscReceiptULBShort_v2 summary: Receipt Register Miscellaneous version: 1.0.0 moduleName: rainmaker-uc From df44087a2b1aeb4c917b80fadeadb57ac065d1fa Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 9 Sep 2020 01:40:55 +0530 Subject: [PATCH 0246/1630] miscReceiptRegsterULB Fix --- configs/reports/configs/uc-reports.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 598d68062..dd51aa06e 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 @@ -1104,7 +1103,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 @@ -1117,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 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 0247/1630] 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 26576b28b..229b0e2cd 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 9688467479f35289a9b08ca771fb1b3089798b21 Mon Sep 17 00:00:00 2001 From: Kabir Date: Wed, 9 Sep 2020 09:50:35 +0530 Subject: [PATCH 0248/1630] prod pt receipt register remove pending amount column reports --- configs/reports/configs/pt-reports.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 7a2b7d690..090189b19 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2151,12 +2151,7 @@ ReportDefinitions: label: reports.pt.roundoff type: string source: pt - total: true - - name: pendingamount - label: reports.pt.pendingamount - type: string - source: pt - total: true + total: true - name: consumercode label: reports.pt.propertyId type: string @@ -2259,8 +2254,7 @@ 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, - pd.due AS pendingamount, + 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.*, From c45398965b525813c403cedc005a247357746fef Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Wed, 9 Sep 2020 10:42:01 +0530 Subject: [PATCH 0249/1630] add decriptionkey in UC report add decriptionkey in UC report --- 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 dd51aa06e..f21dcbffe 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 6319edb43b6cbebef15f7bd313b8469def715813 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Wed, 9 Sep 2020 15:24:10 +0530 Subject: [PATCH 0250/1630] Update UC Receipt Register Report and remove Description Key Update UC Receipt Register Report and remove Description Key --- configs/reports/configs/uc-reports.yml | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index f21dcbffe..de3cc3066 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -976,8 +976,7 @@ ReportDefinitions: - reportName: MiscReceiptULB_v2 - decryptionPathId: MiscReceiptULB_v2 - summary: Receipt Register Miscellaneous + summary: Receipt Register Miscellaneous version: 1.0.0 moduleName: rainmaker-uc additionalConfig: @@ -1117,15 +1116,15 @@ 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 + 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 bill.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC') + GROUP BY billdetailid ) SELECT payment.tenantid as ulb, @@ -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 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 @@ -1454,7 +1453,6 @@ ReportDefinitions: - reportName: MiscReceiptULBCancelled_v2 - decryptionPathId: MiscReceiptULBCancelled_v2 summary: Cancelled Receipt Miscellaneous version: 1.0.0 moduleName: rainmaker-uc @@ -1590,7 +1588,6 @@ ReportDefinitions: - reportName: MiscReceiptULBShort_v2 - decryptionPathId: MiscReceiptULBShort_v2 summary: Receipt Register Miscellaneous version: 1.0.0 moduleName: rainmaker-uc From 6c75138ed71b70ff095c35650745267a4ad1bfa1 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Wed, 9 Sep 2020 15:37:38 +0530 Subject: [PATCH 0251/1630] Update Report with format Update Report with format --- 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 de3cc3066..d6a2ee379 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -976,7 +976,7 @@ ReportDefinitions: - reportName: MiscReceiptULB_v2 - summary: Receipt Register Miscellaneous + summary: Receipt Register Miscellaneous version: 1.0.0 moduleName: rainmaker-uc additionalConfig: From f13cc024a17440b2a6e03fd7200b4354d64360bb Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 9 Sep 2020 17:17:02 +0530 Subject: [PATCH 0252/1630] mcgrade changes in pdfs --- configs/pdf-service/data-config/tlcertificate.json | 4 ++++ configs/pdf-service/data-config/tradelicense-receipt.json | 4 ++++ configs/pdf-service/format-config/tlcertificate.json | 2 +- configs/pdf-service/format-config/tradelicense-receipt.json | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index bc5164251..9e8368be2 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" diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index f21b13c61..b7620aeed 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" diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index 0a9d59548..b744a6d2d 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" }, { diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index 99aa26adf..f0ad6055b 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 308ce0028d7ebf92b6ef79bbb9f8d0e76b40c6c2 Mon Sep 17 00:00:00 2001 From: siva-nalluri-eGov <31985243+siva-nalluri-eGov@users.noreply.github.com> Date: Wed, 9 Sep 2020 20:58:41 +0530 Subject: [PATCH 0253/1630] Update the redirect url format --- 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 deb7fac03..6e42249ab 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 30bb9e4028988918fbe20ec9299266ec1a757afa Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Wed, 9 Sep 2020 23:49:22 +0530 Subject: [PATCH 0254/1630] Update MiscReceipt_V2 report Update MiscReceipt_V2 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 d6a2ee379..f8ac8576f 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 + LET 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 From 382bf4d9ec1061546fc664d93de87bb8e0c65503 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Thu, 10 Sep 2020 00:05:53 +0530 Subject: [PATCH 0255/1630] Update MiscReceiptULB_v2 report query Update MiscReceiptULB_v2 report query --- 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 f8ac8576f..e3936cda7 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 - LET 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 @@ -1142,7 +1142,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=$tenantid AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' orderby: ORDER BY paydetail.receiptdate DESC From 24e08b852d17ed5721da6c102dfbe80184829c51 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 10 Sep 2020 00:15:59 +0530 Subject: [PATCH 0256/1630] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 090189b19..dd2c5250d 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2261,8 +2261,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, 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 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 bd.amount>0 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 731e7b5f6adf95f623f02fde977387bca3e62fce Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 10 Sep 2020 01:34:16 +0530 Subject: [PATCH 0257/1630] fix miscreceiptULB --- 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 e3936cda7..a31c452e8 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 - 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=$tenantid AND businessservice not in ('PT','TL','FIRENOC') - 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, @@ -1142,7 +1143,7 @@ ReportDefinitions: 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 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 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 0258/1630] 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 229b0e2cd..3bc301b62 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 0259/1630] 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 3bc301b62..63a71be97 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 b2af3b6e26d59bc574bf6c84e83ed61ab440b4f0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 10 Sep 2020 02:43:10 +0530 Subject: [PATCH 0260/1630] 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 dd2c5250d..c440d08da 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2261,7 +2261,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, 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 bd.amount>0 group by bill.id) bd + (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 and bd.amount>0 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 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 0261/1630] 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 73b8fccd3..e756f3d24 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 0262/1630] 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 63a71be97..3bc301b62 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 0263/1630] 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 3bc301b62..63a71be97 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 f25895382a4973eca5e71cd1e1a5bb3bc4ab1309 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 10 Sep 2020 03:49:11 +0530 Subject: [PATCH 0264/1630] decryptionPath 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 a31c452e8..4a2f01799 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 f070f415ecd8a04257f8e2a806866d236cbb2544 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 10 Sep 2020 04:06:50 +0530 Subject: [PATCH 0265/1630] reverted decryptionpath --- 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 4a2f01799..a31c452e8 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 97796c3e32e877f41141bd8d1fd3440c46c80bad Mon Sep 17 00:00:00 2001 From: ramakrishnaippili-eGov Date: Thu, 10 Sep 2020 04:15:08 +0530 Subject: [PATCH 0266/1630] 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 e9d0540b3..4d1bf0291 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 b124d0190fc7218bae9bcf00e6bd0dbf1b49a502 Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Thu, 10 Sep 2020 04:36:40 +0530 Subject: [PATCH 0267/1630] consolidated receipt changes --- .../data-config/consolidatedreceipt.json | 12 ++++++------ .../format-config/consolidatedreceipt.json | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index 6adf4a8bd..fe48f536f 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, @@ -504,13 +504,13 @@ "value":"$.MdmsRes.tenant.tenants[0].domainUrl" }, { - "variable":"email", - "value":"$.MdmsRes.tenant.tenants[0].emailId" - }, - { "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", @@ -533,4 +533,4 @@ } ] } -} +} \ No newline at end of file diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 73b8fccd3..4eb6e1dad 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, @@ -1149,4 +1149,4 @@ } } } -} +} \ No newline at end of file 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 0268/1630] 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 63a71be97..16787429f 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 0269/1630] 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 16787429f..e2667cb69 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 87fef8c0a1103da3e81c34e0881949654f8e5948 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 10 Sep 2020 07:11:46 +0530 Subject: [PATCH 0270/1630] uc reports updated --- configs/reports/configs/uc-reports.yml | 31 +++++++++++++------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index a31c452e8..a5511f06b 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1438,17 +1438,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 @@ -1556,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, @@ -1584,10 +1586,9 @@ 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 - - reportName: MiscReceiptULBShort_v2 summary: Receipt Register Miscellaneous version: 1.0.0 From 2072e006ec25931454dac41242b5061437185685 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 10 Sep 2020 07:17:05 +0530 Subject: [PATCH 0271/1630] Update uc-reports.yml --- 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 a5511f06b..53828484a 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1439,7 +1439,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, From 1d13b035c6f06e95ec9544a2674b9c0d38508ff9 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 10 Sep 2020 11:28:14 +0530 Subject: [PATCH 0272/1630] Made father name and payer name NA on 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 3e7da112f..32102e833 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -206,7 +206,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerName}}", + "text": "NA", "border": [ false, false, @@ -248,7 +248,7 @@ "style": "receipt-table-value" }, { - "text" : "{{fatherHusbandName}}", + "text" : "NA", "border": [ false, false, From 6531139f9b328176b0a0cb6b6de2f02cdc6cb76f Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 10 Sep 2020 14:19:28 +0530 Subject: [PATCH 0273/1630] Update consolidatedreceipt.json --- .../pdf-service/format-config/consolidatedreceipt.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 4eb6e1dad..b0ff96e7b 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, @@ -1149,4 +1149,4 @@ } } } -} \ No newline at end of file +} From 5b32314d64e7ec0eaa0126fe7ff36cc9d6e3eb84 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 10 Sep 2020 15:28:05 +0530 Subject: [PATCH 0274/1630] 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 589d05081..6b29291e3 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -552,7 +552,7 @@ }, { "variable": "var_owners", - "value":"$.Properties[0].owners[?(@.active== true)]", + "value":"$.Properties[0].owners[?(@.active== true && @.status== 'ACTIVE')]", "type":"array", "format":{ "type":"string", From 8fdd4b17b08bfc71560bb4e898062e99076192e0 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Thu, 10 Sep 2020 15:46:43 +0530 Subject: [PATCH 0275/1630] Remove descriptionKey from EmployeeReport_v2 Remove descriptionKey from EmployeeReport_v2 --- 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 369439319..4c8e14828 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -1138,7 +1138,6 @@ ReportDefinitions: orderby: ORDER BY tenantid - reportName: EmployeeReport_v2 - decryptionPathId: EmployeeReport_v2 summary: Fetches complaints for employees version: 1.0.0 moduleName: rainmaker-pgr 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 0276/1630] 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 25d97bd4f..6b29291e3 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 0277/1630] 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 e756f3d24..b0ff96e7b 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 0278/1630] 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 4d1bf0291..26c1eade0 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 0279/1630] 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 b0ff96e7b..684740987 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 0280/1630] 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 58746df3d..3e7da112f 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 0281/1630] 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 6b29291e3..29084f38a 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 8e1529c2647fee2d5e6c04b4c4b6e147d556195d Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Thu, 10 Sep 2020 17:25:50 +0530 Subject: [PATCH 0282/1630] Add descriptionKey in MiscReceipt_V2 report Add descriptionKey in MiscReceipt_V2 report --- 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 53828484a..d9687194b 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -834,6 +834,7 @@ ReportDefinitions: - reportName: MiscReceipt_v2 + decryptionPathId: MiscReceipt_v2 summary: Receipt Register Miscellaneous version: 1.0.0 moduleName: rainmaker-uc 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 0283/1630] 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 3e7da112f..fc6b1e727 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 65d7adebc9087f385d39785d29872b43a6bdb442 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 10 Sep 2020 17:57:02 +0530 Subject: [PATCH 0284/1630] Changed payer Name to PaidBy field --- 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 6b29291e3..29084f38a 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 42f3c5d4b0b267f90392fda2719528160c1b4948 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 10 Sep 2020 17:59:04 +0530 Subject: [PATCH 0285/1630] Mapped apid by paidBy field --- .../pdf-service/data-config/consolidatedreceipt.json | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index fe48f536f..26c1eade0 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", @@ -533,4 +528,4 @@ } ] } -} \ No newline at end of file +} From 1f757724cfac0f3d53abba1b8f4e7e283f5e56e5 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 10 Sep 2020 18:01:38 +0530 Subject: [PATCH 0286/1630] Removed fatherName and mapped payerName --- configs/pdf-service/format-config/property-receipt.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 32102e833..fc6b1e727 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -206,7 +206,7 @@ "style": "receipt-table-value" }, { - "text": "NA", + "text": "{{payerName}}", "border": [ false, false, @@ -238,7 +238,7 @@ "style": "receipt-table" }, { - "text" : "Father/Husband Name: ", + "text" : " ", "border": [ false, false, @@ -248,7 +248,7 @@ "style": "receipt-table-value" }, { - "text" : "NA", + "text" : " ", "border": [ false, false, From c0e862087e73e52a797ad4faebea9ea31ab756fb Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 10 Sep 2020 18:09:20 +0530 Subject: [PATCH 0287/1630] Added Paid By field --- .../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 b0ff96e7b..684740987 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 eeab5e0c6125bf8db48ae7cf0cfe266fec1abbe0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 11 Sep 2020 07:16:20 +0530 Subject: [PATCH 0288/1630] decryption 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 d9687194b..0357f9d67 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -977,6 +977,7 @@ ReportDefinitions: - reportName: MiscReceiptULB_v2 + decryptionPathId: MiscReceiptULB_v2 summary: Receipt Register Miscellaneous version: 1.0.0 moduleName: rainmaker-uc From 6fa3b5656ac49588d113b9a70e0ec29953c191d9 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Fri, 11 Sep 2020 13:36:43 +0530 Subject: [PATCH 0289/1630] changed registry receipt v2 query --- 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 c440d08da..b3b5ee154 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2261,7 +2261,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, 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 and bd.amount>0 group by bill.id) bd + (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='ACTIVE' --and pt.propertyid='PT-1012-978737' From 20f7a74f145dbf67d6642f9eea790bd7136a48e7 Mon Sep 17 00:00:00 2001 From: gurpreetsinghkhanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 12 Sep 2020 16:58:25 +0530 Subject: [PATCH 0290/1630] pt-reports added assessment and dump --- configs/reports/configs/pt-reports.yml | 393 ++++++++++++++++++++++++- 1 file changed, 392 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index b3b5ee154..76c386bd7 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4094,7 +4094,7 @@ ReportDefinitions: source: pt total: true query: | - --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address + --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 @@ -4252,3 +4252,394 @@ ReportDefinitions: left outer join fy2017 on fy2017.zonecode=fy2019.zonecode left outer join fy2018 on fy2018.zonecode=fy2019.zonecode left outer join fy2020 on fy2020.zonecode=fy2019.zonecode + + +- reportName: AssessmentsReport_v2 + summary: Assessments Report + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: assessmentnumber + label: reports.pt.assessmentnumber + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + - name: propertyid + label: reports.pt.propertyid + 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: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + assessmentnumber, + financialyear, + propertyid, + status + FROM eg_pt_asmt_assessment + WHERE and tenantid=$tenantid + +- reportName: Dump Report_v2 + summary: Dump Report + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: createddate + label: reports.pt.createdDate + 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: status + label: reports.pt.status + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: ownershipcategory + label: reports.pt.ownershipcategory + type: string + source: pt + total: false + - name: usagecategory + label: reports.pt.usagecategory + type: string + source: pt + total: false + - name: creationreason + label: reports.pt.creationreason + 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: superbuiltuparea + label: reports.pt.superbuiltuparea + type: string + source: pt + total: false + - name: linkedproperties + label: reports.pt.linkedproperties + 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: floorno + label: reports.pt.floorno + type: string + source: pt + total: false + - name: unittype + label: reports.pt.unittype + type: string + source: pt + total: false + - name: usagecategory + label: reports.pt.usagecategory + type: string + source: pt + total: false + - name: occupancytype + label: reports.pt.occupancytype + type: string + source: pt + total: false + - name: occupancydate + label: reports.pt.occupancydate + type: string + source: pt + total: false + - name: carpetarea + label: reports.pt.carpetarea + type: string + source: pt + total: false + - name: builtuparea + label: reports.pt.builtuparea + type: string + source: pt + total: false + - name: plintharea + label: reports.pt.plintharea + type: string + source: pt + total: false + - name: superbuiltuparea + label: reports.pt.superbuiltuparea + type: string + source: pt + total: false + - name: arv + label: reports.pt.arv + type: string + source: pt + total: false + - name: constructiontype + label: reports.pt.carpetarea + type: string + source: pt + total: false + - name: constructiondate + label: reports.pt.constructiondate + type: string + source: pt + total: false + - name: dimensions + label: reports.pt.dimensions + type: string + source: pt + total: false + - name: active + label: reports.pt.active + type: string + source: pt + total: false + - name: doorno + label: reports.pt.doorno + type: string + source: pt + total: false + - name: plotno + label: reports.pt.plotno + type: string + source: pt + total: false + - name: buildingname + label: reports.pt.buildingname + type: string + source: pt + total: false + - name: street + label: reports.pt.street + type: string + source: pt + total: false + - name: landmark + label: reports.pt.landmark + type: string + source: pt + total: false + - name: city + label: reports.pt.city + type: string + source: pt + total: false + - name: pincode + label: reports.pt.pincode + type: string + source: pt + total: false + - name: locality + label: reports.pt.locality + type: string + source: pt + total: false + - name: region + label: reports.pt.region + type: string + source: pt + total: false + - name: state + label: reports.pt.state + type: string + source: pt + total: false + - name: country + label: reports.pt.country + type: string + source: pt + total: false + - name: latitude + label: reports.pt.latitude + type: string + source: pt + total: false + - name: longitude + label: reports.pt.longitude + type: string + source: pt + total: false + - name: ownerstatus + label: reports.pt.ownerstatus + type: string + source: pt + total: false + - name: ownershippercentage + label: reports.pt.ownershippercentage + type: string + source: pt + total: false + - name: institutionid + label: reports.pt.institutionid + type: string + source: pt + total: false + - name: relationship + label: reports.pt.relationship + type: string + source: pt + total: false + - 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: isprimaryowner + label: reports.pt.isprimaryowner + type: string + source: pt + total: false + - name: guardianrelation + label: reports.pt.guardianrelation + type: string + source: pt + total: false + - name: mobilenumber + label: reports.pt.mobilenumber + type: string + source: pt + total: false + - name: gender + label: reports.pt.gender + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND property.createdtime >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND property.createdtime <= $toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + to_char((To_timestamp(property.createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY HH24:MI:SS') AS createddate, + property.propertyid, + property.oldpropertyid , + property.status, + property.propertytype, + property.ownershipcategory, + property.usagecategory, + property.creationreason, + property.nooffloors, + property.landarea, + property.superbuiltuparea, + property.linkedproperties, + property.source, + property.channel, + unit.floorno, + unit.unittype, + unit.usagecategory, + unit.occupancytype, + unit.occupancydate, + unit.carpetarea, + unit.builtuparea, + unit.plintharea, + unit.superbuiltuparea, + unit.arv, + unit.constructiontype, + unit.constructiondate, + unit.dimensions, + unit.active, + address.doorno, + address.plotno, + address.buildingname, + address.street, + address.landmark, + address.city, + address.pincode, + address.locality, + address.district, + address.region, + address.state, + address.country, + address.latitude, + address.longitude, + owner.status as ownerstatus, + owner.isprimaryowner, + owner.ownertype, + owner.ownershippercentage, + owner.institutionid, + owner.relationship, + users.name as ownername, + users.guardian, + users.guardianrelation, + users.mobilenumber, + users.gender + FROM eg_pt_property as property + inner join eg_pt_unit as unit on property.id=unit.propertyid + inner join eg_pt_address as address on property.id=address.propertyid + inner join eg_pt_owner as owner on property.id=owner.propertyid + inner join eg_user as users on owner.userid=users.uuid + WHERE owner.status='ACTIVE' and property.tenantid=$tenantid \ No newline at end of file From 924985e590df27bbce8281498da6201aef265793 Mon Sep 17 00:00:00 2001 From: gurpreetsinghkhanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 12 Sep 2020 17:21:00 +0530 Subject: [PATCH 0291/1630] updated-pt-report.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 76c386bd7..d9fc261f5 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4305,7 +4305,7 @@ ReportDefinitions: FROM eg_pt_asmt_assessment WHERE and tenantid=$tenantid -- reportName: Dump Report_v2 +- reportName: DumpReport_v2 summary: Dump Report version: 1.0.0 moduleName: rainmaker-pt From 49e62e23ee1c69648c0a7d7c6fbe847153b96782 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 14 Sep 2020 12:33:59 +0530 Subject: [PATCH 0292/1630] 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 d9fc261f5..3154e8724 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4303,7 +4303,7 @@ ReportDefinitions: propertyid, status FROM eg_pt_asmt_assessment - WHERE and tenantid=$tenantid + WHERE tenantid=$tenantid - reportName: DumpReport_v2 summary: Dump Report @@ -4642,4 +4642,4 @@ ReportDefinitions: inner join eg_pt_address as address on property.id=address.propertyid inner join eg_pt_owner as owner on property.id=owner.propertyid inner join eg_user as users on owner.userid=users.uuid - WHERE owner.status='ACTIVE' and property.tenantid=$tenantid \ No newline at end of file + WHERE owner.status='ACTIVE' and property.tenantid=$tenantid From e3a1cf47e899afcf35c887f1a5861a498d20d69d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 14 Sep 2020 16:41:31 +0530 Subject: [PATCH 0293/1630] 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 cccba4616..d596ed7c3 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2274,13 +2274,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 From 5eed06909cb8443379b90b746491c0a6c2a9c70f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 14 Sep 2020 18:16:58 +0530 Subject: [PATCH 0294/1630] Update pgr-reports.yml --- configs/reports/configs/pgr-reports.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 4c8e14828..ec9bb148f 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 @@ -1481,7 +1481,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 From fbf4a8f0e0ddeb551c2f58c87a4ab98076c1df3d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 15 Sep 2020 07:33:55 +0530 Subject: [PATCH 0295/1630] Update pgr-reports.yml --- configs/reports/configs/pgr-reports.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index ec9bb148f..9f00950c3 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -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 @@ -1244,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 @@ -1311,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 @@ -1393,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 @@ -1571,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 @@ -1656,7 +1653,6 @@ ReportDefinitions: - reportName: UlbPgrSlaReport_v2 - decryptionPathId: UlbPgrSlaReport_v2 summary: Fetches employee sla version: 1.0.0 moduleName: rainmaker-pgr @@ -1732,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 b91a0d6548887eac6d5879fed57466031c49f554 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Wed, 16 Sep 2020 13:27:28 +0530 Subject: [PATCH 0296/1630] Update ReceiptRegisterShort Report in V2 Update ReceiptRegisterShort Report in V2 --- configs/reports/configs/pt-reports.yml | 88 ++++++++++---------------- 1 file changed, 34 insertions(+), 54 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 3154e8724..86416adfe 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2952,11 +2952,6 @@ ReportDefinitions: 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 @@ -3007,14 +3002,6 @@ ReportDefinitions: 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 @@ -3031,61 +3018,54 @@ 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, + 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_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 + WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + GROUP BY pdid ) 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, + pd.tenantid AS tenantid, + pd.id, + pt.propertyid, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, payment.ifsccode AS bankname, - pd.receiptnumber, + receiptnumber, payment.totalamountpaid as amount, payment.paymentmode as instrumenttype, - payment.transactionnumber, + 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, + Initcap(pt.usagecategory) as usagetype, + eg_user.name as collectorname, 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 + locality, + 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, eg_pt_address_v2 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 = pt_addr.property 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: ULBPTDataDumpReport_V2 From d63e52984f8ff09750a229a18b05009cbab8cafb Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Wed, 16 Sep 2020 15:06:07 +0530 Subject: [PATCH 0297/1630] 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 deb7fac03..6e42249ab 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 93af3a4130fa7906929b774b196b923b4b17f131 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 17 Sep 2020 09:23:38 +0530 Subject: [PATCH 0298/1630] stateApplicationStatusReport_v2 updated --- configs/reports/configs/tl-reports.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index d596ed7c3..dd3bb49ad 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -1783,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 @@ -1803,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 @@ -1829,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 From 41dcd8ef48a2d9f6f689464b90120147dd58fe3c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 23 Sep 2020 08:07:22 +0530 Subject: [PATCH 0299/1630] misc state reports update --- 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 0357f9d67..8336e3c2f 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -834,7 +834,6 @@ ReportDefinitions: - reportName: MiscReceipt_v2 - decryptionPathId: MiscReceipt_v2 summary: Receipt Register Miscellaneous version: 1.0.0 moduleName: rainmaker-uc @@ -1372,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, From 6967df5a1e278d2462fcdd7e033df3b1c6a1a2cd Mon Sep 17 00:00:00 2001 From: Kabir Date: Wed, 23 Sep 2020 11:29:43 +0530 Subject: [PATCH 0300/1630] 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 eb8a37c7b..182ff8ac2 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 0301/1630] 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 182ff8ac2..d4658f817 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 0302/1630] 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 82cf24395..a647b8340 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 0303/1630] 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 a26a8cf90..1c74c077c 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 0304/1630] 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 d4658f817..f27363dc2 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 0305/1630] 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 f27363dc2..6984fecef 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 0306/1630] 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 6984fecef..50ff054a9 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 0307/1630] 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 50ff054a9..443b8f8dd 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 0308/1630] 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 443b8f8dd..c38a0255b 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 0309/1630] 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 29084f38a..0aa3e35a0 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 0310/1630] 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 fc6b1e727..0a8ee3c30 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 0311/1630] 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 c38a0255b..fce5d3d7f 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 0312/1630] 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 0a8ee3c30..c117a3bbc 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 0313/1630] 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 fce5d3d7f..444bd9e63 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 0314/1630] 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 bc5164251..9e8368be2 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 0315/1630] 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 f21b13c61..b7620aeed 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 0316/1630] 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 0a9d59548..b744a6d2d 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 0317/1630] 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 99aa26adf..f0ad6055b 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 0318/1630] 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 2e5b880cc..d6679fb28 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 0319/1630] 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 e2667cb69..8336e3c2f 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 0320/1630] 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 369439319..9f00950c3 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 6f7ceae877542529a2d195f2c86b412e51760ec4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 30 Sep 2020 14:39:32 +0530 Subject: [PATCH 0321/1630] Synch with UAT_V2 --- .../reports/configs/rainmaker-noc-reports.yml | 449 ++++++------------ 1 file changed, 155 insertions(+), 294 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index eb8a37c7b..444bd9e63 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 @@ -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 @@ -210,7 +203,7 @@ ReportDefinitions: wrapper: true isMandatory: false searchClause: AND fnoc.tenantId IN ($ulb) - query: + query: | Select COALESCE(message,usagetype) localisedmessage, COUNT(*) as transactionNumber, @@ -226,10 +219,11 @@ 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 - - reportName: ApplicationStatusReport_V2 + - reportName: UrbanApplicationStatusReport_V2 summary: Application Status Report version: 1.0.0 moduleName: rainmaker-noc @@ -265,7 +259,7 @@ ReportDefinitions: wrapper: true isMandatory: false searchClause: AND fnoc.tenantId IN ($ulb) - query: + query: | select COALESCE(message,state) application_status, count(*) number_of_application @@ -278,7 +272,8 @@ 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,194 +316,9 @@ 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 + - reportName: RuralDistrictWiseCollectionReport_V2 summary: Rural District Wise Collection Report version: 1.0.0 moduleName: rainmaker-noc @@ -547,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 @@ -562,14 +372,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 @@ -578,9 +381,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 @@ -630,59 +451,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 @@ -735,65 +504,157 @@ 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 - - reportName: DrillDownRuralWiseChannelReport_V2 - summary: Rural Wise Channel Report + - reportName: ReceiptRegisterFirenocReport_V2 + summary: Receipt Register FireNoc version: 1.0.0 moduleName: rainmaker-noc + additionalConfig: + print: + pdfPageSize: "A3" sourceColumns: - - name: firestation - label: reports.noc.collectionreport.firestation + - name: ulb + label: reports.noc.ulb type: string source: rainmaker-noc total: false - - name: channel - label: reports.noc.channelsreport.channel + - name: receiptnumber + label: reports.noc.receiptnumber type: string source: rainmaker-noc total: false - - name: number_of_applications - label: reports.noc.channelsreport.applicationNo + - name: receiptdate + label: reports.noc.receiptdate type: string source: rainmaker-noc - total: true - - name: percentage - label: reports.noc.channelsreport.percentage + 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.channelsreport.fromDate + label: reports.noc.fromDate type: epoch source: noc isMandatory: false searchClause: AND applicationdate >= $fromDate - name: toDate - label: reports.noc.channelsreport.toDate + label: reports.noc.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 + - 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 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 + 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 0c28ab6e649276ec6d6eddb97fbae29478b8a862 Mon Sep 17 00:00:00 2001 From: Kabir Date: Thu, 1 Oct 2020 11:10:44 +0530 Subject: [PATCH 0322/1630] 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 444bd9e63..c3df009df 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 0323/1630] 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 c3df009df..e3e2c31c3 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 0324/1630] [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 0aa3e35a0..7d671fb83 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 0325/1630] [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 c117a3bbc..172710d28 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 0326/1630] [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 b7620aeed..ee5114bc5 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 0327/1630] 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 ee5114bc5..63850fce3 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 0328/1630] 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 63850fce3..ee5114bc5 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 0329/1630] 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 8336e3c2f..ece402e2f 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 0330/1630] 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 ece402e2f..a869ab56b 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 0331/1630] 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 a869ab56b..e407bfae6 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 0332/1630] [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 7d671fb83..e3750b169 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 0333/1630] [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 172710d28..0b6b7886e 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 0334/1630] [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 684740987..18abb6ef7 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 0335/1630] [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 26c1eade0..b4cb95135 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 0336/1630] 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 e407bfae6..7de02fcbe 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 0337/1630] 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 e3750b169..0b8b5867b 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 0338/1630] 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 b4cb95135..0f32eede6 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 0339/1630] 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 18abb6ef7..786955e33 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 0340/1630] 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 0b8b5867b..5628b66e8 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 0341/1630] 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 5628b66e8..025633150 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 0342/1630] 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 9f00950c3..7eaa08bdd 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 0343/1630] 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 e3e2c31c3..900aa87f6 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 0344/1630] 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 7de02fcbe..c1f600eef 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 0345/1630] 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 c1f600eef..ab7d93ef6 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 0346/1630] 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 ab7d93ef6..f7731bdcc 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 0347/1630] 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 f7731bdcc..4e638a4c2 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 0348/1630] 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 b991e847e..bb7f2a5cc 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 0349/1630] 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 bb7f2a5cc..a1fc5662a 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 0350/1630] [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 a1fc5662a..8602f4351 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 46cada59f08712067568b4bb7e95845b9296dd8c Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Wed, 14 Oct 2020 07:25:13 +0530 Subject: [PATCH 0351/1630] [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 86416adfe..d027e98c5 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2263,7 +2263,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, (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='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 790d897f6e6ae2cc177d932d14715b18078b8059 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 14 Oct 2020 12:28:52 +0530 Subject: [PATCH 0352/1630] synch with UAT_V2 --- configs/reports/configs/pt-reports.yml | 842 +++---------------------- 1 file changed, 94 insertions(+), 748 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index d027e98c5..8602f4351 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 @@ -214,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 @@ -1943,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", @@ -2067,7 +2072,6 @@ 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 @@ -2151,7 +2155,12 @@ ReportDefinitions: label: reports.pt.roundoff type: string source: pt - total: true + total: true + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true - name: consumercode label: reports.pt.propertyId type: string @@ -2216,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 ( @@ -2254,23 +2263,24 @@ 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, 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, 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 + (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!='INACTIVE' --and pt.propertyid='PT-1012-978737' orderby: ORDER BY pd.receiptdate DESC; - - + - reportName: CancelledReceiptRegister_V2 decryptionPathId: CancelledReceiptRegister_V2 - summary: Cancelled Receipt Register + summary: Receipt Register for cancelled Receipts version: 1.0.0 moduleName: rainmaker-pt additionalConfig: @@ -2421,7 +2431,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 ( @@ -2437,23 +2447,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, @@ -2462,19 +2472,13 @@ 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 summary: ULB-wise PT Collection version: 1.0.0 @@ -2532,7 +2536,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 @@ -2666,13 +2669,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 @@ -2745,7 +2748,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 @@ -2831,7 +2833,6 @@ ReportDefinitions: groupby: GROUP BY tenantid orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - - reportName: UlbWisePtCollection_V2 summary: State Wide PT Collection version: 1.0.0 @@ -2916,10 +2917,8 @@ ReportDefinitions: 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 @@ -2952,6 +2951,11 @@ ReportDefinitions: 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 @@ -3002,6 +3006,14 @@ ReportDefinitions: 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 @@ -3018,58 +3030,64 @@ ReportDefinitions: searchClause: AND eg_user.id = $collectorname::INTEGER 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, + 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_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 + 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 - pd.tenantid AS tenantid, - pd.id, - pt.propertyid, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + 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, - receiptnumber, + pd.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, - Initcap(pt.usagecategory) as usagetype, - eg_user.name as collectorname, + payment.transactionnumber, receipt_breakup.*, - locality, - 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, eg_pt_address_v2 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 = pt_addr.property 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; + 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 - decryptionPathId: ULBPTDataDumpReport_V2 summary: ULB level report version: 1.0.0 moduleName: rainmaker-pt @@ -3262,7 +3280,6 @@ ReportDefinitions: - reportName: Sewa_Kendra_ReceiptRegister_V2 - decryptionPathId: Sewa_Kendra_ReceiptRegister_V2 summary: Sewa Kendra Receipt Register version: 1.0.0 moduleName: rainmaker-pt @@ -3406,13 +3423,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 @@ -3495,7 +3512,6 @@ ReportDefinitions: - reportName: ReceiptRegisterSummary_V2 - decryptionPathId: ReceiptRegisterSummary_V2 summary: Receipt Register Summary version: 1.0.0 moduleName: rainmaker-pt @@ -3573,11 +3589,6 @@ 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 @@ -3628,7 +3639,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 @@ -3697,13 +3707,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 @@ -3736,7 +3746,6 @@ ReportDefinitions: groupby: group by bd.tenantid orderby: order by bd.tenantid - - reportName: FYCollectionsReport_V2 summary: FY Collections version: 1.0.0 @@ -3816,13 +3825,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: false - searchClause: AND receiptdate >= $fromDate + searchClause: AND pd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: false - searchClause: AND receiptdate <= $toDate + searchClause: AND pd.receiptdate <= $toDate - name: localityArray label: reports.pt.zoneList type: boundarylist @@ -3853,11 +3862,9 @@ ReportDefinitions: 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 - + orderby: ORDER BY financialyear - reportName: ULBDEFAULTERPTREPORT_V2 - decryptionPathId: ULBDEFAULTERPTREPORT_V2 summary: ULB Defaulter Pt report version: 1.0.0 moduleName: rainmaker-pt @@ -3954,7 +3961,7 @@ ReportDefinitions: 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 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 @@ -3962,664 +3969,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')) - -- reportName: ZoneFYReport - summary: Zone FY Collection Pt report - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: zonecode - label: reports.pt.znecode - type: string - source: pt - total: false - - name: zonename - label: reports.pt.zonename - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.FinancialYear - 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 - 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 financialYear,',') as financialyear, - count(*) as totalptr, - sum(totalamount) as amountcollected - FROM egcl_receiptheader_v1 AS rh - 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 - JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode=pt_addr.locality - LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER - WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and financialyear='2013-14' - GROUP BY zonecode - ), - fy2014 as - ( - SELECT - zonecode, - string_agg(distinct zonename,',') as zonename, - string_agg(distinct financialYear,',') as financialyear, - count(*) as totalptr, - sum(totalamount) as amountcollected - FROM egcl_receiptheader_v1 AS rh - 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 - JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode=pt_addr.locality - LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER - WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and financialyear='2014-15' - GROUP BY zonecode - ), - fy2015 as - ( - SELECT - zonecode, - string_agg(distinct zonename,',') as zonename, - string_agg(distinct financialYear,',') as financialyear, - count(*) as totalptr, - sum(totalamount) as amountcollected - FROM egcl_receiptheader_v1 AS rh - 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 - JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode=pt_addr.locality - LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER - WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and financialyear='2015-16' - GROUP BY zonecode - ), - fy2016 as - ( - SELECT - zonecode, - string_agg(distinct zonename,',') as zonename, - string_agg(distinct financialYear,',') as financialyear, - count(*) as totalptr, - sum(totalamount) as amountcollected - FROM egcl_receiptheader_v1 AS rh - 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 - JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode=pt_addr.locality - LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER - WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and financialyear='2016-17' - GROUP BY zonecode - ), - fy2017 as - ( - SELECT - zonecode, - string_agg(distinct zonename,',') as zonename, - string_agg(distinct financialYear,',') as financialyear, - count(*) as totalptr, - sum(totalamount) as amountcollected - FROM egcl_receiptheader_v1 AS rh - 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 - JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode=pt_addr.locality - LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER - WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and financialyear='2017-18' - GROUP BY zonecode - ), - fy2018 as - ( - SELECT - zonecode, - string_agg(distinct zonename,',') as zonename, - string_agg(distinct financialYear,',') as financialyear, - count(*) as totalptr, - sum(totalamount) as amountcollected - FROM egcl_receiptheader_v1 AS rh - 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 - JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode=pt_addr.locality - LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER - WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and financialyear='2018-19' - GROUP BY zonecode - ), - fy2019 as - ( - SELECT - zonecode, - string_agg(distinct zonename,',') as zonename, - string_agg(distinct financialYear,',') as financialyear, - count(*) as totalptr, - sum(totalamount) as amountcollected - FROM egcl_receiptheader_v1 AS rh - 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 - JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode=pt_addr.locality - LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER - WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and financialyear='2019-20' - GROUP BY zonecode - ), - fy2020 as - ( - SELECT - zonecode, - string_agg(distinct zonename,',') as zonename, - string_agg(distinct financialYear,',') as financialyear, - count(*) as totalptr, - sum(totalamount) as amountcollected - FROM egcl_receiptheader_v1 AS rh - 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 - JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode=pt_addr.locality - LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER - WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and financialyear='2020-21' - GROUP BY zonecode - ) - SELECT - fy2019.zonecode, - fy2019.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 fy2019 -- selected fy2019 because having all zone enteries - left outer join fy2013 on fy2013.zonecode=fy2019.zonecode - left outer join fy2014 on fy2014.zonecode=fy2019.zonecode - left outer join fy2015 on fy2015.zonecode=fy2019.zonecode - left outer join fy2016 on fy2016.zonecode=fy2019.zonecode - left outer join fy2017 on fy2017.zonecode=fy2019.zonecode - left outer join fy2018 on fy2018.zonecode=fy2019.zonecode - left outer join fy2020 on fy2020.zonecode=fy2019.zonecode - - -- reportName: AssessmentsReport_v2 - summary: Assessments Report - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: assessmentnumber - label: reports.pt.assessmentnumber - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialyear - type: string - source: pt - total: false - - name: propertyid - label: reports.pt.propertyid - 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: false - searchClause: AND createdtime >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND createdtime <= $toDate - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - assessmentnumber, - financialyear, - propertyid, - status - FROM eg_pt_asmt_assessment - WHERE tenantid=$tenantid - -- reportName: DumpReport_v2 - summary: Dump Report - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: createddate - label: reports.pt.createdDate - 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: status - label: reports.pt.status - type: string - source: pt - total: false - - name: propertytype - label: reports.pt.propertytype - type: string - source: pt - total: false - - name: ownershipcategory - label: reports.pt.ownershipcategory - type: string - source: pt - total: false - - name: usagecategory - label: reports.pt.usagecategory - type: string - source: pt - total: false - - name: creationreason - label: reports.pt.creationreason - 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: superbuiltuparea - label: reports.pt.superbuiltuparea - type: string - source: pt - total: false - - name: linkedproperties - label: reports.pt.linkedproperties - 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: floorno - label: reports.pt.floorno - type: string - source: pt - total: false - - name: unittype - label: reports.pt.unittype - type: string - source: pt - total: false - - name: usagecategory - label: reports.pt.usagecategory - type: string - source: pt - total: false - - name: occupancytype - label: reports.pt.occupancytype - type: string - source: pt - total: false - - name: occupancydate - label: reports.pt.occupancydate - type: string - source: pt - total: false - - name: carpetarea - label: reports.pt.carpetarea - type: string - source: pt - total: false - - name: builtuparea - label: reports.pt.builtuparea - type: string - source: pt - total: false - - name: plintharea - label: reports.pt.plintharea - type: string - source: pt - total: false - - name: superbuiltuparea - label: reports.pt.superbuiltuparea - type: string - source: pt - total: false - - name: arv - label: reports.pt.arv - type: string - source: pt - total: false - - name: constructiontype - label: reports.pt.carpetarea - type: string - source: pt - total: false - - name: constructiondate - label: reports.pt.constructiondate - type: string - source: pt - total: false - - name: dimensions - label: reports.pt.dimensions - type: string - source: pt - total: false - - name: active - label: reports.pt.active - type: string - source: pt - total: false - - name: doorno - label: reports.pt.doorno - type: string - source: pt - total: false - - name: plotno - label: reports.pt.plotno - type: string - source: pt - total: false - - name: buildingname - label: reports.pt.buildingname - type: string - source: pt - total: false - - name: street - label: reports.pt.street - type: string - source: pt - total: false - - name: landmark - label: reports.pt.landmark - type: string - source: pt - total: false - - name: city - label: reports.pt.city - type: string - source: pt - total: false - - name: pincode - label: reports.pt.pincode - type: string - source: pt - total: false - - name: locality - label: reports.pt.locality - type: string - source: pt - total: false - - name: region - label: reports.pt.region - type: string - source: pt - total: false - - name: state - label: reports.pt.state - type: string - source: pt - total: false - - name: country - label: reports.pt.country - type: string - source: pt - total: false - - name: latitude - label: reports.pt.latitude - type: string - source: pt - total: false - - name: longitude - label: reports.pt.longitude - type: string - source: pt - total: false - - name: ownerstatus - label: reports.pt.ownerstatus - type: string - source: pt - total: false - - name: ownershippercentage - label: reports.pt.ownershippercentage - type: string - source: pt - total: false - - name: institutionid - label: reports.pt.institutionid - type: string - source: pt - total: false - - name: relationship - label: reports.pt.relationship - type: string - source: pt - total: false - - 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: isprimaryowner - label: reports.pt.isprimaryowner - type: string - source: pt - total: false - - name: guardianrelation - label: reports.pt.guardianrelation - type: string - source: pt - total: false - - name: mobilenumber - label: reports.pt.mobilenumber - type: string - source: pt - total: false - - name: gender - label: reports.pt.gender - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND property.createdtime >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND property.createdtime <= $toDate - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - to_char((To_timestamp(property.createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY HH24:MI:SS') AS createddate, - property.propertyid, - property.oldpropertyid , - property.status, - property.propertytype, - property.ownershipcategory, - property.usagecategory, - property.creationreason, - property.nooffloors, - property.landarea, - property.superbuiltuparea, - property.linkedproperties, - property.source, - property.channel, - unit.floorno, - unit.unittype, - unit.usagecategory, - unit.occupancytype, - unit.occupancydate, - unit.carpetarea, - unit.builtuparea, - unit.plintharea, - unit.superbuiltuparea, - unit.arv, - unit.constructiontype, - unit.constructiondate, - unit.dimensions, - unit.active, - address.doorno, - address.plotno, - address.buildingname, - address.street, - address.landmark, - address.city, - address.pincode, - address.locality, - address.district, - address.region, - address.state, - address.country, - address.latitude, - address.longitude, - owner.status as ownerstatus, - owner.isprimaryowner, - owner.ownertype, - owner.ownershippercentage, - owner.institutionid, - owner.relationship, - users.name as ownername, - users.guardian, - users.guardianrelation, - users.mobilenumber, - users.gender - FROM eg_pt_property as property - inner join eg_pt_unit as unit on property.id=unit.propertyid - inner join eg_pt_address as address on property.id=address.propertyid - inner join eg_pt_owner as owner on property.id=owner.propertyid - inner join eg_user as users on owner.userid=users.uuid - WHERE owner.status='ACTIVE' and property.tenantid=$tenantid From 3ab6e93cb1c0a178da1ee31c89b623a4b527e381 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 15 Oct 2020 10:48:19 +0530 Subject: [PATCH 0353/1630] synch with UAT_V2 --- configs/reports/configs/pt-reports.yml | 241 +++++++++++-------------- 1 file changed, 106 insertions(+), 135 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 8602f4351..56cd08ab2 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 @@ -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,27 @@ 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 pd.businessservice='PT' + 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 +3013,7 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND financialyear = $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 @@ -3030,61 +3030,27 @@ 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, + (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, - (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, 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' + orderby: ORDER BY pd.receiptdate DESC; - reportName: ULBPTDataDumpReport_V2 @@ -3227,7 +3193,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 @@ -3238,12 +3204,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", @@ -3251,32 +3218,32 @@ 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", - eu."name" as "ownername", - eu.guardian as "guardianname", - pd.landarea as "totalarea", - pd.builduparea * 9 as "builtarea", - pd.nooffloors as "floors", + 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.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 - where payd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and payd.businessservice='PT' + 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' and pt.status!='INACTIVE' - reportName: Sewa_Kendra_ReceiptRegister_V2 @@ -3496,7 +3463,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 @@ -3841,13 +3808,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 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, count(pd.amountpaid) as totalcount, sum(case when payment.paymentmode='ONLINE' then pd.amountpaid else 0 end) as "online", @@ -3857,10 +3824,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 = $tenantid and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' groupby: GROUP BY financialyear orderby: ORDER BY financialyear @@ -3939,33 +3907,36 @@ 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 ('2019-20')) + 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 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 528f1477cec34e5d60348c54b7a145030e34f9de Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:54:55 +0530 Subject: [PATCH 0354/1630] Synch with UAT_V2 --- configs/reports/configs/pt-reports.yml | 291 +++++++++++++++---------- 1 file changed, 170 insertions(+), 121 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 56cd08ab2..ecfd1a3d8 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 @@ -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 @@ -2226,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 ( @@ -2266,15 +2280,17 @@ 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 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; @@ -2411,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 @@ -2425,13 +2446,27 @@ 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 - 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 + - 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 ( @@ -2472,11 +2507,15 @@ 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 + 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 + and pt_addr.propertyid=pt.id orderby: ORDER BY pd.receiptdate DESC; - reportName: OldUlbWisePtCollection_V2 @@ -2536,29 +2575,20 @@ ReportDefinitions: orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - reportName: StateCancelledReceiptRegister_V2 - summary: Receipt Register for cancelled Receipts State + 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.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 +2658,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 +2673,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 +2683,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 +2750,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 '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 + 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 +2828,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 +2835,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 +2843,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 @@ -2919,6 +2951,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 @@ -3039,7 +3072,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, @@ -3054,6 +3087,7 @@ ReportDefinitions: - reportName: ULBPTDataDumpReport_V2 + decryptionPathId: ULBPTDataDumpReport_V2 summary: ULB level report version: 1.0.0 moduleName: rainmaker-pt @@ -3541,11 +3575,21 @@ ReportDefinitions: type: string source: pt total: true - - name: adhocrebate - label: reports.pt.adhocrebate + - 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: noofassessments label: reports.pt.noofassessments type: string @@ -3595,6 +3639,10 @@ 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, + 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 @@ -3674,13 +3722,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 @@ -3688,7 +3736,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 @@ -3709,7 +3757,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 @@ -3833,6 +3881,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 254fbeff0d5a19cd28e96db55f535714d4b264ad Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Oct 2020 11:58:09 +0530 Subject: [PATCH 0355/1630] syncing UAT V2 and PROD V2 --- .../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 26c1eade0..0f32eede6 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[0].bankName" + } + }, { + "variable": "branchName", + "value": { + "path": "$.additionalDetails[0].branchName" + } + }, { + "variable": "ifsc", + "value": { + "path": "$.ifscCode" + } }, { "variable": "paymentDate", From 83d519fb7044150a4060c503b375703910bb2aa2 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Oct 2020 12:00:43 +0530 Subject: [PATCH 0356/1630] syncing UAT_V2 and PROD_V2 --- .../data-config/property-receipt.json | 72 +++++++++++++++++-- 1 file changed, 68 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 29084f38a..025633150 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", @@ -158,6 +164,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 +505,11 @@ { "variable": "pendingAmount", "formula": "{{dueAmount}}-{{paidAmount}}" - } + }, + { + "variable": "Arrears", + "formula": "{{Arrears1}}+{{Arrears2}}+{{Arrears3}}+{{Arrears4}}+{{Arrears5}}+{{Arrears6}}+{{Arrears7}}+{{Arrears8}}" + } ] }, { @@ -512,6 +563,9 @@ { "variable":"fatherHusbandName", "value":"$.Properties[0].owners[0].fatherOrHusbandName" + },{ + "variable":"propertyUsage", + "value":"$.Properties[0].usageCategory" }, { "variable":"doorNo", @@ -584,14 +638,24 @@ } }, { - "variable":"usage_category", + "variable":"usage_category", + "value":"usageCategory", + "localisation": { + "required": true, + "prefix": "COMMON_PROPUSGTYPE", + "module": "rainmaker-pt" + } + }, + { + "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 6e982cc9f9f25d9c185170f08879b05fd7f424f2 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Oct 2020 12:03:46 +0530 Subject: [PATCH 0357/1630] syncing UAT_v2 to PROD_v2 --- .../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 82cf24395..a647b8340 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 ee98f49268323022318539b72d69825272db28fc Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Oct 2020 12:19:23 +0530 Subject: [PATCH 0358/1630] syncing UAT_V2 to PROD_V2 --- 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 b7620aeed..ee5114bc5 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 65484e0071a2714a162951dd9a210ee3c23069ee Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Oct 2020 12:21:50 +0530 Subject: [PATCH 0359/1630] syncing UAT_V2 to PROD_v2 --- .../format-config/consolidatedreceipt.json | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 684740987..786955e33 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" + } ], [ @@ -903,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 88af963d2f43d1d2d5823947cf1f598b440b8ee3 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Oct 2020 12:23:21 +0530 Subject: [PATCH 0360/1630] syncing UAT_V2 to PROD_V2 --- .../format-config/property-receipt.json | 127 +++++++++++++++--- 1 file changed, 111 insertions(+), 16 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index fc6b1e727..0b6b7886e 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": {} @@ -461,7 +504,7 @@ ], [ { - "text": "{{paid_amount}}", + "text": "Amount to be Paid", "border": [ true, false, @@ -471,7 +514,7 @@ "style": "receipt-table-value" }, { - "text": "₹ {{paidAmount}}", + "text": "₹ {{dueAmount}}", "border": [ false, false, @@ -481,7 +524,7 @@ "style": "receipt-table" }, { - "text": "{{pending_amount}}", + "text": "{{paid_amount}}", "border": [ false, false, @@ -491,7 +534,7 @@ "style": "receipt-table-value" }, { - "text": "₹ {{pendingAmount}}", + "text": "₹ {{paidAmount}}", "border": [ false, false, @@ -503,7 +546,7 @@ ], [ { - "text": "{{payment_mode}}", + "text": "{{pending_amount}}", "border": [ true, false, @@ -513,7 +556,7 @@ "style": "receipt-table-value" }, { - "text": "{{paymentMode}}", + "text": "₹ {{pendingAmount}}", "border": [ false, false, @@ -523,7 +566,7 @@ "style": "receipt-table" }, { - "text": "{{transaction_id}}", + "text": "{{payment_mode}}", "border": [ false, false, @@ -532,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, @@ -590,7 +675,7 @@ "layout": {} }, { - "text":"PAYABLE AMOUNT", + "text":"PAID AMOUNT", "style":"block-head" }, { @@ -598,7 +683,7 @@ "table": { "widths": [ - "9%","8%","7%","7%","8%","7%","10%","10%","8%","8%","8%","*" + "9%","8%","6%","7%","7%","7%","9%","9%","8%","8%","7%","7%","*" ], "body": [ @@ -642,6 +727,9 @@ { "text": "Adhoc Rebate", "style": "amounts" + },{ + "text": "Arrears", + "style": "amounts" }, { "text": "Round Off", @@ -694,6 +782,9 @@ { "text": "{{adhocRebate}}", "style": "amounts" + },{ + "text": "{{Arrears}}", + "style": "amounts" }, { "text": "{{RoundOff}}", @@ -737,6 +828,7 @@ "table": { "widths": [ "15%", + "20%", "*", "20%", "20%" @@ -747,9 +839,12 @@ { "text": "Floor", "style": "receipt-table-value" + },{ + "text": "Usage", + "style": "receipt-table-value" }, { - "text": "Usage", + "text": "Sub Usage", "style": "receipt-table-value" }, { @@ -761,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 94d38e4f0655a93c7f826778a25a7cba9c270675 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Oct 2020 12:26:35 +0530 Subject: [PATCH 0361/1630] syncing UAT_V2 to PROD_v2 --- .../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 a26a8cf90..1c74c077c 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 4f30f73c9252c7d27f17aa64eb4655fb11b459bf Mon Sep 17 00:00:00 2001 From: ashok-eGov <57890337+ashok-eGov@users.noreply.github.com> Date: Fri, 30 Oct 2020 10:51:08 +0530 Subject: [PATCH 0362/1630] Update property-receipt.json Adding the Payment status --- .../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 025633150..0cc2543b6 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -32,6 +32,12 @@ "path": "$.mobileNumber" } }, + { + "variable": "paymentStatus", + "value": { + "path": "$.paymentStatus" + } + }, { "variable": "receiptNo", "value": { @@ -318,6 +324,18 @@ "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", "value": { From 28948b2868ebe17043841535dc45529e3b58b659 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 2 Nov 2020 12:51:43 +0530 Subject: [PATCH 0363/1630] paymentMode search fileter bug 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 ecfd1a3d8..48cbcbd92 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 @@ -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 instrumenttype = $paymentMode From 295ffe10c4f92b6cab6692cd2f2a572c6a605295 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 2 Nov 2020 14:54:46 +0530 Subject: [PATCH 0364/1630] receiptregister_fix --- 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 48cbcbd92..0a5c6d031 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 b414177327b8bb07781b51c59d39e64f310fa57a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 3 Nov 2020 10:02:39 +0530 Subject: [PATCH 0365/1630] synch with UAT_V2 --- configs/reports/configs/pt-reports.yml | 37 +++++++++++++++++--------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 0a5c6d031..e729a9dd3 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; @@ -3038,7 +3038,7 @@ ReportDefinitions: 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 + 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; @@ -3434,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 @@ -3575,6 +3576,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 @@ -3590,11 +3596,16 @@ ReportDefinitions: type: string source: pt total: true - - name: noofassessments - label: reports.pt.noofassessments + - 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 @@ -3951,7 +3962,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 4027299b1ce78cc464f44f83afbc951757ec04e2 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 3 Nov 2020 10:05:02 +0530 Subject: [PATCH 0366/1630] Synch with UAT_V2 --- configs/reports/configs/uc-reports.yml | 39 +++++++++++++++++--------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 8336e3c2f..07db96ad0 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 ) @@ -1079,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 @@ -1134,17 +1135,22 @@ 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.*, 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 + 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 @@ -1301,9 +1307,11 @@ 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 + 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' + 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 @@ -1380,7 +1388,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 @@ -1445,7 +1453,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 @@ -1457,6 +1466,7 @@ ReportDefinitions: - reportName: MiscReceiptULBCancelled_v2 + decryptionPathId: MiscReceiptULB_v2 summary: Cancelled Receipt Miscellaneous version: 1.0.0 moduleName: rainmaker-uc @@ -1582,8 +1592,9 @@ 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 + (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 @@ -1592,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 @@ -1663,10 +1675,11 @@ 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, - payment.additionaldetails->>'comment' as remarks + (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 + 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 dbc9273ecd8bdc245b9360c3ce23e062494fe8da Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 3 Nov 2020 10:09:02 +0530 Subject: [PATCH 0367/1630] synch with UAT_V2 --- configs/reports/configs/tl-reports.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index dd3bb49ad..bb9f66bd7 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 @@ -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 '' 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 ( @@ -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 @@ -2484,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 0d70691c40fc1576d2006629cc52fe00c190c37e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 3 Nov 2020 10:13:43 +0530 Subject: [PATCH 0368/1630] Synch with UAT_V2 --- configs/reports/configs/pgr-reports.yml | 47 ++++++++++++------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 9f00950c3..7e01c2793 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) @@ -929,24 +929,26 @@ 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 @@ -1053,13 +1055,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 +1141,7 @@ ReportDefinitions: orderby: ORDER BY tenantid - reportName: EmployeeReport_v2 + decryptionPathId: EmployeeReport_v2 summary: Fetches complaints for employees 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 @@ -1356,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 @@ -1387,7 +1382,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 @@ -1569,6 +1564,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 +1635,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 +1724,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 @@ -1795,13 +1792,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 9d0970bbbe715da2b48aa52cc9b00bb53d94b62b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 3 Nov 2020 11:12:14 +0530 Subject: [PATCH 0369/1630] Synch with UAT_V2 --- .../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 444bd9e63..cc06a4af6 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 @@ -564,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 @@ -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 @@ -658,3 +664,137 @@ 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: 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 + 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, + 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 + 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 + From 318e592737207dda4e90ea0423d1b2f2e8a249bf Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 3 Nov 2020 12:59:52 +0530 Subject: [PATCH 0370/1630] FY Filter 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 e729a9dd3..f8515c4ac 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2453,7 +2453,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 From 8cb002ed5177ddf1018dd41b237e7dbec340722d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 3 Nov 2020 15:13:32 +0530 Subject: [PATCH 0371/1630] usageType column value fixed --- 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 f8515c4ac..3c5379076 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2279,7 +2279,7 @@ 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, + 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, @@ -2506,7 +2506,7 @@ 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, + 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, @@ -2767,7 +2767,7 @@ 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, + 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 From 4db5d8ea0c4b95e9018865dc2e169cb051b7b3be Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 3 Nov 2020 15:30:09 +0530 Subject: [PATCH 0372/1630] financialyear shown --- configs/reports/configs/pt-reports.yml | 37 +++++++------------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 3c5379076..92836628b 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,8 +2270,7 @@ 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(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, @@ -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 @@ -2501,9 +2490,7 @@ 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(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, @@ -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,8 +2745,7 @@ 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(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, From 155952221c85feb7b6b9bd8d6431f02e245ea906 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 4 Nov 2020 11:35:03 +0530 Subject: [PATCH 0373/1630] 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 2eb43e814..5fc7b2ab0 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 a784e13770dad5661b09b359a9bfd40a6fb1911e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 4 Nov 2020 12:04:53 +0530 Subject: [PATCH 0374/1630] decryptionKey added for summaryReport_v2 --- 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 92836628b..a75ab6111 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3495,6 +3495,7 @@ ReportDefinitions: - reportName: ReceiptRegisterSummary_V2 + decryptionPathId: ReceiptRegisterShort_V2 summary: Receipt Register Summary version: 1.0.0 moduleName: rainmaker-pt @@ -3635,7 +3636,7 @@ ReportDefinitions: 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, + (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 From cfca5ce5545ccfef7693b6057cf9c674d09dd4d0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 4 Nov 2020 13:47:04 +0530 Subject: [PATCH 0375/1630] summary receiptregister 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 a75ab6111..aaa3ad727 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3618,7 +3618,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, @@ -3632,10 +3632,10 @@ 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, + 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 From c7398620cfe2a43298a88129dc5460fd2fd9158a Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 4 Nov 2020 16:57:14 +0530 Subject: [PATCH 0376/1630] [PI-804] Changed type of accessories --- 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 7673bf3f8..c23c2acb8 100644 --- a/configs/pdf-service/data-config/tlapplication.json +++ b/configs/pdf-service/data-config/tlapplication.json @@ -989,7 +989,7 @@ "value":{ "path":"$.tradeLicenseDetail.accessories.*" }, - "type":"array", + "type":"array-column", "format":{ "type":"string", "scema":[ From e8fa85a57924b5de0dc3671bdfc513e2235bf403 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 4 Nov 2020 17:55:10 +0530 Subject: [PATCH 0377/1630] Reverted accessories type --- 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 c23c2acb8..7673bf3f8 100644 --- a/configs/pdf-service/data-config/tlapplication.json +++ b/configs/pdf-service/data-config/tlapplication.json @@ -989,7 +989,7 @@ "value":{ "path":"$.tradeLicenseDetail.accessories.*" }, - "type":"array-column", + "type":"array", "format":{ "type":"string", "scema":[ From dd770da545a1843d6cdc4b310b28ea85f7e3a0fd Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 4 Nov 2020 18:45:13 +0530 Subject: [PATCH 0378/1630] propertUsageType in PTDefaulterReport_v2 Fixed --- 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 aaa3ad727..60504c1a2 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3952,7 +3952,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 ac2129190af2a5375cb5c2e8d3bc46633d3e6c59 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 4 Nov 2020 19:39:04 +0530 Subject: [PATCH 0379/1630] ulb and statePtCollectioReport update --- 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 60504c1a2..7c2b9ace5 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2802,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 @@ -2834,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: @@ -2887,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 @@ -2919,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 From 7351a7ffc570383245171c18b0d849505b99ffdf Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 5 Nov 2020 16:23:44 +0530 Subject: [PATCH 0380/1630] 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 0b6b7886e..8675bd674 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 7a6dc92c6b25034df102eaf5b1f1b59ff8c6bb53 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 17 Nov 2020 11:26:58 +0530 Subject: [PATCH 0381/1630] syncing UAT_V2 to PROD_V2 --- .../data-config/property-receipt.json | 40 +++++++++++-------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 0cc2543b6..1f29ad522 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -32,7 +32,7 @@ "path": "$.mobileNumber" } }, - { + { "variable": "paymentStatus", "value": { "path": "$.paymentStatus" @@ -58,7 +58,7 @@ { "variable": "paidAmount", "value": { - "path": "$.paymentDetails[0].totalAmountPaid" + "path": "$.totalAmountPaid" } }, { @@ -143,31 +143,31 @@ { "variable": "dueAmount", "value": { - "path": "$.paymentDetails[0].totalDue" + "path": "$.paymentDetails[0].bill.totalAmount" } }, { "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" } }, { @@ -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" } }, { @@ -324,7 +324,7 @@ "module":"rainmaker-common" } }, - { + { "variable": "payment_status", "value": { "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_STATUS" @@ -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", @@ -689,7 +694,8 @@ { "variable":"additional_details", "value":"additionalDetails" - } + } + ] } } From 720fb9c8e670919b31e3784f9fef90c798ae7b7f Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 17 Nov 2020 12:26:23 +0530 Subject: [PATCH 0382/1630] syncing UAT_V2 to PROD_V2 --- .../data-config/tlcertificate.json | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index 9e8368be2..a42e2e397 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -208,7 +208,39 @@ ] } - }, + }, { + "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", From d2d8d3bf4e4f7e27edeec08b6fee286e5e7e823e Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 17 Nov 2020 12:27:38 +0530 Subject: [PATCH 0383/1630] syncing UAT_V2 to PROD_V2 --- .../data-config/tlrenewalcertificate.json | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tlrenewalcertificate.json b/configs/pdf-service/data-config/tlrenewalcertificate.json index a647b8340..cc548ca5a 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": { From ece7dc1faf3c7811927ebe34cff33da684374e99 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 17 Nov 2020 12:29:39 +0530 Subject: [PATCH 0384/1630] syncing UAT_V2 to PROd_V2 --- .../data-config/tradelicense-receipt.json | 66 ++++++++++++++++++- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index ee5114bc5..0ac26997c 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": "$.additionalDetails.collectedBy" + } + }, { "variable": "payerContact", "value": { @@ -43,6 +49,12 @@ "path": "$.paymentDetails[0].receiptNumber" } }, + { + "variable": "add", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.address" + } + }, { "variable": "serviceType", "value": { @@ -158,7 +170,7 @@ { "variable": "dueAmount", "value": { - "path": "$.paymentDetails[0].totalDue" + "path": "$.paymentDetails[0].bill.totalAmount" } }, { @@ -513,6 +525,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 +610,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 +686,16 @@ } } ] + },{ + "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" + } + ] } ] From 49cb2055c072c2ba5a4398a70a0fb1b7eba7af21 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 17 Nov 2020 12:35:17 +0530 Subject: [PATCH 0385/1630] syncing UAT_V2 to PROD_V2 --- configs/pdf-service/format-config/consolidatedreceipt.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 786955e33..ee430f8e1 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"} ] } ], From c2cab211dc56cc96ab40cac15585a8bbc64e2739 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 17 Nov 2020 12:37:09 +0530 Subject: [PATCH 0386/1630] syncing UAT_V2 to PROD_V2 --- .../format-config/property-receipt.json | 314 +++++++++--------- 1 file changed, 166 insertions(+), 148 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 8675bd674..49385b28c 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, @@ -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" @@ -576,7 +702,7 @@ "style": "receipt-table-value" }, { - "text": "₹ {{paymentMode}}", + "text": "{{paymentMode}}", "border": [ false, false, @@ -674,133 +800,6 @@ }, "layout": {} }, - { - "text":"PAID 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": "{{paidAmount}}", - "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. Feet) / Total Annual Rent", - "style": "receipt-table-value" + "text": "Built Area (Sq. Yard) / Total 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}}" @@ -910,16 +909,17 @@ "bold": true, "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 https://mseva.lgpunjab.gov.in/" - ] - } + { "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"} ] } ], @@ -1001,6 +1001,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 +1069,12 @@ }, "amounts": { - "fontSize": 8 + "fontSize": 8, + "backgroundColor": "#D3D3D3" + }, + "amountss": + { + "fontSize": 8 } } } From 11998eae93ab6f9b18c24c499464936af24abdfa Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 17 Nov 2020 12:39:48 +0530 Subject: [PATCH 0387/1630] syncing UAT_V2 to PROD_V2 --- .../format-config/tlcertificate.json | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index b744a6d2d..50dffcf09 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": {} + + } ], From e88082ca9565e0c3f2f75e54507889c0e7012eba Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 17 Nov 2020 12:41:08 +0530 Subject: [PATCH 0388/1630] syncing UAT_V2 to PROD_V2 --- .../format-config/tlrenewalcertificate.json | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/configs/pdf-service/format-config/tlrenewalcertificate.json b/configs/pdf-service/format-config/tlrenewalcertificate.json index 1c74c077c..cc751826e 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 039cbc354e0c8d80a4b64926641bf636fba8fa57 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 17 Nov 2020 12:42:25 +0530 Subject: [PATCH 0389/1630] Synch with UAT_V2 --- configs/reports/configs/pt-reports.yml | 76 +++++++++++++++++--------- 1 file changed, 51 insertions(+), 25 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 7c2b9ace5..1e6f60730 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 '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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, @@ -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 @@ -2749,9 +2759,10 @@ 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 '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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; @@ -3051,7 +3062,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 '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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, @@ -3187,6 +3198,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 @@ -3208,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 @@ -3220,7 +3243,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,7 +3270,10 @@ ReportDefinitions: payment.payeraddress as "payeraddress", pt.additionaldetails->>'remarks' as "remarks", pt.additionaldetails->>'FirmBusinessName' as "businessname", - pta.locality as "localitycode" + 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 @@ -3256,6 +3282,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' @@ -3477,7 +3504,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 '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 @@ -3634,7 +3661,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 '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 @@ -3847,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 6ea24d56a8a3ff4f985b200e5b5442419f811c1a Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 17 Nov 2020 12:42:46 +0530 Subject: [PATCH 0390/1630] syncing UAT_V2 to PROD_V2 --- .../format-config/tradelicense-receipt.json | 43 ++++++++++++++++--- 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index f0ad6055b..fa7b5aa42 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}},{{logo-header}}", "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", @@ -768,14 +797,14 @@ "bold": true }, { - "text": "{{user-name}}", + "text": "{{userName}}", "bold": false } ], "alignment": "left" }, { - "text": [ + "text": [ { "text": "Authorised Signatory", "bold": true @@ -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 31604a44562b7086a0a909bdf28a87ae6d916155 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 17 Nov 2020 12:46:05 +0530 Subject: [PATCH 0391/1630] Synch with UAT_V2 --- 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 bb9f66bd7..e34fe8ed0 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 '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' END) as collectorname FROM eg_tl_tradelicense tl INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id INNER JOIN ( @@ -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 @@ -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 4fd4c35df141a36de007669249333034b4bec5df Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 17 Nov 2020 12:47:33 +0530 Subject: [PATCH 0392/1630] Synch with UAT_V2 --- 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 07db96ad0..6892b0265 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 @@ -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 '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 76e3ebed5c46b87bdb1a5156f2d252351e7ff65e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 17 Nov 2020 12:50:02 +0530 Subject: [PATCH 0393/1630] Synch with UAT_V2 --- configs/reports/configs/pgr-reports.yml | 99 +++++++++++++++++++++++-- 1 file changed, 93 insertions(+), 6 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 7e01c2793..f91b858a6 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 @@ -1055,17 +1060,18 @@ 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 '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' else eg_user.name end) as name, --value for NULL 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 @@ -1633,9 +1639,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 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, @@ -1644,8 +1649,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 @@ -1817,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 f0cc44e578b3cf95231d880c088d332a820480e4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 17 Nov 2020 12:51:13 +0530 Subject: [PATCH 0394/1630] Synch with UAT_V2 --- .../reports/configs/rainmaker-noc-reports.yml | 41 ++++++++++++++----- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index cc06a4af6..de53e9422 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 @@ -797,4 +817,3 @@ ReportDefinitions: 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 dcb150fd22ecadd04b67ad68da39afb2c64dd376 Mon Sep 17 00:00:00 2001 From: Abhilashegov Date: Thu, 19 Nov 2020 13:02:24 +0530 Subject: [PATCH 0395/1630] Synced changes of UAT_V2 with PROD_v2 Folder Persister --- .../collection-migration-count.yml | 23 +++++++++++++++++++ .../collection-migration-persister.yml | 4 ++-- .../property-services-registry.yml | 4 ++-- .../egov-persister/tradelicense-persister.yml | 8 +++++-- configs/egov-persister/tradelicense.yml | 6 ++++- 5 files changed, 38 insertions(+), 7 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 000000000..ce6c394c8 --- /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 f9a20d5b8..c1106a598 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 diff --git a/configs/egov-persister/property-services-registry.yml b/configs/egov-persister/property-services-registry.yml index a851db885..d52151a8b 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: diff --git a/configs/egov-persister/tradelicense-persister.yml b/configs/egov-persister/tradelicense-persister.yml index e772d467d..b012713ec 100644 --- a/configs/egov-persister/tradelicense-persister.yml +++ b/configs/egov-persister/tradelicense-persister.yml @@ -824,10 +824,14 @@ 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: + - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail + type: JSON + dbType: JSONB + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty @@ -840,4 +844,4 @@ serviceMaps: - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - jsonPath: $.Licenses.*.tradeLicenseDetail.id + - 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 e772d467d..2efc31844 100644 --- a/configs/egov-persister/tradelicense.yml +++ b/configs/egov-persister/tradelicense.yml @@ -824,10 +824,14 @@ 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: + - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail + type: JSON + dbType: JSONB + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty From 187db4a0a9032e8eab0a86d931efd530e797b39d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 20 Nov 2020 12:07:29 +0530 Subject: [PATCH 0396/1630] receiptRegister updated get_fromPeriod function --- configs/reports/configs/pt-reports.yml | 32 +++++++++++--------------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 1e6f60730..27251a4f7 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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 @@ -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 '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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; @@ -2494,7 +2490,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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, @@ -2759,7 +2755,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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, payment.paymentstatus as paystatus @@ -3062,7 +3058,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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, @@ -3504,7 +3500,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 @@ -3661,7 +3657,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 81b6706c952382283f04ae88ce78eeab9357ddf1 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 20 Nov 2020 12:16:06 +0530 Subject: [PATCH 0397/1630] decrption key value 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 27251a4f7..d400e86cf 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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 @@ -2490,7 +2490,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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, @@ -2755,7 +2755,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 @@ -3058,7 +3058,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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, @@ -3500,7 +3500,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 @@ -3657,7 +3657,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 12ca43a2d8991dfa02ccb2046fd0c2796fd71e47 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 20 Nov 2020 15:55:50 +0530 Subject: [PATCH 0398/1630] locality based search enabled --- 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 d400e86cf..096caa08c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2278,9 +2278,11 @@ 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; From 9c4dbd7f934d1b45ece7fb6920df35723495c07b Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 23 Nov 2020 14:27:07 +0530 Subject: [PATCH 0399/1630] syncing UAT_v2 to prod_v2 --- .../pdf-service/data-config/consolidatedreceipt.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index 0f32eede6..c3ddd5903 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.comment" + } + }, { "variable": "comments", "value": { From 158e906b4ac212e86b724f57c3b8488dfcbb1242 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 23 Nov 2020 14:28:37 +0530 Subject: [PATCH 0400/1630] syncing UAT_V2 to prod_V2 --- .../data-config/property-receipt.json | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 1f29ad522..4eaa19a38 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -579,9 +579,29 @@ "apiRequest": null, "responseMapping":[ { + "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": { From 2154f852b0a06ea6488b132bc0c4f3c1b16b948e Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 23 Nov 2020 14:35:47 +0530 Subject: [PATCH 0401/1630] syncing UAT_V2 to prod_V2 --- configs/pdf-service/data-config/tlcertificate.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index a42e2e397..f53de2156 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -208,9 +208,10 @@ ] } - }, { + }, + { "variable": "variable_owners", - "value": "$.Licenses[0].tradeLicenseDetail.owners[?(@.active== true && @.userActive== true)]", + "value": {"path":"$.tradeLicenseDetail.owners[?(@.active== true && @.userActive== true)]"}, "type":"array", "format":{ "type":"string", From 8a379bb9e8f2a294f40f3250c74c9d8f44cfbd71 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 23 Nov 2020 14:41:20 +0530 Subject: [PATCH 0402/1630] syncing uat_v2 to prod_v2 --- 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 cc548ca5a..2cd370ed6 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": "$.Licenses[0].tradeLicenseDetail.owners[?(@.active== true && @.userActive== true)]", - "type":"array", + "value": {"path":"$.tradeLicenseDetail.owners[?(@.active== true && @.userActive== true)]"}, + "type":"array", "format":{ "type":"string", "scema":[ From f9f7b906e1b811d1fe90a08cf59d7c0c70c6cbe3 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 23 Nov 2020 14:42:59 +0530 Subject: [PATCH 0403/1630] syncing uat_v2 to prod_v2 --- .../data-config/tradelicense-receipt.json | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index 0ac26997c..da919bc81 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}}" + } ] }, { From d95136a6b54c11b0f1278e12ff2a5f0c9b674d1f Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 23 Nov 2020 14:48:01 +0530 Subject: [PATCH 0404/1630] syncing uat_v2 to prod_v2 --- .../format-config/property-receipt.json | 145 +++++++++++++++++- 1 file changed, 144 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 49385b28c..b0b438606 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, + 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: ", "style": "receipt-approver" From 04bcb050a571be5941d8ad19d5a831cada94c805 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 23 Nov 2020 14:54:13 +0530 Subject: [PATCH 0405/1630] syncing uat_v2 to prod_v2 --- configs/pdf-service/format-config/tlcertificate.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index 50dffcf09..ebc70a71a 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.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 b688e61c55348842013bac7f48435dc7798db9c7 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 23 Nov 2020 14:58:47 +0530 Subject: [PATCH 0406/1630] syncing uat_v2 to prod_v2 --- .../pdf-service/format-config/tlrenewalcertificate.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/format-config/tlrenewalcertificate.json b/configs/pdf-service/format-config/tlrenewalcertificate.json index cc751826e..6d730906b 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 8d4ab1209dd1d506bfe678dd784b0cf274f9db60 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 23 Nov 2020 15:00:42 +0530 Subject: [PATCH 0407/1630] syncing uat_v2 to prod_v2 --- .../format-config/tradelicense-receipt.json | 43 +++++++++---------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index fa7b5aa42..427aa13af 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 5b024686132a5289d25d3498773bb85c8ded8dc8 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 25 Nov 2020 13:09:37 +0530 Subject: [PATCH 0408/1630] query change fire --- configs/reports/configs/rainmaker-noc-reports.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index de53e9422..01836d9a2 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -653,7 +653,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 ) @@ -676,13 +676,13 @@ 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 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 payment.tenantid = $tenantid orderby: ORDER BY paydetail.receiptdate DESC - reportName: CancelledReceiptRegisterFirenocReport_V2 From 6736f1d58a4012cff6506887ec1018d9d9f702e8 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Wed, 25 Nov 2020 21:11:36 +0530 Subject: [PATCH 0409/1630] [PI-1054]-Added indexing configurations as per QA environment --- .../payment-indexer-migration.yml | 54 ++ .../property-services-migration-temp.yml | 731 ++++++++++++++++++ 2 files changed, 785 insertions(+) create mode 100644 configs/egov-indexer/payment-indexer-migration.yml 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 new file mode 100644 index 000000000..f2b0a3053 --- /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/property-services-migration-temp.yml b/configs/egov-indexer/property-services-migration-temp.yml new file mode 100644 index 000000000..b399805c8 --- /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 545951ff8916bc6e576711a2f2b04e0a2e43129f Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Fri, 27 Nov 2020 10:14:06 +0530 Subject: [PATCH 0410/1630] [PI-1054]-Added config for usage category property for PROD 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 b399805c8..ee91c294c 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 9b8e13d6ddebe9ff6cf1f6cf52d627c1a77a69a3 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 27 Nov 2020 14:37:09 +0530 Subject: [PATCH 0411/1630] Synch with UAT_V2 --- configs/reports/configs/tl-reports.yml | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index e34fe8ed0..f9148724b 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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 @@ -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, @@ -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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 ( @@ -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 @@ -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 89aac4bf2a7553cf9819774d160e1133d4ec3506 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 27 Nov 2020 14:43:04 +0530 Subject: [PATCH 0412/1630] Synch with UAT_V2 --- .../reports/configs/rainmaker-noc-reports.yml | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index 01836d9a2..5c9c65038 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 @@ -610,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 @@ -673,6 +679,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 @@ -682,10 +689,13 @@ 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 + and payment.paymentstatus!='CANCELLED' 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 @@ -786,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 ) @@ -809,11 +819,12 @@ 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 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 77f2e014fc398ef8d18475fc79c5e82b19595dcd Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 27 Nov 2020 14:44:14 +0530 Subject: [PATCH 0413/1630] Synch with UAT_V2 --- configs/reports/configs/uc-reports.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 6892b0265..5c972d183 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 @@ -1135,8 +1136,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 +1153,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 @@ -1594,7 +1596,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 +1677,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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, billd.additionaldetails->>'comment' as remarks FROM egcl_payment AS payment INNER JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id From bfe8fcda15697f9150d811f3b2194b624f94ae02 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 27 Nov 2020 14:45:34 +0530 Subject: [PATCH 0414/1630] Synch with UAT_V2 --- configs/reports/configs/pt-reports.yml | 677 ++++++++++++++++++++++++- 1 file changed, 656 insertions(+), 21 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 096caa08c..d09ed1b8d 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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 @@ -2246,10 +2246,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 @@ -2270,22 +2271,25 @@ 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, + 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.*, 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; - + + - reportName: CancelledReceiptRegister_V2 decryptionPathId: CancelledReceiptRegister_V2 summary: Receipt Register for cancelled Receipts @@ -2492,7 +2496,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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, @@ -2757,7 +2761,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 @@ -3060,7 +3064,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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, @@ -3502,7 +3506,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 @@ -3659,7 +3663,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 @@ -3890,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 @@ -4005,3 +4010,633 @@ 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 + 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 + + +- 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, + 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 b7d596d574505096f6f763332aa0d068e67fbc57 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 27 Nov 2020 14:46:54 +0530 Subject: [PATCH 0415/1630] Synch with UAT_V2 --- 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 f91b858a6..dfaa4e4df 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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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),'30048|+3/xnyTtx2VYznMwVlAA/wJxplY=') 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 27ea11112e27082aa51dde8ea56f0c16eb92c8f6 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 27 Nov 2020 14:51:58 +0530 Subject: [PATCH 0416/1630] hard coded encrypted values updated --- 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 d09ed1b8d..fe0b4f9fe 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|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, + (case when eg_user.name is null then '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, + (case when eg_user.name is null then '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 @@ -2275,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 @@ -2496,7 +2496,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|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname, + (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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, @@ -2761,7 +2761,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|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname, + (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 @@ -3064,7 +3064,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|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, + (case when eg_user.name is null then '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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, @@ -3506,7 +3506,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|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname, + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 @@ -3663,7 +3663,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|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname, --for Online collecion show None as collectorname + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 bff1ac1b504346fc29a453f5cd1a9e8fe0952fdb Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 27 Nov 2020 15:14:59 +0530 Subject: [PATCH 0417/1630] 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 5c972d183..2bf0c2105 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1596,7 +1596,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|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname + (case when eg_user.name is null then '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 @@ -1677,7 +1677,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|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, + (case when eg_user.name is null then '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 bc1171d911833fa5e6a13e28e07286a1e547bdb4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 27 Nov 2020 15:16:08 +0530 Subject: [PATCH 0418/1630] 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 f9148724b..22c19fe03 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|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname --value for Online + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname + (CASE WHEN paymentmode!='ONLINE' THEN eg_user.name ELSE '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' END) as collectorname FROM eg_tl_tradelicense tl INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id INNER JOIN ( From a9d57690561a3bd0718839ccf6c5c27c9f15c4c0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 27 Nov 2020 15:18:28 +0530 Subject: [PATCH 0419/1630] 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 dfaa4e4df..f91b858a6 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|23/xn3x2FAxn8vYAN0IdplsOxaE=' else ua.name end) as lastassignedto, --value for Unassigned + (case when ua.name is null then '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 + (case when eg_user.name is null then '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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|23/xn3x2FAxn8vYAN0IdplsOxaE=') as employee, -- encrypted value for NULL + coalesce((select name from eg_user where id::varchar = assignee),'30048|+3/xnyTtx2VYznMwVlAA/wJxplY=') 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 806a0ae9f4deb9ded8d1800be8e0c0e821d9157d Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Fri, 27 Nov 2020 15:44:33 +0530 Subject: [PATCH 0420/1630] [PI-1070]-Sync the configs branch PROD_V2 with UAT_V2 --- configs/egov-dss-dashboards/.project | 11 ++ .../property-services-migration.yml | 134 ++++++++++++++++++ configs/egov-indexer/property-services.yml | 8 +- .../data-config/property-receipt.json | 77 +++++++++- .../format-config/property-receipt.json | 12 +- configs/reports/configs/pgr-reports.yml | 6 +- configs/reports/configs/pt-reports.yml | 17 ++- .../reports/configs/rainmaker-noc-reports.yml | 1 + configs/reports/configs/tl-reports.yml | 6 +- configs/reports/configs/uc-reports.yml | 5 +- rainmaker-custom-service/index.js | 46 +++++- 11 files changed, 288 insertions(+), 35 deletions(-) create mode 100644 configs/egov-dss-dashboards/.project create mode 100644 configs/egov-indexer/property-services-migration.yml diff --git a/configs/egov-dss-dashboards/.project b/configs/egov-dss-dashboards/.project new file mode 100644 index 000000000..918700e2c --- /dev/null +++ b/configs/egov-dss-dashboards/.project @@ -0,0 +1,11 @@ + + + egov-dss-dashboards + + + + + + + + diff --git a/configs/egov-indexer/property-services-migration.yml b/configs/egov-indexer/property-services-migration.yml new file mode 100644 index 000000000..dc7202133 --- /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 index d679c3c9d..6f1c2522e 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: diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 4eaa19a38..88542d5f2 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -60,6 +60,12 @@ "value": { "path": "$.totalAmountPaid" } + }, + { + "variable": "assessmentYear", + "value": { + "path": "$.paymentDetails[0].additionalDetails.assessmentYears" + } }, { "variable": "fromPeriod", @@ -467,7 +473,76 @@ "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": { diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index b0b438606..dc82bf46f 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, @@ -144,7 +144,7 @@ "style": "receipt-table-value" }, { - "text": "{{assessmentYear1}}-{{assessmentYear2}}", + "text": "{{assessmentYear}}", "border": [ false, false, @@ -571,8 +571,8 @@ ] }, "layout":{} - }, - { + }, + { "text":"PAYMENT INFORMATION", "style":"block-head" }, @@ -608,7 +608,7 @@ "style": "receipt-table" }, { - "text": "{{billing_period}}", + "text": " ", "border": [ false, true, @@ -618,7 +618,7 @@ "style": "receipt-table-value" }, { - "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "text": " ", "border": [ false, true, diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index f91b858a6..dfaa4e4df 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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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),'30048|+3/xnyTtx2VYznMwVlAA/wJxplY=') 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, diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index fe0b4f9fe..0741eee99 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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 @@ -2275,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 @@ -2496,7 +2496,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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, @@ -2761,7 +2761,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 @@ -3064,7 +3064,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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, @@ -3506,7 +3506,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 @@ -3663,7 +3663,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' END) as collectorname, --for Online collecion show None 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 @@ -3894,7 +3894,6 @@ 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 diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index 5c9c65038..7c49499f1 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -828,3 +828,4 @@ ReportDefinitions: 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/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 22c19fe03..9ade15e5c 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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 '30048|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 ( @@ -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 and payment.paymentstatus!='CANCELLED' + WHERE tl.tenantId = $tenantid - reportName: StateTradeLicenseCancelledRegistryReport_v2 diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 2bf0c2105..63a09cce6 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -834,7 +834,6 @@ ReportDefinitions: - reportName: MiscReceipt_v2 - decryptionPathId: MiscReceiptULB_v2 summary: Receipt Register Miscellaneous version: 1.0.0 moduleName: rainmaker-uc @@ -1596,7 +1595,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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 @@ -1677,7 +1676,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|+3/xnyTtx2VYznMwVlAA/wJxplY=' 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, billd.additionaldetails->>'comment' as remarks FROM egcl_payment AS payment INNER JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index 6e42249ab..fc742333b 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"] @@ -729,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"] @@ -739,9 +745,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 +802,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 +832,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 ) @@ -897,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"] @@ -905,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) } @@ -998,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) @@ -1010,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; @@ -1024,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 d6732a21265689e8ad7253f0ca236b448358bfdc Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 27 Nov 2020 16:13:13 +0530 Subject: [PATCH 0421/1630] syncing UAT_V2 to PROD_v2 --- .../pdf-service/data-config/property-receipt.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 88542d5f2..e75703960 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,6 +664,7 @@ "queryParam": "propertyIds=$.paymentDetails[0].bill.consumerCode,tenantId=$.tenantId", "apiRequest": null, "responseMapping":[ + { "variable":"vasikaNo", "value":"$.Properties[0].additionalDetails.vasikaNo" From 389e79d1323dd1b0e9169efd6168d56842160567 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 27 Nov 2020 16:17:28 +0530 Subject: [PATCH 0422/1630] syncing UAT_V2 to prod_v2 --- .../format-config/property-receipt.json | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index dc82bf46f..d08351f80 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, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{penaltyReason}}", + "border": [ + false, + true, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "Rebate Reason", + "border": [ + false, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{rebateReason}}", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} }, { "text":"OWNERSHIP INFORMATION", From 89b96decc207a99565d780ec3bf704b8dadaa14e Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Sat, 28 Nov 2020 08:43:19 +0530 Subject: [PATCH 0423/1630] [PI-1054]-Removed test in the index name for property and assessment --- configs/egov-indexer/property-services-migration-temp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-indexer/property-services-migration-temp.yml b/configs/egov-indexer/property-services-migration-temp.yml index ee91c294c..43a20544e 100644 --- a/configs/egov-indexer/property-services-migration-temp.yml +++ b/configs/egov-indexer/property-services-migration-temp.yml @@ -5,7 +5,7 @@ ServiceMaps: - topic: save-property-registry-batch configKey: INDEX indexes: - - name: property-services-test + - name: property-services type: general id: $.propertyId,$.tenantId jsonPath: $.Property @@ -624,7 +624,7 @@ ServiceMaps: - topic: save-pt-assessment-batch configKey: INDEX indexes: - - name: property-assessments-test + - name: property-assessments type: general id: $.assessmentNumber, $.tenantId jsonPath: $.Assessment From c6f54ca83b16183f63f20a151a3c9f02ab4cdb76 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Sat, 28 Nov 2020 18:55:29 +0530 Subject: [PATCH 0424/1630] [PI-1070]-Clone persister^Configs from PROD_V2 branch from QA_LATEST --- .../assessment-persister-migration-temp.yml | 4 +--- .../migration-batch-count-persister.yml | 4 +--- ...property-services-migration-temp-config.yml | 18 ------------------ 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/configs/egov-persister/assessment-persister-migration-temp.yml b/configs/egov-persister/assessment-persister-migration-temp.yml index 26cb84ede..7137529db 100644 --- a/configs/egov-persister/assessment-persister-migration-temp.yml +++ b/configs/egov-persister/assessment-persister-migration-temp.yml @@ -223,6 +223,4 @@ serviceMaps: - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedBy - - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedTime - - + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedTime \ 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 index 46295c658..9019909a5 100644 --- a/configs/egov-persister/migration-batch-count-persister.yml +++ b/configs/egov-persister/migration-batch-count-persister.yml @@ -22,6 +22,4 @@ serviceMaps: - jsonPath: $.MigrationCount.tenantid - - jsonPath: $.MigrationCount.recordCount - - \ No newline at end of file + - 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 index fa057f504..a4e65f92f 100644 --- a/configs/egov-persister/property-services-migration-temp-config.yml +++ b/configs/egov-persister/property-services-migration-temp-config.yml @@ -398,21 +398,3 @@ 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 7d2c08a639c07a5c6c42317df994febeeea1b16d Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Sun, 29 Nov 2020 18:17:42 +0530 Subject: [PATCH 0425/1630] [PI-1074] moved finyear function call to select clause instead to get for all the tenenats and map --- configs/reports/configs/pt-reports.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 0741eee99..9a2a29828 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(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, @@ -2279,11 +2279,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 9c6568feb55940ae73b07aba8b67eef7f3a9e822 Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Mon, 30 Nov 2020 00:46:01 +0530 Subject: [PATCH 0426/1630] [PI-1074] Added default encrypted text for no username --- 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 9a2a29828..15dcb8c1a 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2275,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 From 8faca322a34fd84751c7563eb39a593b9c35641f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 30 Nov 2020 08:44:14 +0530 Subject: [PATCH 0427/1630] fycollectionReport Locality filter fixed --- 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 15dcb8c1a..2df81f452 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3893,6 +3893,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 e5867ad2f02b302c7e4ef09d80d71f62921d04f4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 30 Nov 2020 09:45:34 +0530 Subject: [PATCH 0428/1630] 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 2df81f452..2951d46af 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3892,8 +3892,8 @@ ReportDefinitions: 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_pt_property pt ON pt.propertyid = bill.consumercode + LEFT OUTER 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 daeb89bb10e17b9a415b376a5753c787c127d08d Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 1 Dec 2020 12:49:38 +0530 Subject: [PATCH 0429/1630] 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 d08351f80..be9f280f0 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 b60d965071f496bc47b35d97ba15aa84cbef4e9f Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 1 Dec 2020 13:45:05 +0530 Subject: [PATCH 0430/1630] [PI-8702] changes for ulb header --- 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 427aa13af..ff03d3452 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}} {{mcGrade}}", + "text": "{{mcGrade}} {{logo-header}}", "style": "receipt-logo-header" }, { From 5b0f6607d2c5cd21951eac34ec391dd1e859703d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 1 Dec 2020 15:03:27 +0530 Subject: [PATCH 0431/1630] FY corrected in ReceiptRegister_Short_V2 --- 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 2951d46af..d817909ae 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3062,7 +3062,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, From fed1d250b4552d3e30e5f1f69a9a20ad9345a266 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 1 Dec 2020 15:51:44 +0530 Subject: [PATCH 0432/1630] corrected cheque date in miscReceipt_ULB_V2 --- 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 63a09cce6..24121e4a1 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1143,7 +1143,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 From 9bcf895b60528b4c6d7cc6b2c56044e89574bbe6 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 1 Dec 2020 16:32:30 +0530 Subject: [PATCH 0433/1630] FYCollectionsReport_v2 fixed --- configs/reports/configs/pt-reports.yml | 52 ++++++++++++++++++-------- 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index d817909ae..0c438da56 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3854,6 +3854,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,28 +3895,28 @@ 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 amount, + 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", - 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 - LEFT OUTER JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode - LEFT OUTER 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' + 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 From 5d58fcdbb4aaf826a38728662c37cc4db5698e3e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 2 Dec 2020 08:00:30 +0530 Subject: [PATCH 0434/1630] fycollections totalamount --- 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 0c438da56..a9a7e8887 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3896,7 +3896,7 @@ ReportDefinitions: query: | -- Use CTE to force query plan, compute & use CTE later SELECT - sum(payment.totalamountpaid) as amount, + 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", From 8565b23f7ebafea383bacbefa6def5bbe001e5b8 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 2 Dec 2020 09:07:08 +0530 Subject: [PATCH 0435/1630] ZoneFyReport Fixed --- configs/reports/configs/pt-reports.yml | 286 +++++++++++-------------- 1 file changed, 127 insertions(+), 159 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index a9a7e8887..a753fa257 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4149,191 +4149,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 + zones.zname as zone_name, + 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 @@ -4343,7 +4311,7 @@ ReportDefinitions: 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 + orderby: order by zname - reportName: BlockFYReport_V2 From 806c19d81b0eb5066d293ad076184a0c7bc4ef92 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 2 Dec 2020 09:20:42 +0530 Subject: [PATCH 0436/1630] BlockFY Report Fix --- configs/reports/configs/pt-reports.yml | 280 +++++++++++-------------- 1 file changed, 124 insertions(+), 156 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index a753fa257..0e2661e9b 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4282,7 +4282,7 @@ ReportDefinitions: ) SELECT zones.zonecode as zonecode, - zones.zname as zone_name, + 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", @@ -4311,7 +4311,7 @@ ReportDefinitions: left outer join fy2019 on fy2019.zonecode=zones.zonecode left outer join fy2020 on fy2020.zonecode=zones.zonecode where 1=1 - orderby: order by zname + orderby: order by zonename - reportName: BlockFYReport_V2 @@ -4429,195 +4429,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>=$fromperiod and pd.receiptdate<=$toperiod + 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>=$fromperiod and pd.receiptdate<=$toperiod + 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>=$fromperiod and pd.receiptdate<=$toperiod + 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>=$fromperiod and pd.receiptdate<=$toperiod + 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>=$fromperiod and pd.receiptdate<=$toperiod + 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>=$fromperiod and pd.receiptdate<=$toperiod + 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>=$fromperiod and pd.receiptdate<=$toperiod + 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>=$fromperiod and pd.receiptdate<=$toperiod + 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 @@ -4625,6 +4591,8 @@ 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 + order by blockname + orderby: order by blockname From 93d2e6c2e253832c2edc3efd7e513158dd0314bc Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 2 Dec 2020 10:02:15 +0530 Subject: [PATCH 0437/1630] made propertyID field bold in PT receipt --- .../data-config/property-receipt.json | 77 +------------------ .../format-config/property-receipt.json | 19 ++++- 2 files changed, 19 insertions(+), 77 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index e75703960..16af9362a 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -484,76 +484,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": { @@ -619,7 +550,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":[ @@ -660,7 +591,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":[ @@ -811,7 +742,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":[ diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index be9f280f0..9c5208c15 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" } ], [ @@ -1227,6 +1227,17 @@ 0, 0 ] + },"receipt-tableee": { + "color": "#000000", + "bold": false, + "fontSize": 7, + "fontWeight": 500, + "margin": [ + 0, + 0, + 0, + 0 + ] }, "receipt-approver": { "fontSize": 7, From 231d27c203307fcb4833d3eea192fce4c004f372 Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 2 Dec 2020 10:10:55 +0530 Subject: [PATCH 0438/1630] removed localhost from PT receipt --- 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 16af9362a..a5795ba6f 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -550,7 +550,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":[ @@ -591,7 +591,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":[ @@ -742,7 +742,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 70cd9167ca9a052aabe468ede1ff54338d2d6359 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 2 Dec 2020 10:30:17 +0530 Subject: [PATCH 0439/1630] zone and block FY Report fromDate & toDate filter --- configs/reports/configs/pt-reports.yml | 34 ++++++++++++-------------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 0e2661e9b..60d17b7e4 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4160,7 +4160,7 @@ ReportDefinitions: 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 + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate GROUP BY financialyear,zonecode ), @@ -4177,7 +4177,7 @@ ReportDefinitions: 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 + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate GROUP BY financialyear,zonecode ), fy2015 as @@ -4193,7 +4193,7 @@ ReportDefinitions: 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 + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate GROUP BY financialyear,zonecode ), fy2016 as @@ -4209,7 +4209,7 @@ ReportDefinitions: 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 + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate GROUP BY financialyear,zonecode ), fy2017 as @@ -4225,7 +4225,7 @@ ReportDefinitions: 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 + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate GROUP BY financialyear,zonecode ), fy2018 as @@ -4241,7 +4241,7 @@ ReportDefinitions: 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 + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate GROUP BY financialyear,zonecode ), fy2019 as @@ -4257,7 +4257,7 @@ ReportDefinitions: 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 + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate GROUP BY financialyear,zonecode ), fy2020 as @@ -4273,7 +4273,7 @@ ReportDefinitions: 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 + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate GROUP BY financialyear,zonecode ), zones as @@ -4442,7 +4442,7 @@ ReportDefinitions: 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>=$fromperiod and pd.receiptdate<=$toperiod + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate GROUP BY financialyear,blockcode ), @@ -4459,7 +4459,7 @@ ReportDefinitions: 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>=$fromperiod and pd.receiptdate<=$toperiod + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate GROUP BY financialyear,blockcode ), fy2015 as @@ -4475,7 +4475,7 @@ ReportDefinitions: 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>=$fromperiod and pd.receiptdate<=$toperiod + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate GROUP BY financialyear,blockcode ), fy2016 as @@ -4491,7 +4491,7 @@ ReportDefinitions: 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>=$fromperiod and pd.receiptdate<=$toperiod + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate GROUP BY financialyear,blockcode ), fy2017 as @@ -4507,7 +4507,7 @@ ReportDefinitions: 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>=$fromperiod and pd.receiptdate<=$toperiod + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate GROUP BY financialyear,blockcode ), fy2018 as @@ -4523,7 +4523,7 @@ ReportDefinitions: 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>=$fromperiod and pd.receiptdate<=$toperiod + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate GROUP BY financialyear,blockcode ), fy2019 as @@ -4539,7 +4539,7 @@ ReportDefinitions: 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>=$fromperiod and pd.receiptdate<=$toperiod + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate GROUP BY financialyear,blockcode ), fy2020 as @@ -4555,7 +4555,7 @@ ReportDefinitions: 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>=$fromperiod and pd.receiptdate<=$toperiod + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate GROUP BY financialyear,blockcode ), blocks as @@ -4593,6 +4593,4 @@ ReportDefinitions: left outer join fy2019 on fy2019.blockcode=blocks.blockcode left outer join fy2020 on fy2020.blockcode=blocks.blockcode where 1=1 - order by blockname - orderby: order by blockname From 7c7180e3d09f717f7ecc01c18b06b942b7b28f8a Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 2 Dec 2020 11:10:57 +0530 Subject: [PATCH 0440/1630] [PI-8712] changes for generated by --- 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 ff03d3452..e67a421ec 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -796,7 +796,7 @@ "bold": true }, { - "text": "{{userName}}", + "text": "{{user-name}}", "bold": false } ], From 7e704c3feb4864980f6a9dd762d27adebc740898 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 2 Dec 2020 14:51:22 +0530 Subject: [PATCH 0441/1630] made propertyid bold --- 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 9c5208c15..49f165db9 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -1229,7 +1229,7 @@ ] },"receipt-tableee": { "color": "#000000", - "bold": false, + "bold": true, "fontSize": 7, "fontWeight": 500, "margin": [ From 9b64794b706146b6199f9f6e22711d8f64b3bf5c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 2 Dec 2020 19:46:18 +0530 Subject: [PATCH 0442/1630] resolved exception casting bigint --- 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 dfaa4e4df..c4730b335 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -1238,7 +1238,7 @@ ReportDefinitions: 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, + to_char(to_timestamp(TRUNC(eg_pgr_service.createdtime::Integer / 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, From 6bbee53491e43e55e158ac028571e35469720298 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 3 Dec 2020 09:55:51 +0530 Subject: [PATCH 0443/1630] added report receiptRegister_without_locality --- configs/reports/configs/pt-reports.yml | 211 ++++++++++++++++++++++++- 1 file changed, 210 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 60d17b7e4..e7476583d 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 @@ -2289,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 From b517ef328f30eaa746468515275a29586ec1aae4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 3 Dec 2020 14:54:54 +0530 Subject: [PATCH 0444/1630] fetching only active owners --- 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 e7476583d..5b9c76fc7 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3490,7 +3490,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 @@ -4232,7 +4232,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_pt_unit_v2_ot as pot on pot.propertyid = pt.id From ccc623357c881166dba79ab25fed27666c734b79 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 4 Dec 2020 15:46:00 +0530 Subject: [PATCH 0445/1630] updated CancelledReceiptRegister without locality --- configs/reports/configs/pt-reports.yml | 44 ++++++++++++-------------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 5b9c76fc7..f810c6255 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2660,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 ( @@ -2677,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 From a4acf9bb2625e698c81c2d4e1dbbc79b86801220 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 7 Dec 2020 15:50:47 +0530 Subject: [PATCH 0446/1630] ulbWisePT Report update --- configs/reports/configs/pt-reports.yml | 84 ++++++++++++++------------ 1 file changed, 45 insertions(+), 39 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index f810c6255..0a9c9479e 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3019,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: pd.receiptdate <= $toDate - name: financialyear label: Financial Year type: singlevaluelist @@ -3033,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 @@ -3041,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 @@ -3102,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 @@ -3116,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 @@ -3124,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=$tenanid 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 From 9bc25b2b97a34deb2986a70d1d8e309134bad0e4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 8 Dec 2020 13:18:27 +0530 Subject: [PATCH 0447/1630] decryptionPathId added MiscReceipt_v2 state report --- 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 24121e4a1..61819036c 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 f334f689c5e3c911b68a3ea87f8cc4a416d70db2 Mon Sep 17 00:00:00 2001 From: egovmis Date: Tue, 8 Dec 2020 14:35:14 +0530 Subject: [PATCH 0448/1630] added ifsc code,bank name and branch on Pt receipt --- .../data-config/property-receipt.json | 22 +++++++++- .../format-config/property-receipt.json | 43 ++++++++++++++++++- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index a5795ba6f..cf84e7435 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", @@ -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" diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 49f165db9..625dc66fd 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -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" + } ], [ { @@ -1274,7 +1315,7 @@ "fontSize": 8, "margin": [ 2, - 1, + 0, 0, 0 ], From 413713cd9a44c3bd0320043c6397cee9bd62c311 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Tue, 8 Dec 2020 17:26:08 +0530 Subject: [PATCH 0449/1630] Added v2 changes for weekly-impact-emailer-searcher.yml --- .../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 6ba4e8aef..2cf53cd1b 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 0ba4b06ab46555a97cadaa00236fae41b14e79d0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 9 Dec 2020 15:34:50 +0530 Subject: [PATCH 0450/1630] corrected spellings --- 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 0a9c9479e..8f44f4c72 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3147,7 +3147,7 @@ ReportDefinitions: 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=$tenanid 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 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 291fca72772cff82b360821717e529d36d9aa7ba Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 9 Dec 2020 16:23:05 +0530 Subject: [PATCH 0451/1630] changed value of transaction id --- 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 cf84e7435..3d4f16329 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -152,7 +152,7 @@ { "variable": "transactionID", "value": { - "path": "$.transactionNumber" + "path": "$.instrumentNumber" } }, { "variable": "transactionDate", From 96eb361e88a458bf96a3ebade234eacafbbaaedd Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 9 Dec 2020 16:34:21 +0530 Subject: [PATCH 0452/1630] FY Filter in cancelled receipt register --- 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 8f44f4c72..6e5a9e995 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2652,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 @@ -2961,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, From 2f0824e9b5eb33fab00ee1ea8f58195aaa2edc03 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 10 Dec 2020 14:39:47 +0530 Subject: [PATCH 0453/1630] 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 6e5a9e995..ea084544c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3025,7 +3025,7 @@ ReportDefinitions: type: epoch source: pt isMandatory: false - searchClause: pd.receiptdate <= $toDate + searchClause: AND pd.receiptdate <= $toDate - name: financialyear label: Financial Year type: singlevaluelist From bc1ca3eee57445106e2fd9a5b259e281acc5a540 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 10 Dec 2020 15:22:41 +0530 Subject: [PATCH 0454/1630] AcountReceiptRegisterShort_v2 without locality --- configs/reports/configs/pt-reports.yml | 130 +++++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index ea084544c..d0a0b709f 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3288,6 +3288,136 @@ ReportDefinitions: 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 From 3bb0f73fe269da32349301e331c134c9bf7b38e6 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 11 Dec 2020 07:26:24 +0530 Subject: [PATCH 0455/1630] added FYCollectionsReport_WithoutLocality_V2 --- configs/reports/configs/pt-reports.yml | 134 ++++++++++++++++++++++++- 1 file changed, 133 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index d0a0b709f..b2a91e793 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4259,7 +4259,139 @@ ReportDefinitions: 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 + 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 From e6a5053540799ca1a472b70a228c122a6c7d503b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 11 Dec 2020 19:18:50 +0530 Subject: [PATCH 0456/1630] New Defaulter Report Added --- configs/reports/configs/pt-reports.yml | 111 ++++++++++++++++++++++++- 1 file changed, 109 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index b2a91e793..abf2e0088 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4502,9 +4502,116 @@ 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' + 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: 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: maxamountpaid + label: reports.pt.maxamountpaid + 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: 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 + string_agg(distinct (payd.receiptnumber),',') as receiptnumber, + -- initcap(split_part(payd.tenantid, '.', 2))),',') as "ulb", + consumercode as "propertytaxuniqueid", + string_agg(distinct to_char((To_timestamp(payd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY'),',') AS "transcationdate", + --string_agg(payd.receiptnumber,',') as "receiptnumber", + string_agg(distinct pt.oldpropertyid,',') as "existingpropertyid", + max(payd.amountpaid) as maxamountpaid, + string_agg(distinct concat(to_char((To_timestamp(get_fromperiod(payd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(payd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')),',') as financialyear, + split_part(string_agg(distinct eu."name",','),',',1) as ownername, + --eu.guardian as "guardianname", + string_agg(distinct pot.propertytype,',') as "propertytype", + split_part(string_agg(distinct eu.mobilenumber,','),',',1) as "mobileno", + string_agg(distinct 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 payment.paymentstatus!='CANCELLED' + 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' + groupby: group by consumercode + - reportName: ZoneFYReport_V2 summary: Zone FY Collection version: 1.0.0 From dcd1d642d2a20e99e29de7ef3fd415f626e2e5f1 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 14 Dec 2020 10:20:13 +0530 Subject: [PATCH 0457/1630] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index abf2e0088..0f1d2bad1 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4535,6 +4535,11 @@ ReportDefinitions: type: string source: pt total: false + - name: paidamounts + label: reports.pt.paidamounts + type: string + source: pt + total: false - name: maxamountpaid label: reports.pt.maxamountpaid type: string @@ -4591,6 +4596,7 @@ ReportDefinitions: string_agg(distinct to_char((To_timestamp(payd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY'),',') AS "transcationdate", --string_agg(payd.receiptnumber,',') as "receiptnumber", string_agg(distinct pt.oldpropertyid,',') as "existingpropertyid", + string_agg(distinct payd.amountpaid,',') as paidamounts, max(payd.amountpaid) as maxamountpaid, string_agg(distinct concat(to_char((To_timestamp(get_fromperiod(payd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(payd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')),',') as financialyear, split_part(string_agg(distinct eu."name",','),',',1) as ownername, From 8e821d614c441f46141604ecff3481fa3715ada2 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 15 Dec 2020 10:20:10 +0530 Subject: [PATCH 0458/1630] 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 0f1d2bad1..c70bd3976 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4596,7 +4596,7 @@ ReportDefinitions: string_agg(distinct to_char((To_timestamp(payd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY'),',') AS "transcationdate", --string_agg(payd.receiptnumber,',') as "receiptnumber", string_agg(distinct pt.oldpropertyid,',') as "existingpropertyid", - string_agg(distinct payd.amountpaid,',') as paidamounts, + string_agg(distinct payd.amountpaid::VARCHAR,',') as paidamounts, max(payd.amountpaid) as maxamountpaid, string_agg(distinct concat(to_char((To_timestamp(get_fromperiod(payd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(payd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')),',') as financialyear, split_part(string_agg(distinct eu."name",','),',',1) as ownername, From 373e2922115f8dba11056ed738dc0e65ada20403 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 15 Dec 2020 15:11:56 +0530 Subject: [PATCH 0459/1630] [Pi-8790] added bank details in TL receipt --- .../format-config/tradelicense-receipt.json | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index e67a421ec..75ddbb4c8 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 31546d1c8b56fa6cca85d48429859ff121900119 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 15 Dec 2020 15:14:17 +0530 Subject: [PATCH 0460/1630] [PI-8790] added bank details on TL Receipt --- .../data-config/tradelicense-receipt.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index da919bc81..18bbfda20 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -49,6 +49,24 @@ "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": { From ef7f928074b89d624810ff598ec10fd7b3ee5154 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 16 Dec 2020 11:28:25 +0530 Subject: [PATCH 0461/1630] updation for arrears --- .../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 3d4f16329..a124ddefd 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 3252b55f918c77219b53183bb6fb4b0a36f0ad81 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 17 Dec 2020 13:12:51 +0530 Subject: [PATCH 0462/1630] removed payer name from 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 625dc66fd..186da05c9 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 058d04cee2fcb4d50deb0773acab3851218df38a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 17 Dec 2020 13:16:17 +0530 Subject: [PATCH 0463/1630] added state defaulter report mini --- configs/reports/configs/pt-reports.yml | 86 ++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index c70bd3976..e6460765a 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4617,6 +4617,92 @@ ReportDefinitions: 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' groupby: group by consumercode + +- 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 From 6c487252fc9e7f7080c1da31a7defed5d18d3b57 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 17 Dec 2020 15:16:48 +0530 Subject: [PATCH 0464/1630] new defaulter report update --- configs/reports/configs/pt-reports.yml | 94 +++++++++----------------- 1 file changed, 32 insertions(+), 62 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index e6460765a..631956d19 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4515,36 +4515,11 @@ ReportDefinitions: 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: paidamounts - label: reports.pt.paidamounts - type: string - source: pt - total: false - - name: maxamountpaid - label: reports.pt.maxamountpaid - type: string - source: pt - total: true - name: ownername label: reports.pt.ownername type: string @@ -4565,11 +4540,6 @@ ReportDefinitions: 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 @@ -4579,44 +4549,44 @@ ReportDefinitions: 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 - ) + 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 - string_agg(distinct (payd.receiptnumber),',') as receiptnumber, - -- initcap(split_part(payd.tenantid, '.', 2))),',') as "ulb", - consumercode as "propertytaxuniqueid", - string_agg(distinct to_char((To_timestamp(payd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY'),',') AS "transcationdate", - --string_agg(payd.receiptnumber,',') as "receiptnumber", - string_agg(distinct pt.oldpropertyid,',') as "existingpropertyid", - string_agg(distinct payd.amountpaid::VARCHAR,',') as paidamounts, - max(payd.amountpaid) as maxamountpaid, - string_agg(distinct concat(to_char((To_timestamp(get_fromperiod(payd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(payd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')),',') as financialyear, - split_part(string_agg(distinct eu."name",','),',',1) as ownername, + --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(distinct pot.propertytype,',') as "propertytype", - split_part(string_agg(distinct eu.mobilenumber,','),',',1) as "mobileno", + 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 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' + 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 - left outer join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id - where payd.tenantid = $tenantid and payment.paymentstatus!='CANCELLED' - 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')) + inner join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id + 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' - groupby: group by consumercode + 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 From 56ab4ecee7679c099d3a9d794be1c241680e68a8 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 17 Dec 2020 17:03:14 +0530 Subject: [PATCH 0465/1630] locality in DefaulterReport --- 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 631956d19..13863d9cb 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4568,20 +4568,22 @@ ReportDefinitions: 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", + 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 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_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_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' From 19d5e76829ab0ad979e4ae469dcbb1e221be3169 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Thu, 17 Dec 2020 18:56:05 +0530 Subject: [PATCH 0466/1630] performance changes --- .../rainmaker-pgr-v2-searcher.yml | 256 ++++++++++++++++-- 1 file changed, 226 insertions(+), 30 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml index 252cd0bc1..fc0559527 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: @@ -61,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 + + AND eg_pgr_action.when IN ( + select + max("when") + from + eg_pgr_action + $where + and assignee NOTNULL + group by + businessKey + ) + ) servicesRequestIds groupBy: orderBy: searchParams: @@ -185,31 +409,3 @@ SearchDefinitions: jsonFormat: {"ResponseInfo": {}} outJsonPath: $.services responseInfoPath: $.ResponseInfo - - - - - - - - - - - - - - - - - - - - - - - - - - - - From ea899d904da016a92e9485aa0344030b57c15325 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Wed, 23 Dec 2020 09:30:27 +0530 Subject: [PATCH 0467/1630] title transfer changes merge --- .../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 d52151a8b..4c48bb0fc 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 f128cd8b132e266c23b6eacc790cd81c7f2ea995 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 23 Dec 2020 11:25:51 +0530 Subject: [PATCH 0468/1630] _FIELD_FEE to _FEE conversion As found some of the businessservice like OTHER.Noc_Fee are not having _FIELD_FEE --- 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 61819036c..adb690676 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 @@ -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 From 39e62c0402da573d905d3de44c00e1c70c594638 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 23 Dec 2020 15:02:44 +0530 Subject: [PATCH 0469/1630] function getfinancialyear(billid) applied for FY function getfinancialyear(billid) fetch all FY(with amount paid) against bill --- configs/reports/configs/pt-reports.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 13863d9cb..bfb589b5a 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3274,7 +3274,8 @@ 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, - 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, + --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, @@ -3406,7 +3407,8 @@ 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, - 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, + --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, @@ -3598,7 +3600,8 @@ ReportDefinitions: 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", + --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", From 0291f533cea4587910f7dd0fd6fc556378bcc2b7 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 23 Dec 2020 16:09:07 +0530 Subject: [PATCH 0470/1630] updated summary collctorname paymentmode !=ONLINE updated collectorname in ReceiptRegister_Summary_v2 for correct collectorame where paymentmode!=ONLINE --- 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 bfb589b5a..4f2f5e868 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4007,7 +4007,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|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname, --for Online collecion show None as collectorname + (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 From 31c921227892dc9fab2dd446197ac59dc958cbbf Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Sat, 26 Dec 2020 13:32:56 +0530 Subject: [PATCH 0471/1630] added approved by field --- .../format-config/property-receipt.json | 60 +++++++++++++++++-- 1 file changed, 56 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 186da05c9..e6690a27a 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": "{{payer_name}}", "border": [ false, false, @@ -206,7 +206,7 @@ "style": "receipt-table-value" }, { - "text": " ", + "text": "{{payerName}}", "border": [ false, false, @@ -967,7 +967,7 @@ "style":"block-head" }, { - "style": "next-noc-table", + "style": "next-noc-table2", "table": { "widths": [ "25%", @@ -1143,6 +1143,39 @@ ] } ] + }, + { + "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", @@ -1231,6 +1264,15 @@ -22, -8 ] + }, "next-noc-table2": { + "fontSize": 7, + "color": "#000000", + "margin": [ + -25, + 10, + -22, + 0 + ] }, "receipt-table-value": { "color": "#000000", @@ -1285,7 +1327,17 @@ "bold": true, "margin": [ -27, - 20, + 7, + -10, + 0 + ], + "color": "#484848" + },"receipt-approver2": { + "fontSize": 7, + "bold": true, + "margin": [ + -27, + 1, -10, 0 ], From 6ace72f17f24399909c9fed1d65b8003a80f73ad Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 28 Dec 2020 11:32:07 +0530 Subject: [PATCH 0472/1630] cheque count corrected --- 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 4f2f5e868..a4240baa8 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4005,7 +4005,7 @@ ReportDefinitions: + 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, + COUNT(distinct case when payment.paymentmode='CHEQUE' then concat(payment.paymentmode,payment.instrumentnumber,payment.ifsccode) 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 8e8298549b8704996eb2e9529811da668e512260 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 30 Dec 2020 12:00:52 +0530 Subject: [PATCH 0473/1630] bankname in receiptregister --- 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 a4240baa8..a26b01022 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 eedb15b7235d31f36cc0366fc9aed1bafc895294 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 31 Dec 2020 17:04:22 +0530 Subject: [PATCH 0474/1630] 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 a124ddefd..cba7033ba 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 a3edefe4016a1b0b6b46751608f3788bb51aa436 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 31 Dec 2020 17:06:45 +0530 Subject: [PATCH 0475/1630] added institution name on pt receipt --- .../format-config/property-receipt.json | 59 ++++++++++++++++++- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index e6690a27a..905c1109d 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, @@ -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 fe5f0cf351586fdaac3090c411b658a9630b41ad Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Mon, 4 Jan 2021 12:26:01 +0530 Subject: [PATCH 0476/1630] 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 2cf53cd1b..3d5b20454 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 fe656654f78a8a7774dbc7e7b21e8238ac2222a6 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 4 Jan 2021 15:05:32 +0530 Subject: [PATCH 0477/1630] StateTradeLicenseDetailsReport_v2 added --- configs/reports/configs/tl-reports.yml | 143 +++++++++++++++++++++++++ 1 file changed, 143 insertions(+) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 9ade15e5c..6e6323aa2 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2484,3 +2484,146 @@ 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: StateTradeLicenseDetailsReport_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: 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, + 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 + 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 tenantid + + + + + From 374b37341db634860b4198fffc183feb1ea3db59 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 4 Jan 2021 16:32:49 +0530 Subject: [PATCH 0478/1630] TopPayersReport_V2 added for 2020-21 --- configs/reports/configs/pt-reports.yml | 77 ++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index a26b01022..37a4f7bbf 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5243,3 +5243,80 @@ ReportDefinitions: left outer join fy2020 on fy2020.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: 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 + type: string + source: pt + total: true + - 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: 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 + - query: | + select + billid, + amountpaid, + egcl_bill.status, + consumercode as propertytaxuniqueid, + egcl_billdetial.tenantid, + ownerdt.userName as ownername, + ownerdt.Mobilenumber as mobileno, + concat(addr.doorno,',',addr.street,' ',addr.buildingname,' ',eg_bndry_mohalla.localityname) as address, + oldpropertyid as existingpropertyid + from egcl_billdetial + inner join egcl_bill on egcl_bill.id=billid and egcl_bill.businessservice='PT' + inner join eg_pt_property on eg_pt_property.propertyid=egcl_bill.consumercode and eg_pt_property.status='ACTIVE' + inner join + (SELECT propertyid , locality,doorno,street,buildingname, max(createdtime) + from eg_pt_address group by propertyid, locality, doorno,street,buildingname) addr ON eg_pt_property.id=addr.propertyid + inner join eg_bndry_mohalla on eg_bndry_mohalla.localitycode=addr.locality + inner join (SELECT DISTINCT ON (propertyid) propertyid ,username As userName , mobilenumber As Mobilenumber + FROM eg_pt_owner , eg_user + WHERE uuid = userid + AND status = 'ACTIVE' + AND active = true ) ownerdt ON eg_pt_property.id=ownerdt.propertyid + where + fromperiod='1585699200000' + and toperiod='1617215399000' + and egcl_bill.status='ACTIVE' + --and billid='00088a80-5671-408d-8494-2fb83b91b04f' + orderby: order by amountpaid desc From 7e480268cc57d3889dd3cb7230d86ce517690bfa Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 4 Jan 2021 20:37:24 +0530 Subject: [PATCH 0479/1630] 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 37a4f7bbf..3d44315d6 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5291,7 +5291,6 @@ ReportDefinitions: 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 - - query: | select billid, amountpaid, From 5701e995d6185e61da404fc34e11f8b4dab4abf9 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 5 Jan 2021 08:28:52 +0530 Subject: [PATCH 0480/1630] Update tl-reports.yml --- 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 6e6323aa2..bd86ef4cf 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2596,6 +2596,7 @@ ReportDefinitions: licensenumber, to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, tl.tradeName, + tl.tenantid, tradeTypeName, acc, name, @@ -2606,7 +2607,7 @@ ReportDefinitions: 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')) + 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 ( @@ -2621,7 +2622,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!='pb.testing' - orderby: order by tenantid + orderby: order by tl.tenantid From a34729dacb791da3d45f3e365e8d050296a431a2 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 5 Jan 2021 09:25:26 +0530 Subject: [PATCH 0481/1630] Tl report state --- configs/reports/configs/tl-reports.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index bd86ef4cf..57c768c74 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2556,6 +2556,11 @@ ReportDefinitions: 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 From 1c2a13fc438e56007ffc42faf4131182afc5546a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 5 Jan 2021 10:43:17 +0530 Subject: [PATCH 0482/1630] decryotionKey updated --- 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 57c768c74..7bb046d2a 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2486,7 +2486,7 @@ ReportDefinitions: and tenantid = $tenantid - reportName: StateTradeLicenseDetailsReport_v2 - decryptionPathId: StateTradeLicenseDetailsReport_v2 + decryptionPathId: TradeLicenseDetailsReport_v2 summary: State Trade License Details Report version: 1.0.0 moduleName: rainmaker-tl From 01440beb0dcbf18842e4ee1ff8a67ffb4c5e41cd Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 5 Jan 2021 12:29:54 +0530 Subject: [PATCH 0483/1630] column username to name 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 3d44315d6..a108f6fa5 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5308,7 +5308,7 @@ ReportDefinitions: (SELECT propertyid , locality,doorno,street,buildingname, max(createdtime) from eg_pt_address group by propertyid, locality, doorno,street,buildingname) addr ON eg_pt_property.id=addr.propertyid inner join eg_bndry_mohalla on eg_bndry_mohalla.localitycode=addr.locality - inner join (SELECT DISTINCT ON (propertyid) propertyid ,username As userName , mobilenumber As Mobilenumber + inner join (SELECT DISTINCT ON (propertyid) propertyid ,name As userName , mobilenumber As Mobilenumber FROM eg_pt_owner , eg_user WHERE uuid = userid AND status = 'ACTIVE' From 4b058876cddddc2bf5aa0de2d19c170c61dffe50 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 7 Jan 2021 11:02:30 +0530 Subject: [PATCH 0484/1630] 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 7bb046d2a..cc960471e 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2612,7 +2612,7 @@ ReportDefinitions: 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')) + 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 ( From dfe5356e9d640257e452d4c4526c0573abe59bcd Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 7 Jan 2021 11:10:58 +0530 Subject: [PATCH 0485/1630] 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 cc960471e..224d9d2d8 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2612,7 +2612,7 @@ ReportDefinitions: 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')) + 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 ( From 46f2ad3558a9b07528207f712450afc26eee4d7e Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Mon, 11 Jan 2021 15:17:41 +0530 Subject: [PATCH 0486/1630] CREATE StatusReport_V2 CREATE StatusReport_V2 --- configs/reports/configs/tl-reports.yml | 80 +++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 224d9d2d8..f8fb54f55 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2629,7 +2629,85 @@ ReportDefinitions: WHERE tl.tenantid!='pb.testing' orderby: order by tl.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: channel + label: reports.pt.channel + type: string + source: pt + total: false + - name: createdtime + label: reports.pt.createdtime + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.createdby + 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 + 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, 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 + 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 c1115a6b1ac40ec17156b58ef3667def3e7652dd 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:41:13 +0530 Subject: [PATCH 0487/1630] [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 58a718b95..e7a57fde6 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 13ded300652c9aabfa62d236168dbd4a61a59e03 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 13 Jan 2021 09:01:31 +0530 Subject: [PATCH 0488/1630] defaulterReport update to show amount --- configs/reports/configs/pt-reports.yml | 102 ++++++++++++++++++++++++- 1 file changed, 100 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index a108f6fa5..916e82301 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4509,7 +4509,7 @@ ReportDefinitions: 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 +- reportName: ULBDEFAULTERPTREPORT_NEW_V2_OLD decryptionPathId: ULBDEFAULTERPTREPORT_V2 summary: ULB Defaulter Pt report version: 1.0.0 @@ -4594,7 +4594,105 @@ ReportDefinitions: 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: 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 + 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.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=$tenantid and d.tenantid=$tenantid + 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 + 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 ,username 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, max(createdtime) + from eg_pt_address where eg_pt_address.tenantid=$tenantid + group by propertyid, locality, doorno,street,buildingname,pincode) 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')) + groupby: group by pt.propertyid + + - reportName: ULBDEFAULTERPTREPORT_MINI_STATE_V2 decryptionPathId: ULBDEFAULTERPTREPORT_V2 summary: ULB Defaulter Pt report From 526ea00cd16a5ea738457d87e3be25616ca87905 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Fri, 15 Jan 2021 12:31:46 +0530 Subject: [PATCH 0489/1630] Update StatusReport_V2 column Update StatusReport_V2 column --- configs/reports/configs/tl-reports.yml | 50 +++++++++++++++++++------- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index f8fb54f55..ebbbfb37e 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2653,8 +2653,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 @@ -2663,13 +2663,18 @@ ReportDefinitions: type: string source: pt total: false - - name: collectorname + - name: createdby label: reports.pt.createdby type: string source: pt total: false - - name: localitycode - label: reports.pt.localitycode + - name: zone + label: reports.pt.zone + type: string + source: pt + total: false + - name: block + label: reports.pt.block type: string source: pt total: false @@ -2678,6 +2683,21 @@ ReportDefinitions: 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 @@ -2699,15 +2719,21 @@ ReportDefinitions: query: | -- 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 + 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 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 + 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; + orderby: ORDER BY propety.createdtime DESC; From 33a65b4ed23fea3e80f4f08267e2d1dc2abad18d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 16 Jan 2021 20:40:58 +0530 Subject: [PATCH 0490/1630] v2 changes for gis search 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 6ff30e0b1..3a4a0e2e0 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 ccb369e690854809857ba33d3ef5421ae8cf2c6b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 19 Jan 2021 11:31:07 +0530 Subject: [PATCH 0491/1630] shown column paidpropertytax --- 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 916e82301..ab3fa6e7e 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2328,6 +2328,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 From 644d0ad5c03f0dddad9d2f6dd6c25966c95e16f9 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 19 Jan 2021 12:17:51 +0530 Subject: [PATCH 0492/1630] 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 ab3fa6e7e..c083a9c38 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2329,7 +2329,7 @@ ReportDefinitions: source: pt total: true - name: paidpropertytax - label: reports.pt.propertyTax + label: reports.pt.paidpropertyTax type: string source: pt total: true From 9c04e1e1fefaea7bb210ce36eb3a00c9fc9dca5d Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Tue, 19 Jan 2021 13:32:53 +0530 Subject: [PATCH 0493/1630] [PI-8903] changes in query for gis pt search for payment --- configs/egov-searcher/rainmaker-pt-gissearch.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index 3a4a0e2e0..626abd695 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -18,8 +18,7 @@ SearchDefinitions: 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 + AND pt.oldpropertyid != '' and pd.receiptdate between 1542267174557 AND 1585670998438 $where) data groupBy: orderBy: searchParams: From c07e176df3cf44772e15b0e3e5866b8f393b4e38 Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Tue, 19 Jan 2021 13:33:22 +0530 Subject: [PATCH 0494/1630] [PI-8903] changes in query for gis pt search for payment --- 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 626abd695..8df42174d 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -25,11 +25,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 0a408cd3b38048f2cb242579c41dd314b77a81b5 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 19 Jan 2021 15:06:50 +0530 Subject: [PATCH 0495/1630] removed hardcoded dates --- 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 8df42174d..f6445b618 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -18,7 +18,7 @@ SearchDefinitions: 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 != '' and pd.receiptdate between 1542267174557 AND 1585670998438 $where) data + AND pt.oldpropertyid != '' $where) data groupBy: orderBy: searchParams: From 9acb4a166a524b7bb522ea39983950851b348e1e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 21 Jan 2021 14:17:35 +0530 Subject: [PATCH 0496/1630] enabled block code search --- .../egov-searcher/rainmaker-pt-gissearch.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index f6445b618..d803ef7de 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -12,13 +12,15 @@ SearchDefinitions: pt.propertyid as propertyid, pt.oldpropertyid as oldpropertyid, pd.receiptnumber as receiptnumber, - pt.tenantid as tenantid - from - egcl_paymentdetail AS pd + 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 != '' $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: @@ -36,6 +38,10 @@ SearchDefinitions: isMandatory: true jsonPath: $.searchCriteria.tenantId operator: = + - name: bn.blockname + isMandatory: false + jsonPath: $.searchCriteria.blockcode + operator: = output: From 7b0b34a3466527b01052acb3f34649e5c576228c Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 27 Jan 2021 16:08:08 +0530 Subject: [PATCH 0497/1630] [PI-8931] added fee fields on misc receipt --- .../data-config/consolidatedreceipt.json | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index c3ddd5903..f9b67d19e 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", From 16c0ba05bfd89b8ea630b33e9558c6d5c48274ec Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 27 Jan 2021 16:09:43 +0530 Subject: [PATCH 0498/1630] [Pi-8931] added fee fields on misc receipts --- .../format-config/consolidatedreceipt.json | 190 +++++++++++++++++- 1 file changed, 185 insertions(+), 5 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index ee430f8e1..94c8ff5f2 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, @@ -1201,7 +1381,7 @@ "bold": true, "margin": [ -27, - 5, + 3, -10, 0 ] @@ -1210,7 +1390,7 @@ "fontSize": 8, "margin": [ -27, - 5, + 3, -10, 0 ] @@ -1219,7 +1399,7 @@ "fontSize": 8, "margin": [ -27, - 5, + 3, -10, 0 ] @@ -1228,7 +1408,7 @@ "fontSize": 8, "margin": [ 2, - 2, + 1, 0, 0 ] From 3c23dbfaec3800923fc700943b51eb71be24a318 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 29 Jan 2021 10:00:53 +0530 Subject: [PATCH 0499/1630] removed guidelines from employee copy --- .../format-config/consolidatedreceipt.json | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 94c8ff5f2..770f3a878 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -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" From c3e536a9bdc2403937491f7c691240a65a88cc5d Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 2 Feb 2021 13:05:30 +0530 Subject: [PATCH 0500/1630] changed tax head values --- 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 f9b67d19e..e82d4e406 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 15178a20568579862647771c8e8bd7424be6561f Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 2 Feb 2021 13:06:41 +0530 Subject: [PATCH 0501/1630] added rupee symbol for field fee --- 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 770f3a878..bfb6e4d39 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, @@ -1003,7 +1003,7 @@ }, { - "text": "{{fieldFee}}", + "text": "₹ {{fieldFee}}", "border": [ false, From 6fb824c88847502f048c14b862b9de10c7355d39 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 3 Feb 2021 09:42:04 +0530 Subject: [PATCH 0502/1630] added receiptnumber and amount --- configs/egov-searcher/rainmaker-pt-gissearch.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index d803ef7de..e467f8b13 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -13,7 +13,9 @@ SearchDefinitions: pt.oldpropertyid as oldpropertyid, pd.receiptnumber as receiptnumber, pt.tenantid as tenantid, - pd.receiptdate as receiptdate, + pd.receiptdate as receiptdate, + pd.receiptnumber as receiptnumber, + pd.amountpaid as amount, bn.blockname from egcl_paymentdetail AS pd INNER JOIN egcl_bill on pd.billid=egcl_bill.id From 2fd59b8c34dd548ae0367da4d37539f29a7f2a45 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 3 Feb 2021 11:23:51 +0530 Subject: [PATCH 0503/1630] finacialYear payments column added --- 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 e467f8b13..975c768a4 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -16,6 +16,7 @@ SearchDefinitions: pd.receiptdate as receiptdate, pd.receiptnumber as receiptnumber, pd.amountpaid as amount, + getfinancialyear(pd.billid) as financialyear, bn.blockname from egcl_paymentdetail AS pd INNER JOIN egcl_bill on pd.billid=egcl_bill.id From 05173cc7c2ddd478352d409e57efc533f4848093 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sun, 7 Feb 2021 20:17:07 +0530 Subject: [PATCH 0504/1630] Added TL Pendency Report --- configs/reports/configs/tl-reports.yml | 91 +++++++++++++++++++++++++- 1 file changed, 89 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index ebbbfb37e..7d1839be0 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2733,7 +2733,94 @@ ReportDefinitions: 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; - + orderby: ORDER BY propety.createdtime DESC +- 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 + 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(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 + 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 + orderby: ORDER BY applicationnumber DESC From 0e75dd5cf882ea220edae38cf7f0f38cd7af0959 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 8 Feb 2021 12:07:47 +0530 Subject: [PATCH 0505/1630] PI-8971 Adding PendingPTApplicationsReport New report in PT PI-8971 --- configs/reports/configs/pt-reports.yml | 63 ++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index c083a9c38..4ead3a6d9 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5422,3 +5422,66 @@ ReportDefinitions: and egcl_bill.status='ACTIVE' --and billid='00088a80-5671-408d-8494-2fb83b91b04f' orderby: order by amountpaid 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 a6ef212ca25795749aabcd99f08fb75a33d3aa7b Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 8 Feb 2021 12:33:06 +0530 Subject: [PATCH 0506/1630] ssignee label in TL pendency report changes in assignee label --- 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 7d1839be0..cdf1d49ce 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2782,7 +2782,7 @@ ReportDefinitions: source: tl total: false - name: assignee - lable: report.tl.assignee + label: report.tl.assignee type: string source: tl total: false From 1fd397e0c678cc16317364f9fa6f19bd53cdd907 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Tue, 9 Feb 2021 11:50:44 +0530 Subject: [PATCH 0507/1630] Update report Update report --- configs/reports/configs/tl-reports.yml | 108 +------------------------ 1 file changed, 1 insertion(+), 107 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index cdf1d49ce..02f904c8a 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2628,113 +2628,7 @@ ReportDefinitions: 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: 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 - 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 - + - reportName: TradeLicensePendencyReport_v2 decryptionPathId: TradeLicensePendencyReport_v2 summary: Trade License Pendency Report From 6319676e2b77d9f343b4301a947050f326153eec Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Tue, 9 Feb 2021 11:54:57 +0530 Subject: [PATCH 0508/1630] Update StatusReport_V2 reports coulmn Update StatusReport_V2 reports coulmn --- configs/reports/configs/pt-reports.yml | 106 +++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 4ead3a6d9..aee473c0f 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5485,3 +5485,109 @@ 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: 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 From 289d3a1a74553e4708627365a48cd527ad5142e5 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Tue, 9 Feb 2021 11:58:30 +0530 Subject: [PATCH 0509/1630] Update yml format Update yml format --- 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 aee473c0f..e1df5bcbe 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5486,7 +5486,7 @@ ReportDefinitions: 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 +- reportName: StatusReport_V2 decryptionPathId: StatusReport_V2 summary: Status Report version: 1.0.0 From 8a23f9bcc99a73163fc89932b6bf75fe3a2b7b96 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 10 Feb 2021 10:04:37 +0530 Subject: [PATCH 0510/1630] corrected ownername in defaulterReport_NEW_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 e1df5bcbe..ebd259421 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4673,7 +4673,7 @@ ReportDefinitions: 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 ,username as name , mobilenumber + inner join (SELECT DISTINCT ON (propertyid) propertyid ,name as name , mobilenumber FROM eg_pt_owner , eg_user WHERE uuid = userid AND status = 'ACTIVE' From 89ba633877bde810acb54ad25d4a4f2c852c09b1 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Wed, 10 Feb 2021 15:05:12 +0530 Subject: [PATCH 0511/1630] added locality name in defaulterReport_New_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 ebd259421..fdf268f8b 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4657,7 +4657,7 @@ ReportDefinitions: 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.pincode), ',+', ','), '^,|,$', ''),',') as "address" + 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 @@ -4678,9 +4678,9 @@ ReportDefinitions: WHERE uuid = userid AND status = 'ACTIVE' AND active = true ) eu ON pt.id=eu.propertyid - inner join (SELECT propertyid , locality,doorno,street,buildingname,pincode, max(createdtime) - from eg_pt_address where eg_pt_address.tenantid=$tenantid - group by propertyid, locality, doorno,street,buildingname,pincode) pta ON pt.id=pta.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=$tenantid + 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 515172bba5d077101abe840df3cfb1815b7b743f Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Fri, 12 Feb 2021 10:46:35 +0530 Subject: [PATCH 0512/1630] Report name change PendingPTApplicationsReport Report name change PendingPTApplicationsReport for mapping with action test --- 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 fdf268f8b..b5781e51b 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5423,7 +5423,7 @@ ReportDefinitions: --and billid='00088a80-5671-408d-8494-2fb83b91b04f' orderby: order by amountpaid desc -- reportName: PendingPTApplicationsReport +- reportName: PendingPTApplicationsReport_V2 summary: ULB-wise PT Collection version: 1.0.0 moduleName: rainmaker-pt From 371b967d3269f0588f8d9a4c55e5910b3917cf01 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 12 Feb 2021 14:25:44 +0530 Subject: [PATCH 0513/1630] added survey id on PT receipt[PI-8980] --- 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 905c1109d..f2e304150 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 8780130807ea3801462d2425d2a418f45d532c78 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 12 Feb 2021 14:26:53 +0530 Subject: [PATCH 0514/1630] added survey id on pt application --- 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 cba7033ba..8d57ed850 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -682,6 +682,10 @@ { "variable":"oldPropertyId", "value":"$.Properties[0].oldPropertyId" + }, + { + "variable":"surveyId", + "value":"$.Properties[0].surveyId" }, { "variable":"ownerMobileNumber", From f0fdb0552878ed6233769bce6f164955cb884b33 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 13 Feb 2021 19:23:52 +0530 Subject: [PATCH 0515/1630] Defaulter report excluded ikon 2020-21 ASR data specialy designed for Amritsar where some of the assessments were made in ikon system and were not migrated into mseva, such records were showing as defaulters and now incuded those records in mseva in table ikon_2020_21_non_migrated_records, Defaulter Report Query updated to exclude those records --- configs/reports/configs/pt-reports.yml | 67 +++++++++++++++----------- 1 file changed, 38 insertions(+), 29 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index b5781e51b..5629af0b9 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4641,31 +4641,26 @@ 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 - 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 + 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=$tenantid and d.tenantid=$tenantid - group by d.consumercode, d.taxperiodfrom - having sum(dd.taxamount - dd.collectionamount)=0) a, - (select d.consumercode, max(d.taxperiodfrom) maxperiod + where dd.demandid=d.id + and d.status!='CANCELLED' and dd.tenantid=$tenantid and d.tenantid=$tenantid + 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 @@ -4689,13 +4684,27 @@ ReportDefinitions: 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')) - groupby: group by pt.propertyid + 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_MINI_STATE_V2 From ee27856cc37a08a6a0c9377f2d4ad37b102a92ee Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Thu, 18 Feb 2021 14:12:03 +0530 Subject: [PATCH 0516/1630] [PI-1273]-Added egov.collection.payment-cancel topic in the indexer config --- configs/egov-indexer/payment-indexer.yml | 51 ++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index 682c633f0..cc7e7a09e 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -156,3 +156,54 @@ 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: 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 From 45bcba2edf968e0c08dbedbfb90df4dd145aa086 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 18 Feb 2021 15:53:20 +0530 Subject: [PATCH 0517/1630] included surveyid --- 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 975c768a4..7987acbef 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -11,6 +11,7 @@ SearchDefinitions: select pt.propertyid as propertyid, pt.oldpropertyid as oldpropertyid, + pt.surveyid as surveyid, pd.receiptnumber as receiptnumber, pt.tenantid as tenantid, pd.receiptdate as receiptdate, From 2b0ada5c9f5658c6d320caa72eed30b3a0e0867e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 18 Feb 2021 16:22:54 +0530 Subject: [PATCH 0518/1630] included surveyid --- 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 7987acbef..03ad4587d 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -21,8 +21,8 @@ SearchDefinitions: 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_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: From dc9f72137ed510976bbed4ee25c7bad30b5b0e68 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 19 Feb 2021 11:22:39 +0530 Subject: [PATCH 0519/1630] shown block in defaulter report --- configs/reports/configs/pt-reports.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 5629af0b9..6d1aec13f 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4641,6 +4641,11 @@ ReportDefinitions: 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 @@ -4652,7 +4657,8 @@ ReportDefinitions: 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 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 @@ -4673,9 +4679,9 @@ ReportDefinitions: 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) + 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) pta ON pt.id=pta.propertyid + 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 8dfdc7ae917e828d05342519b8635b020fddd2bc Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 5 Mar 2021 11:11:58 +0530 Subject: [PATCH 0520/1630] excluded special amritsar manual properties --- 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 6d1aec13f..d717d8471 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4711,6 +4711,7 @@ ReportDefinitions: ) 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)) + and propertytaxuniqueid not in (select propertyid from ikon_amritsar_manual_ptids) - reportName: ULBDEFAULTERPTREPORT_MINI_STATE_V2 From 9d821673878ec58679ca316d9a8ce96c9c70c4d3 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 5 Mar 2021 13:03:34 +0530 Subject: [PATCH 0521/1630] undone previous change undone previous change as desired properties made INACTIVE after meeting with Amritsar and Rahul ji --- 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 d717d8471..6d1aec13f 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4711,7 +4711,6 @@ ReportDefinitions: ) 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)) - and propertytaxuniqueid not in (select propertyid from ikon_amritsar_manual_ptids) - reportName: ULBDEFAULTERPTREPORT_MINI_STATE_V2 From 60e1b2e741185edaa59db1dc6ca378e4bde0cdc4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 8 Mar 2021 16:18:17 +0530 Subject: [PATCH 0522/1630] Property Serach updated according to V2 --- .../rainmaker-pt-customsearch-punjab.yml | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml b/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml index 93d41f2e9..00a553ac6 100644 --- a/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml +++ b/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml @@ -8,7 +8,7 @@ SearchDefinitions: baseQuery: | select array_to_json(array_agg(row_to_json(vasika_results))) - from (select propertyid from eg_pt_property_v2 + from (select propertyid from eg_pt_property $where and additionaldetails is not null and additionaldetails !='null' ) vasika_results @@ -39,7 +39,7 @@ SearchDefinitions: from ( select distinct locality from eg_tl_address $where union - select distinct locality from eg_pt_address_v2 $where + select distinct locality from eg_pt_address $where ) as localities groupBy: orderBy: @@ -80,21 +80,20 @@ SearchDefinitions: baseQuery: | select array_to_json(array_agg(row_to_json(data))) from ( select - property as propertyid, - assessmentnumber, + propertyid, 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 + 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_detail.property + - name: pt.propertyid isMandatory: true jsonPath: $.searchCriteria.propertyid operator: = From a535bbe5845bd4fb9d8c4cb8b74530dd5651933f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 17 Mar 2021 13:11:50 +0530 Subject: [PATCH 0523/1630] pt defauter Report state updated --- configs/reports/configs/pt-reports.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 6d1aec13f..f8e4e66ad 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4757,7 +4757,7 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND tenantid = $ulb + 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 ( @@ -4769,7 +4769,17 @@ ReportDefinitions: 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", @@ -4797,6 +4807,7 @@ ReportDefinitions: --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: ZoneFYReport_V2 From 51b835ee325b1b585a71c077f1d3a0b3096a76c7 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Wed, 17 Mar 2021 16:34:33 +0530 Subject: [PATCH 0524/1630] Changes in TL Pendency Report Adding no. of days pending from --- configs/reports/configs/tl-reports.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 02f904c8a..425ca609f 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2698,12 +2698,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 @@ -2715,6 +2717,6 @@ 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 From f9143a4eca1811fa5bf1de1290b777eaa5f20d4d 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:02:10 +0530 Subject: [PATCH 0525/1630] updated 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 f8b21ab60..8a2ff6743 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 7bb80ecd9888ed971d1e3f1ee2d830efeaf57ed3 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 18 Mar 2021 17:07:51 +0530 Subject: [PATCH 0526/1630] Adding new column in Pendency report Adding new column in Pendency report --- configs/reports/configs/tl-reports.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 425ca609f..d98274aad 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2680,6 +2680,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 From 62243bdc2d993bbb4fe3f82a126df9eb07273c4e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 19 Mar 2021 22:43:57 +0530 Subject: [PATCH 0527/1630] defaulter mini report only name and mobilenumber --- configs/reports/configs/pt-reports.yml | 37 +++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index f8e4e66ad..94b0a96a5 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4713,7 +4713,7 @@ ReportDefinitions: 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 +- reportName: ULBDEFAULTERPTREPORT_MINI_STATE_V2_OLD decryptionPathId: ULBDEFAULTERPTREPORT_V2 summary: ULB Defaulter Pt report version: 1.0.0 @@ -4809,6 +4809,41 @@ ReportDefinitions: 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 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 + select mobilenumber as mobileno,name as ownername 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 id not in (select billid from egcl_billdetial where fromperiod='1585699200000' and toperiod='1617235199000' and tenantid=$ulb) + ))) - reportName: ZoneFYReport_V2 summary: Zone FY Collection From 69dde6058cc9a9d856af85ceafbdf073316f7d54 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 20 Mar 2021 10:55:44 +0530 Subject: [PATCH 0528/1630] 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 94b0a96a5..fc2d46066 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4834,7 +4834,7 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND pt.tenantid = $ulb + 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 as mobileno,name as ownername from eg_user From b78eef102eb7be49e5c708e1b3ba437d0f0766c4 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 23 Mar 2021 11:09:20 +0530 Subject: [PATCH 0529/1630] update TL report with ward and zone update TL report with ward and zone --- configs/reports/configs/tl-reports.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index d98274aad..713c8e1d4 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -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 @@ -2315,6 +2325,8 @@ ReportDefinitions: 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 From e5625ebda158e011d22dbfaad8dc74b58e365d48 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 31 Mar 2021 11:21:27 +0530 Subject: [PATCH 0530/1630] State Defaulter query updated for sms --- configs/reports/configs/pt-reports.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index fc2d46066..b0f84a2a0 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4837,13 +4837,12 @@ 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 - select mobilenumber as mobileno,name as ownername from eg_user + 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 id not in (select billid from egcl_billdetial where fromperiod='1585699200000' and toperiod='1617235199000' and tenantid=$ulb) - ))) + (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 From fe497a6c35def8d60b86ed7747f210a9cdad5299 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 5 Apr 2021 11:02:15 +0530 Subject: [PATCH 0531/1630] report correction of TL report correction of TL --- 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 713c8e1d4..2ee32c5f3 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2320,7 +2320,7 @@ 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, From 0acfb0153dbe57e99861e6e4322067a03f902cc1 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 5 Apr 2021 17:38:14 +0530 Subject: [PATCH 0532/1630] UC Employee Collection Report UC Employee Collection Report --- configs/reports/configs/uc-reports.yml | 61 ++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index adb690676..e5da7da8a 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1685,3 +1685,64 @@ 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='pb.ropar' AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' + GROPUP BY: group by collectorname , paymentmode From 4e372cf7efa67fa6b992b722b9fb350eb692924d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 Apr 2021 09:26:35 +0530 Subject: [PATCH 0533/1630] Update uc-reports.yml --- 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 e5da7da8a..f26eea0a2 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1736,7 +1736,8 @@ ReportDefinitions: wrapper: true isMandatory: false searchClause: AND eg_user.id = $collectorname::INTEGER - query: SELECT + query: | + SELECT eg_user.name as collectorname, paymentmode as paymentmode, count(paydetail.receiptnumber) as Countofreceipts, @@ -1745,4 +1746,4 @@ ReportDefinitions: JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id JOIN eg_user ON payment.createdby::INTEGER=eg_user.id WHERE payment.tenantid='pb.ropar' AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' - GROPUP BY: group by collectorname , paymentmode + groupby: group by collectorname , paymentmode From 361e1dea3213ea235f5bef7dee133a1ca84fd57d Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 6 Apr 2021 11:24:10 +0530 Subject: [PATCH 0534/1630] Employee Wise Collection Report TL Employee Wise Collection Report TL --- configs/reports/configs/tl-reports.yml | 64 +++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 2ee32c5f3..d8ce9f0a1 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2736,5 +2736,67 @@ ReportDefinitions: 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 + 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='pb.ropar' AND businessservice not in ('TL') and payment.paymentstatus != 'CANCELLED' + group by: GROUP BY collectorname , paymentmode + From 4f48cf9fb0023e915b8a6907849f0cb904a7efb3 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 Apr 2021 12:40:28 +0530 Subject: [PATCH 0535/1630] Update tl-reports.yml --- configs/reports/configs/tl-reports.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index d8ce9f0a1..6cef508ef 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2788,15 +2788,16 @@ ReportDefinitions: 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='pb.ropar' AND businessservice not in ('TL') and payment.paymentstatus != 'CANCELLED' - group by: GROUP BY collectorname , paymentmode + 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='pb.ropar' AND businessservice not in ('TL') and payment.paymentstatus != 'CANCELLED' + groupby: GROUP BY collectorname , paymentmode From 9b5f20aaa6deef8209184ff3dc7b915e6b7baf9d Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Wed, 7 Apr 2021 11:11:51 +0530 Subject: [PATCH 0536/1630] tenant id issue correction in UC Report tenant id issue correction in UC 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 f26eea0a2..3ed29827f 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1745,5 +1745,5 @@ 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='pb.ropar' AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' + WHERE payment.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' groupby: group by collectorname , paymentmode From 9dd284ef940e2b88d06b3894ad60a97342afd625 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Wed, 7 Apr 2021 11:13:51 +0530 Subject: [PATCH 0537/1630] tenant id correction in TL collection report tenant id correction in TL collection report --- 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 6cef508ef..a6907ac87 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2797,7 +2797,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='pb.ropar' AND businessservice not in ('TL') and payment.paymentstatus != 'CANCELLED' + WHERE payment.tenantid=$tenantid AND businessservice not in ('TL') and payment.paymentstatus != 'CANCELLED' groupby: GROUP BY collectorname , paymentmode From d59561e8db6f44685dea7c36789bed1791df7032 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 7 Apr 2021 15:19:49 +0530 Subject: [PATCH 0538/1630] corrected yml syntax --- configs/reports/configs/tl-reports.yml | 142 ++++++++++++------------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index a6907ac87..d627d169b 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 @@ -2739,65 +2739,65 @@ ReportDefinitions: 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 + 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 5fa463647ce7a62b447e3888bdf134040a30183b Mon Sep 17 00:00:00 2001 From: Rafeek Date: Sun, 11 Apr 2021 15:57:39 +0530 Subject: [PATCH 0539/1630] PI-1469:Digit 2.2 custon config changes --- configs/egov-persister/hrms-employee-persister.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/configs/egov-persister/hrms-employee-persister.yml b/configs/egov-persister/hrms-employee-persister.yml index 74dbd1940..4797de8e6 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,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 (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); @@ -247,7 +249,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 +279,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 221297a21249db0eb368b164a5d33ea17fdf6460 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Mon, 12 Apr 2021 12:55:27 +0530 Subject: [PATCH 0540/1630] update date format and add plot area column PI-9419 update date format and add plot area column PI-9419 --- .../egov-searcher/rainmaker-pt-gissearch.yml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index 03ad4587d..40aa4b9c5 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -9,16 +9,16 @@ SearchDefinitions: baseQuery: | select array_to_json(array_agg(row_to_json(data))) from ( select - pt.propertyid as propertyid, - pt.oldpropertyid as oldpropertyid, - pt.surveyid as surveyid, - pd.receiptnumber as receiptnumber, - pt.tenantid as tenantid, - pd.receiptdate as receiptdate, - pd.receiptnumber as receiptnumber, - pd.amountpaid as amount, - getfinancialyear(pd.billid) as financialyear, - bn.blockname + 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 From a8c6903a0f82077ad0637c06516997b7f349e9b0 Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 15 Apr 2021 09:58:51 +0530 Subject: [PATCH 0541/1630] Pi-9384 added renewal penalty and changed collection services 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 +- configs/pdf-service/data-config/tradelicense-receipt.json | 6 ++++++ configs/pdf-service/format-config/tradelicense-receipt.json | 4 ++-- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/configs/pdf-service/data-config/ptmutationcertificate.json b/configs/pdf-service/data-config/ptmutationcertificate.json index 42326bdcb..7f9f3af27 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 f53de2156..fb3170b5e 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 2cd370ed6..92f212896 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":[ diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index 18bbfda20..0ac82d6c1 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -96,6 +96,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 75ddbb4c8..d7d737fe3 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 8c5d35646b29080e694940ea18e9f2aa6c51731c Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 20 Apr 2021 15:51:58 +0530 Subject: [PATCH 0542/1630] excluded cancelled receipt TradeLicenseRegistryReport_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 d627d169b..aee9c7899 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 9b59bf6f1bef5234de172c63c2a0b4f018212837 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 26 Apr 2021 13:10:42 +0530 Subject: [PATCH 0543/1630] 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 b0f84a2a0..8d1dc5b5c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2489,7 +2489,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 51245f648b9d3f9dc677034322f74f7ddef81b9c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 26 Apr 2021 13:36:37 +0530 Subject: [PATCH 0544/1630] optimized receipt_register_withoutLocality_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 8d1dc5b5c..b146c62ee 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2475,6 +2475,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 5cd6390722dc1b8bad4343acb2c9b2f0f29585e3 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 28 Apr 2021 15:57:04 +0530 Subject: [PATCH 0545/1630] updated search param StateTradeLicenseDetailsReport_v2 --- configs/reports/configs/tl-reports.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index aee9c7899..c93171437 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2590,19 +2590,13 @@ ReportDefinitions: type: epoch source: tl isMandatory: false - searchClause: AND applicationdate >= $fromDate + searchClause: AND tl.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) + searchClause: AND tl.applicationdate <= $toDate query: | SELECT tl.applicationnumber as applicationnumber, From 0e30b6ad40a5c3f615a49d702538073920fc97bc Mon Sep 17 00:00:00 2001 From: shwetha Date: Fri, 30 Apr 2021 17:13:12 +0530 Subject: [PATCH 0546/1630] PI-9553:changed version 2.0.0 to 1.0.0 --- configs/egov-indexer/finance-rolloutadoption-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/finance-rolloutadoption-indexer.yml b/configs/egov-indexer/finance-rolloutadoption-indexer.yml index 9c8befa65..d62ba073c 100644 --- a/configs/egov-indexer/finance-rolloutadoption-indexer.yml +++ b/configs/egov-indexer/finance-rolloutadoption-indexer.yml @@ -1,6 +1,6 @@ ServiceMaps: serviceName: FinanceAdoption - version: 2.0.0 + version: 1.0.0 mappings: - topic: finance-adoption-topic configKey: INDEX From 0faca9f84e2dcca20b16bbbed7d46fc910204cd4 Mon Sep 17 00:00:00 2001 From: Rafeek Date: Sun, 2 May 2021 11:09:15 +0530 Subject: [PATCH 0547/1630] PI-1536: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 +++++++++++++++--- configs/egov-searcher/bill-genie.yml | 202 ++++++------ configs/egov-searcher/localitySearcher.yml | 4 +- 7 files changed, 678 insertions(+), 205 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 000000000..dc4d52093 --- /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 1cab6be36..8508c5b08 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 000000000..f3e299b45 --- /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 776e5703e..495c25da9 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 10209cb4d..d95437ff2 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 diff --git a/configs/egov-searcher/bill-genie.yml b/configs/egov-searcher/bill-genie.yml index ed06f02bc..0f764b5f3 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_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: + 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_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: + 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,11 +248,11 @@ SearchDefinitions: isMandatory: false jsonPath: $.searchCriteria.toPeriod operator: GE - - name: b.isactive + - name: b.status isMandatory: false jsonPath: $.searchCriteria.billActive output: jsonFormat: {"ResponseInfo": {},"Bills": []} outJsonPath: $.Bills - responseInfoPath: $.ResponseInfo + responseInfoPath: $.ResponseInfo \ No newline at end of file diff --git a/configs/egov-searcher/localitySearcher.yml b/configs/egov-searcher/localitySearcher.yml index 7673bcfb5..33bb9d3cd 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 db70419511873916eee240f6937e1cec6190b8c4 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 May 2021 10:52:32 +0530 Subject: [PATCH 0548/1630] 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 000000000..cf1f04928 --- /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 9212abfe7e02a2ab02ded6a54c04e3c1fdbaae64 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 May 2021 10:53:00 +0530 Subject: [PATCH 0549/1630] 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 000000000..154ffb865 --- /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 8d31b27747fe748296f70db917c0a45ca53d537b Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 May 2021 10:53:53 +0530 Subject: [PATCH 0550/1630] 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 000000000..7d4f6d78f --- /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 0a13958ecf3290b29385cc4e27cbc6331b99cf47 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 May 2021 10:54:32 +0530 Subject: [PATCH 0551/1630] Update ws-applicationsewerage.json From c503e8be950d48ae6cea5d317c9ed2ad343e23e7 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 May 2021 10:56:46 +0530 Subject: [PATCH 0552/1630] Update ws-applicationwater.json From bcc28f5354f5459f25244c69bf60245766e8ac02 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 May 2021 11:31:02 +0530 Subject: [PATCH 0553/1630] Update ws-bill.json --- configs/pdf-service/data-config/ws-bill.json | 171 +++++++++++++++++-- 1 file changed, 153 insertions(+), 18 deletions(-) diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json index 0ae6f8501..bb5004cac 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" } }, { @@ -432,12 +456,30 @@ "path": "$.mobileNumber" } }, + { + "variable": "oldConnectionNo", + "value": { + "path": "$.additionalDetails.oldConnectionNo" + } + }, + { + "variable": "ledgerId", + "value": { + "path": "$.additionalDetails.ledgerId" + } + }, { "variable": "payerAddress", "value": { "path": "$.payerAddress" } }, + { + "variable": "tenant", + "value": { + "path": "$.tenantId" + } + }, { "variable": "nameAddress", "value": { @@ -486,7 +528,7 @@ "type": "date" }, { - "variable": "propertyID", + "variable": "consumerCode", "value": { "path": "$.consumerCode" } @@ -560,7 +602,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 +626,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 +654,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 +671,7 @@ "derived": [ { "variable": "charge", - "formula": "{{taxCharge}}+{{fees}}" + "formula": "{{ws_charge}}" }, { "variable": "penalty", @@ -634,12 +682,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 +753,69 @@ } } ] + }, + { + "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=$.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 af757a7e46172c0dcd076e182e93fa58c6ebd7ea Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 May 2021 11:32:31 +0530 Subject: [PATCH 0554/1630] Update ws-consolidatedacknowlegment.json --- .../pdf-service/data-config/ws-consolidatedacknowlegment.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json b/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json index 9e3ea1bee..5c735c4b6 100644 --- a/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json +++ b/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json @@ -680,5 +680,4 @@ ] } ] - } -} + }} From e7b21a8358a9758cc869fd31b5ca0443f2e23b97 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 May 2021 11:33:12 +0530 Subject: [PATCH 0555/1630] Update ws-consolidatedsewerageconnection.json --- .../data-config/ws-consolidatedsewerageconnection.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json b/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json index 53b42b6e7..ec4155892 100644 --- a/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json +++ b/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json @@ -567,5 +567,4 @@ ] } ] - } -} + }} From 4b769032abab658dd7e85041b48eab9ce4582ab2 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 May 2021 11:33:47 +0530 Subject: [PATCH 0556/1630] Update ws-estimationnotice.json --- .../data-config/ws-estimationnotice.json | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/ws-estimationnotice.json b/configs/pdf-service/data-config/ws-estimationnotice.json index 43b6de6d4..1c6bdb3cb 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", @@ -82,7 +87,7 @@ { "variable": "otherCharge", "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'OTHER_CHARGE')].estimateAmount" + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'OTHER_FEE')].estimateAmount" } }, { @@ -108,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", From ff6b936bbf373d20aac59c62fa3ec92da0bd93b6 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 May 2021 11:34:14 +0530 Subject: [PATCH 0557/1630] 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 7b30715e6..08f2e8f32 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 40c1bdb09c1342019f9bd2bfec37c4dbd3d7fdcb Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 May 2021 11:34:40 +0530 Subject: [PATCH 0558/1630] Update ws-sanctionletter.json --- configs/pdf-service/data-config/ws-sanctionletter.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/configs/pdf-service/data-config/ws-sanctionletter.json b/configs/pdf-service/data-config/ws-sanctionletter.json index f10eb83b7..fc0637c85 100644 --- a/configs/pdf-service/data-config/ws-sanctionletter.json +++ b/configs/pdf-service/data-config/ws-sanctionletter.json @@ -270,12 +270,6 @@ "path": "$.plumberInfo[0].mobileNumber" } }, - { - "variable": "sla", - "value": { - "path": "$.sla" - } - }, { "variable": "slaDate", "value": { From 4b3566701084f17f50acd876d7c018b267ee479c Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 May 2021 11:38:01 +0530 Subject: [PATCH 0559/1630] Update ws-sanctionletter.json --- configs/pdf-service/data-config/ws-sanctionletter.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/ws-sanctionletter.json b/configs/pdf-service/data-config/ws-sanctionletter.json index fc0637c85..69d6ade35 100644 --- a/configs/pdf-service/data-config/ws-sanctionletter.json +++ b/configs/pdf-service/data-config/ws-sanctionletter.json @@ -965,5 +965,4 @@ ] } ] - } -} + }} From 4f6e0d868332d346ef9a3a8b130d661d3a785b48 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 May 2021 11:38:52 +0530 Subject: [PATCH 0560/1630] 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 000000000..f2d6e04fe --- /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 4d4607f3211701a741acef4457a1a84ce111a213 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 May 2021 11:39:15 +0530 Subject: [PATCH 0561/1630] 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 000000000..e8cee60c4 --- /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 9658a72935f43c032bdfa2d42c90c252c20c6dfd Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 May 2021 11:39:47 +0530 Subject: [PATCH 0562/1630] 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 000000000..5524b7b3f --- /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 2a3c6a57f85cecf96d225c8b4452864f7053fe78 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 May 2021 11:47:02 +0530 Subject: [PATCH 0563/1630] 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 6fc248c7a..493d4a3eb 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 5a14f0a1c9b1f58f500721cdf08061e660cb550d Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 May 2021 11:47:37 +0530 Subject: [PATCH 0564/1630] 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 6979ce5e9..fa9c5f87c 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 235dc201596b0ca8f66254707b3c5dc968a620a8 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 May 2021 11:48:04 +0530 Subject: [PATCH 0565/1630] 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 037ab46a0..582082f9e 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": [ + "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": "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 7f37d62b56f5310799c7589845e0145f6c307d73 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 May 2021 11:49:35 +0530 Subject: [PATCH 0566/1630] 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 a59f005c1..95477f2d1 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 d146d487d766460866955d56209f1e67b59ccf93 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 May 2021 11:50:52 +0530 Subject: [PATCH 0567/1630] 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 595c280e7..12eb8c7b8 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 387950c99e2d5008091aa88a728017304a400c99 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 May 2021 11:51:20 +0530 Subject: [PATCH 0568/1630] Update ws-estimationnotice.json --- .../format-config/ws-estimationnotice.json | 64 +++++++++++++++---- 1 file changed, 50 insertions(+), 14 deletions(-) diff --git a/configs/pdf-service/format-config/ws-estimationnotice.json b/configs/pdf-service/format-config/ws-estimationnotice.json index bd671e53b..ddc08e4fc 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": [ [ @@ -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" + } ], [ { @@ -490,7 +526,7 @@ }, { "text": "{{approved_by}}", - "alignment": "center" + "alignment": "right" } ], "styles": { @@ -539,7 +575,7 @@ "color": "#000000", "textTransform": "uppercase", "bold": true, - "fontSize": 12, + "fontSize": 10, "fontWeight": 500, "margin": [ -25, @@ -550,13 +586,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 +615,7 @@ "receipt-table-value": { "color": "#000000", "bold": true, - "fontSize": 12, + "fontSize": 10, "fontWeight": 500, "margin": [ 5, @@ -591,7 +627,7 @@ "receipt-table-value-total": { "color": "#000000", "bold": true, - "fontSize": 12, + "fontSize": 10, "fontWeight": 500, "alignment": "right", "margin": [ @@ -604,7 +640,7 @@ "receipt-table-value-down": { "color": "#000000", "bold": false, - "fontSize": 12, + "fontSize": 10, "fontWeight": 400, "alignment": "left", "margin": [ @@ -617,7 +653,7 @@ "receipt-table-value2": { "color": "#000000", "bold": false, - "fontSize": 12, + "fontSize": 10, "fontWeight": 500, "margin": [ 3, @@ -629,7 +665,7 @@ "receipt-table-value-cont": { "color": "#000000", "bold": false, - "fontSize": 11, + "fontSize": 10, "fontWeight": 400, "margin": [ 3, @@ -641,7 +677,7 @@ "receipt-table": { "color": "#484848", "bold": true, - "fontSize": 12, + "fontSize": 10, "fontWeight": 400, "margin": [ -30, @@ -653,7 +689,7 @@ "receipt-table2": { "color": "#000000", "bold": true, - "fontSize": 12, + "fontSize": 10, "fontWeight": 500, "margin": [ 3, From 8235ca93bfab9af7d9e7c01dcb98b8c542152f3b Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 May 2021 11:51:44 +0530 Subject: [PATCH 0569/1630] 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 e8ae01b98..ac25fea5d 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 4f5966231a3f0a6ca9a28e59ec6b342439df4c43 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 May 2021 11:52:16 +0530 Subject: [PATCH 0570/1630] 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 584d2805a..c3da67604 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 7d03245359f41483a74d83e898d18b68940ce09d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 5 May 2021 20:50:42 +0530 Subject: [PATCH 0571/1630] added water and sewerage reports config --- configs/reports/report.config | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/report.config b/configs/reports/report.config index 19d53a921..e605e133d 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 f987bd845e59003dadaca445c7d275ed389577bc Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 5 May 2021 20:55:41 +0530 Subject: [PATCH 0572/1630] created ws-reports.yml for water abd sewerage reports --- 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 000000000..e9e9181cd --- /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 35051057d68a657939e8df30fca0a14dad3d260e Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 7 May 2021 15:59:13 +0530 Subject: [PATCH 0573/1630] Update ws-bill.json --- configs/pdf-service/data-config/ws-bill.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json index bb5004cac..8b040376f 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", From ad0a2afd0aa42472fe0347840888fbf5fc74a190 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 7 May 2021 16:00:02 +0530 Subject: [PATCH 0574/1630] 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 582082f9e..d6bc1a15b 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 061bbff7045407990ed59061d7524dc0381e3022 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 7 May 2021 16:07:04 +0530 Subject: [PATCH 0575/1630] 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 d6bc1a15b..0e579c1ec 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}} {{ulbGrade}}", "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 ab35d76057a2a54d086947fe364c083c83d50cd0 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 7 May 2021 16:07:55 +0530 Subject: [PATCH 0576/1630] 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 8b040376f..d81c224cd 100644 --- a/configs/pdf-service/data-config/ws-bill.json +++ b/configs/pdf-service/data-config/ws-bill.json @@ -738,6 +738,9 @@ { "variable": "website", "value": "$.MdmsRes.tenant.tenants[0].domainUrl" + },{ + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" }, { "variable": "email", From 6affa9fb29f04f38071c4043d1d14a7a5b07ddc0 Mon Sep 17 00:00:00 2001 From: Rafeek Date: Mon, 10 May 2021 13:59:44 +0530 Subject: [PATCH 0577/1630] PI-1536:Updated WnS indexer configs --- configs/egov-indexer/sewerage-service.yml | 68 +++++++++++++-------- configs/egov-indexer/water-service.yml | 72 ++++++++++++++--------- 2 files changed, 88 insertions(+), 52 deletions(-) diff --git a/configs/egov-indexer/sewerage-service.yml b/configs/egov-indexer/sewerage-service.yml index 246dd2f9f..191e84152 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 \ No newline at end of file diff --git a/configs/egov-indexer/water-service.yml b/configs/egov-indexer/water-service.yml index d2be3f510..9dc72de9e 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,10 +228,14 @@ 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 + outJsonPath: $.Data.history \ No newline at end of file From 58045797309e5f520964df00b51ad4e0cb799793 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 13 May 2021 12:15:08 +0530 Subject: [PATCH 0578/1630] changes for search in pgr --- .../rainmaker-pgr-v2-searcher.yml | 259 ++++-------------- 1 file changed, 55 insertions(+), 204 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml index fc0559527..153063f46 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: @@ -263,6 +60,60 @@ SearchDefinitions: 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: From 7ea70cb51693c0ace702107060edb6df49bcf0dd Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 25 May 2021 20:33:11 +0530 Subject: [PATCH 0579/1630] Update ws-onetime-receipt.json --- 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 ac25fea5d..be4e1be5f 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": [ [ From d5d68781431eb708f5cfab2e031cb28a0bf5fc27 Mon Sep 17 00:00:00 2001 From: ramakrishnaippili-eGov Date: Wed, 2 Jun 2021 16:13:25 +0530 Subject: [PATCH 0580/1630] Create covid-chatbot-telemetry.yaml Indexer config for COVID chatbot. --- 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 000000000..3fd6fb43f --- /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 813dbf9d7d3f027ee3bc3e8a4f3c0617deb15a7c Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Thu, 10 Jun 2021 14:46:25 +0530 Subject: [PATCH 0581/1630] PI-1582: added ws-services-legacyindex topic --- configs/egov-indexer/water-service.yml | 82 +++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/configs/egov-indexer/water-service.yml b/configs/egov-indexer/water-service.yml index 9dc72de9e..eb07bfe06 100644 --- a/configs/egov-indexer/water-service.yml +++ b/configs/egov-indexer/water-service.yml @@ -238,4 +238,84 @@ 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 \ No newline at end of file + outJsonPath: $.Data.history + + - 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":"","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 bd5b6ccd6eca4cad27fc491697a6f19399113b38 Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Thu, 10 Jun 2021 15:02:00 +0530 Subject: [PATCH 0582/1630] PI-1582: added sw-services-legacyindex topic --- configs/egov-indexer/sewerage-service.yml | 74 ++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/configs/egov-indexer/sewerage-service.yml b/configs/egov-indexer/sewerage-service.yml index 191e84152..eda259ca2 100644 --- a/configs/egov-indexer/sewerage-service.yml +++ b/configs/egov-indexer/sewerage-service.yml @@ -214,4 +214,76 @@ 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 \ No newline at end of file + outJsonPath: $.Data.history + + - 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":{},"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 4e1d30bc1d1298e61dda4c402f9179779219badf Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov Date: Mon, 14 Jun 2021 16:07:44 +0530 Subject: [PATCH 0583/1630] PI-1626:Adding new report to pull --- configs/reports/configs/pt-reports.yml | 48 ++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index b146c62ee..c2bad4748 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5652,3 +5652,51 @@ ReportDefinitions: 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.tenantid=$tenantid + orderby: ORDER BY pt.propertyid DESC NULLS LAST From 77a0311b2bdc20985f34867562ecd236feea2e9f Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov Date: Mon, 14 Jun 2021 16:18:35 +0530 Subject: [PATCH 0584/1630] PI-1626:correcting indentation --- 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 c2bad4748..d7906a2c1 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5697,6 +5697,6 @@ ReportDefinitions: source: pt isMandatory: true searchClause: AND pt.createdtime <= $toDate - query: | + 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 + orderby: ORDER BY pt.propertyid DESC NULLS LAST From f4fc566826b86ab08d60be795a1dbc7dfe0864a8 Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov Date: Mon, 14 Jun 2021 16:23:09 +0530 Subject: [PATCH 0585/1630] PI-1626:correcting indentation --- 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 d7906a2c1..5851838a3 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5698,5 +5698,5 @@ ReportDefinitions: 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 + 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 c0dee1fda485ea9a875136cb2ec86a6344828800 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 15 Jun 2021 09:55:22 +0530 Subject: [PATCH 0586/1630] yml syntax updated --- configs/reports/configs/pt-reports.yml | 90 +++++++++++++------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 5851838a3..375e380df 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5653,50 +5653,50 @@ ReportDefinitions: 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 +- 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 + 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 b727e2aba280104d2fb6781bd6bfb41e582ac1de Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Tue, 15 Jun 2021 10:11:10 +0530 Subject: [PATCH 0587/1630] report correction --- 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 375e380df..8ebe5b1ad 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5678,7 +5678,7 @@ ReportDefinitions: label: reports.pt.mobileno type: string source: pt - total: false + total: false - name: useruuid label: reports.pt.useruuid type: string @@ -5696,7 +5696,7 @@ ReportDefinitions: 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 + 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 From ed319b753ce606977c469e52617ada40464a8259 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 15 Jun 2021 10:49:00 +0530 Subject: [PATCH 0588/1630] Added FY 2021-22 for Zone and Block Reports --- configs/reports/configs/pt-reports.yml | 66 ++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 8ebe5b1ad..562cab266 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4934,6 +4934,16 @@ ReportDefinitions: 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: totalptr label: reports.pt.totalptr @@ -5089,6 +5099,22 @@ ReportDefinitions: 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 + ), zones as ( select zonecode,string_agg(distinct zonename,',') as zname from eg_bndry_mohalla where tenantid=$tenantid group by zonecode @@ -5112,8 +5138,10 @@ ReportDefinitions: 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" + coalesce(fy2021.totalcount,0) as "2021_22PTR", + coalesce(fy2021.amount,0) as "2021_22Collection", + 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) 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) as "totalcollection" from zones left outer join fy2013 on fy2013.zonecode=zones.zonecode left outer join fy2014 on fy2014.zonecode=zones.zonecode @@ -5123,6 +5151,7 @@ ReportDefinitions: 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 where 1=1 orderby: order by zonename @@ -5217,6 +5246,16 @@ ReportDefinitions: 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: totalptr label: reports.pt.totalptr type: string @@ -5371,6 +5410,22 @@ ReportDefinitions: 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 + ), blocks as ( select blockcode,string_agg(distinct blockname,',') as zname from eg_bndry_mohalla where tenantid=$tenantid group by blockcode @@ -5393,9 +5448,11 @@ ReportDefinitions: 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(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" + 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) 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) as "totalcollection" from blocks left outer join fy2013 on fy2013.blockcode=blocks.blockcode left outer join fy2014 on fy2014.blockcode=blocks.blockcode @@ -5405,6 +5462,7 @@ ReportDefinitions: 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 where 1=1 orderby: order by blockname From 59363db049c78315d4c45ef80bb06f365d855f2d Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Wed, 16 Jun 2021 13:54:57 +0530 Subject: [PATCH 0589/1630] [PI-1626] added active filter for ULB PT data 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 562cab266..5705c0143 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5756,5 +5756,5 @@ ReportDefinitions: 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 + 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 From adb73a7a1ab847522f0fa03aa19e1af4588928bf Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Mon, 28 Jun 2021 15:44:00 +0530 Subject: [PATCH 0590/1630] [PI-1650]-W&S Target collection showing zero amount --- .../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 184349795..5644b63a9 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2914,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\"}}}}" From 301f28b70f26741e38c8a4cc31256f6df4c15480 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 29 Jun 2021 13:32:20 +0530 Subject: [PATCH 0591/1630] added Address and email id in StateTradeLicenseDetailsReport_v2 --- configs/reports/configs/tl-reports.yml | 50 ++++++++++++++------------ 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index c93171437..d3b8ea5f5 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 @@ -2598,29 +2603,29 @@ ReportDefinitions: isMandatory: false searchClause: AND tl.applicationdate <= $toDate query: | - SELECT - tl.applicationnumber as applicationnumber, - locality_tlb.locality as locality, - propertyid, - financialyear, + 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, - paydetail.amountpaid as totalamount, - tl.status as status + 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, + 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, 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_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=$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 @@ -2634,6 +2639,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!='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 From 8e6c5f16866e881ac70027818662f133577edb68 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 29 Jun 2021 15:22:29 +0530 Subject: [PATCH 0592/1630] Tenant id correction in StateTradeLicenseDetailsReport_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 d3b8ea5f5..bfd6e3c40 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2624,7 +2624,7 @@ ReportDefinitions: 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=$tenantid + 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 ( From 0cd28273a07bc590c96455af7c576a91676bda9c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 29 Jun 2021 15:48:14 +0530 Subject: [PATCH 0593/1630] added emaild id null for decryption --- 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 bfd6e3c40..b3047413e 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2616,7 +2616,7 @@ ReportDefinitions: tradeTypeName, acc, name, - emailid, + (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, From 677d6cafd83e8be69d57e9d428d6799499ac69af Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 29 Jun 2021 16:43:09 +0530 Subject: [PATCH 0594/1630] added tax head for security deposit in Wns 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 1c6bdb3cb..9d7a07428 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 1569730c55cfac2167faaa56d5b5ee676c5d8025 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 6 Jul 2021 15:09:15 +0530 Subject: [PATCH 0595/1630] updated Report 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 b3047413e..a7333e688 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2797,7 +2797,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 d2417352eeadd5bca72625c002006da9182a2b7e Mon Sep 17 00:00:00 2001 From: mohammadrafeek-eGov Date: Wed, 7 Jul 2021 12:33:01 +0530 Subject: [PATCH 0596/1630] PI-1624:Added additional details in unit. --- .../egov-persister/property-services-registry.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/configs/egov-persister/property-services-registry.yml b/configs/egov-persister/property-services-registry.yml index 4c48bb0fc..4cb28d11a 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: @@ -277,6 +277,10 @@ serviceMaps: dbType: JSONB - jsonPath: $.Property.units.*.active + + - jsonPath: $.Property.units.*.additionalDetails + type: JSON + dbType: JSONB - jsonPath: $.Property.auditDetails.createdBy @@ -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: @@ -536,6 +540,10 @@ serviceMaps: dbType: JSONB - jsonPath: $.Property.units.*.active + + - jsonPath: $.Property.units.*.additionalDetails + type: JSON + dbType: JSONB - jsonPath: $.Property.auditDetails.createdBy @@ -576,4 +584,4 @@ serviceMaps: - jsonPath: $.Property.auditDetails.createdTime - - jsonPath: $.Property.auditDetails.lastModifiedTime \ No newline at end of file + - jsonPath: $.Property.auditDetails.lastModifiedTime From 835e133fb78946b76d66b7fcdd7e288f98d1b29f Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Wed, 7 Jul 2021 16:57:27 +0530 Subject: [PATCH 0597/1630] adding surveyid in ReceiptRegister_without_locality_V2 --- configs/reports/configs/pt-reports.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 5705c0143..aa0bddb15 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2393,6 +2393,11 @@ ReportDefinitions: 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 @@ -2482,6 +2487,7 @@ ReportDefinitions: 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, From d35a6f01f5d13e0fa6f12ad8b139b8c17e41cd0e Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 8 Jul 2021 16:23:45 +0530 Subject: [PATCH 0598/1630] search by 6 digits 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 153063f46..5614e17f4 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 65b705991a6c75840f737dc568ce124dc8e55f63 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 12 Jul 2021 13:22:55 +0530 Subject: [PATCH 0599/1630] updated for V2 to search NONRESIDENTIAL PROPERTIES --- 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 aa0bddb15..2ab29b96a 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3143,7 +3143,7 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND pt.usagecategory = $usage + searchClause: AND upper(split_part(pt.usagecategory,'.',1)) = $usage query: | SELECT --initcap(split_part(payment.tenantid, '.', 2)) as tenantid, From c7e7abcffe1ceb04f7884729b5b184c0c3bad7e4 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 12 Jul 2021 15:12:09 +0530 Subject: [PATCH 0600/1630] 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 2ab29b96a..eaa30411d 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2487,7 +2487,7 @@ ReportDefinitions: pd.tenantid AS tenantid, pd.id, pt.propertyid as consumercode, - pt.surveyid as surveyid + 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, From 03fe58c80705a634f252dc095cfaa4f811489450 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 12 Jul 2021 16:06:46 +0530 Subject: [PATCH 0601/1630] defaulter report NaN correction --- 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 eaa30411d..1da6f1b2a 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4659,8 +4659,9 @@ ReportDefinitions: (select pt.propertyid as "propertytaxuniqueid", string_agg(collection.finyear, ', ') as "financailyear" , - string_agg(collection.taxpaid::varchar, ', ') as "amountcollected" , - string_agg(pt.oldpropertyid,',') as "existingpropertyid", + --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", From db70b1b95fc74316632a330f0634f0ef341c067c Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Wed, 14 Jul 2021 13:29:37 +0530 Subject: [PATCH 0602/1630] adding PT report for GIS Mapping --- 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 1da6f1b2a..d8c14b3f4 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5765,3 +5765,65 @@ 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.status='ACTIVE' and po.status='ACTIVE' and pt.tenantid=$tenantid orderby: ORDER BY pt.propertyid DESC NULLS LAST + +- reportName: PTReportforGISMapping + 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: name + label: reports.pt.name + type: string + source: pt + total: false + - name: guardian + label: reports.pt.guardian + type: string + source: pt + total: false + - name: mobilenumber + label: reports.pt.mobilenumber + type: string + source: pt + total: false + query: | + select p.propertyid,p.nooffloors,p.landarea,p.usagecategory,p.surveyid,p.oldpropertyid,u.name,u.guardian,u.mobilenumber from eg_pt_property p,eg_pt_owner o ,eg_user u where p.id=o.propertyid and + p.tenantid='pb.hoshiarpur' and p.status='ACTIVE' and o.userid=u.uuid and o.tenantid='pb.hoshiarpur' + and o.status='ACTIVE' and + o.propertyid in (select id from eg_pt_property where tenantid='pb.hoshiarpur' and status='ACTIVE') + orderby: ORDER BY pt.propertyid From d879600a9ad2ff863ab17b254a7205e32994bdd5 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Wed, 14 Jul 2021 14:25:43 +0530 Subject: [PATCH 0603/1630] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index d8c14b3f4..8ff6a2511 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5767,6 +5767,7 @@ ReportDefinitions: orderby: ORDER BY pt.propertyid DESC NULLS LAST - reportName: PTReportforGISMapping + decryptionPathId: ULBDEFAULTERPTREPORT_V2 summary: PT Report for GIS Mapping version: 1.0.0 moduleName: rainmaker-pt @@ -5806,8 +5807,8 @@ ReportDefinitions: type: string source: pt total: false - - name: name - label: reports.pt.name + - name: ownername + label: reports.pt.ownername type: string source: pt total: false @@ -5816,13 +5817,13 @@ ReportDefinitions: type: string source: pt total: false - - name: mobilenumber - label: reports.pt.mobilenumber + - name: mobileno + label: reports.pt.mobileno type: string source: pt total: false query: | - select p.propertyid,p.nooffloors,p.landarea,p.usagecategory,p.surveyid,p.oldpropertyid,u.name,u.guardian,u.mobilenumber from eg_pt_property p,eg_pt_owner o ,eg_user u where p.id=o.propertyid and + select p.propertyid,p.nooffloors,p.landarea,p.usagecategory,p.surveyid,p.oldpropertyid,u.name as ownername,u.guardian,u.mobilenumber as mobileno from eg_pt_property p,eg_pt_owner o ,eg_user u where p.id=o.propertyid and p.tenantid='pb.hoshiarpur' and p.status='ACTIVE' and o.userid=u.uuid and o.tenantid='pb.hoshiarpur' and o.status='ACTIVE' and o.propertyid in (select id from eg_pt_property where tenantid='pb.hoshiarpur' and status='ACTIVE') From 6095ad59d070dbb0af3be97e0375024192e32ca5 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 14 Jul 2021 15:22:38 +0530 Subject: [PATCH 0604/1630] changes for arrear bifurcation on PT receipt --- .../data-config/property-receipt.json | 91 +++++++++++++++++-- 1 file changed, 81 insertions(+), 10 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 8d57ed850..d402165c7 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -166,12 +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" @@ -529,6 +531,73 @@ "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":"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": { @@ -615,13 +684,13 @@ "queryParam": "propertyIds=$.paymentDetails[0].bill.consumerCode,tenantId=$.tenantId", "apiRequest": null, "responseMapping":[ - { "variable":"institutionName", + { "variable":"institutionName", "value":"$.Properties[0].institution.name" }, { "variable":"vasikaNo", "value":"$.Properties[0].additionalDetails.vasikaNo" - }, { + },{ "variable":"vasikaDate", "value":"$.Properties[0].additionalDetails.vasikaDate", "type":"date" @@ -682,15 +751,12 @@ { "variable":"oldPropertyId", "value":"$.Properties[0].oldPropertyId" - }, + }, { "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')]", @@ -705,7 +771,12 @@ { "variable":"fatherOrHusbandName2", "value":"fatherOrHusbandName" - }] + }, + { + "variable":"ownerMobileNumber", + "value":"mobileNumber" + } + ] } }, { From dadeae5a55c862f1b019781189c7ea9147c3940b Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 14 Jul 2021 15:24:28 +0530 Subject: [PATCH 0605/1630] changes for arrear bifurcation on PT receipt --- .../format-config/property-receipt.json | 66 ++----------------- 1 file changed, 7 insertions(+), 59 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index f2e304150..f30dc44b4 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%","7%","5%","7%","6%","7%","8%","8%","8%","8%","7%","*" ], "body": [ - [ + [ { + "text": "Year", + "style": "amounts" + }, { "text": "Property Tax", "style": "amounts" @@ -498,9 +501,6 @@ { "text": "Adhoc Rebate", "style": "amounts" - },{ - "text": "Arrears", - "style": "amounts" }, { "text": "Round Off", @@ -513,60 +513,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\":\"{{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 580de663bb5c82e59c2927b1b8619806547adf06 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Wed, 14 Jul 2021 17:40:01 +0530 Subject: [PATCH 0606/1630] UPDATED PT REPORT FOR GIS --- 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 8ff6a2511..330812d0b 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5827,4 +5827,4 @@ ReportDefinitions: p.tenantid='pb.hoshiarpur' and p.status='ACTIVE' and o.userid=u.uuid and o.tenantid='pb.hoshiarpur' and o.status='ACTIVE' and o.propertyid in (select id from eg_pt_property where tenantid='pb.hoshiarpur' and status='ACTIVE') - orderby: ORDER BY pt.propertyid + orderby: ORDER BY p.propertyid From a6ea07dd4bf33f9f71eae436d62cf4b34f28ef7d Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 15 Jul 2021 11:59:56 +0530 Subject: [PATCH 0607/1630] adding locality in PT report for GIS --- configs/reports/configs/pt-reports.yml | 28 +++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 330812d0b..dad2b84b4 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5767,7 +5767,7 @@ ReportDefinitions: orderby: ORDER BY pt.propertyid DESC NULLS LAST - reportName: PTReportforGISMapping - decryptionPathId: ULBDEFAULTERPTREPORT_V2 + decryptionPathId: ULBPTDataDumpReport_V2 summary: PT Report for GIS Mapping version: 1.0.0 moduleName: rainmaker-pt @@ -5812,8 +5812,8 @@ ReportDefinitions: type: string source: pt total: false - - name: guardian - label: reports.pt.guardian + - name: guardianname + label: reports.pt.guardianname type: string source: pt total: false @@ -5822,9 +5822,23 @@ ReportDefinitions: 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 query: | - select p.propertyid,p.nooffloors,p.landarea,p.usagecategory,p.surveyid,p.oldpropertyid,u.name as ownername,u.guardian,u.mobilenumber as mobileno from eg_pt_property p,eg_pt_owner o ,eg_user u where p.id=o.propertyid and - p.tenantid='pb.hoshiarpur' and p.status='ACTIVE' and o.userid=u.uuid and o.tenantid='pb.hoshiarpur' - and o.status='ACTIVE' and - o.propertyid in (select id from eg_pt_property where tenantid='pb.hoshiarpur' and status='ACTIVE') + 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='pb.hoshiarpur' 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='pb.hoshiarpur' and p.status='ACTIVE' + and + o.propertyid in (select id from eg_pt_property where tenantid='pb.hoshiarpur' and status='ACTIVE') orderby: ORDER BY p.propertyid From 4d99cae1ab539ab956d431b998af26fc81d530bf Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 15 Jul 2021 12:51:23 +0530 Subject: [PATCH 0608/1630] adding search clause to PT gis report --- configs/reports/configs/pt-reports.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index dad2b84b4..68d17f3f4 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5832,6 +5832,19 @@ ReportDefinitions: 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 d8a765516689f7b1fe2ccab4e767214f999e6031 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 22 Jul 2021 13:10:43 +0530 Subject: [PATCH 0609/1630] defaulter report updated and new FY search enabled Defaulter report added --- configs/reports/configs/pt-reports.yml | 117 ++++++++++++++++++++++++- 1 file changed, 114 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 68d17f3f4..d96c8b33c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4509,6 +4509,7 @@ ReportDefinitions: 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 @@ -4671,20 +4672,20 @@ ReportDefinitions: 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.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.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 + 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) @@ -4720,6 +4721,116 @@ ReportDefinitions: 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: 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' + 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(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 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 From 7f1185aadcd93b79242ab5211d11bd4ff677b17a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 22 Jul 2021 16:48:52 +0530 Subject: [PATCH 0610/1630] inject where condition to support searchParameters --- 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 d96c8b33c..9cc6eee07 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4829,7 +4829,7 @@ ReportDefinitions: 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 + 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 From 8f7329024207736ff7853d43ccf1061dcc8f77bf Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 23 Jul 2021 10:38:29 +0530 Subject: [PATCH 0611/1630] added financial year column in defaulter report --- configs/reports/configs/pt-reports.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 9cc6eee07..6c90f2aa1 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4624,6 +4624,11 @@ ReportDefinitions: 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 @@ -4737,6 +4742,11 @@ ReportDefinitions: 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 From 54897aa337ab30c244bffb965480c6ecc5f971b9 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 23 Jul 2021 11:11:30 +0530 Subject: [PATCH 0612/1630] added distinct to finyear defaulter report --- 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 6c90f2aa1..de690d9b6 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4664,7 +4664,7 @@ ReportDefinitions: with props as (select pt.propertyid as "propertytaxuniqueid", - string_agg(collection.finyear, ', ') as "financailyear" , + 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", @@ -4790,7 +4790,7 @@ ReportDefinitions: with props as (select pt.propertyid as "propertytaxuniqueid", - string_agg(collection.finyear, ', ') as "financailyear" , + 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", From 99b6482ec044fae0ae828152a89f0ce7e38097d2 Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Thu, 29 Jul 2021 13:19:15 +0530 Subject: [PATCH 0613/1630] 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 5644b63a9..f11e4ffc2 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -535,7 +535,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 c89b1414c872b1c30b50bd9a827b4870e61ed90c Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Thu, 29 Jul 2021 17:01:16 +0530 Subject: [PATCH 0614/1630] 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 f11e4ffc2..3ddb8008d 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -534,7 +534,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 f9d1168cbac1b347ac58c508e15bc41cff3b19a3 Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Thu, 29 Jul 2021 17:02:44 +0530 Subject: [PATCH 0615/1630] 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 3ddb8008d..d458af17a 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -534,7 +534,7 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\", \"financialYear\" : \"financialYear.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 fbdf5629cbb6b578556e4e1a69fff4111e6d976e Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Thu, 29 Jul 2021 18:18:40 +0530 Subject: [PATCH 0616/1630] 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 d458af17a..f11e4ffc2 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -534,7 +534,7 @@ "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\"}}}}" From 45e61d35ccae08e3c8b605beda67c62f9e497b2a Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Fri, 30 Jul 2021 15:04:32 +0530 Subject: [PATCH 0617/1630] [PI-1708] Adding telemetry config for chatbot v2 --- configs/egov-indexer/chatbot-telemetry-v2.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 configs/egov-indexer/chatbot-telemetry-v2.yaml diff --git a/configs/egov-indexer/chatbot-telemetry-v2.yaml b/configs/egov-indexer/chatbot-telemetry-v2.yaml new file mode 100644 index 000000000..20d0167ae --- /dev/null +++ b/configs/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 887eb96087697b740eaed1952d5ca8d2ee175002 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 3 Aug 2021 16:52:00 +0530 Subject: [PATCH 0618/1630] added PT_DEFAULTER_REPORT_V2 from new tables added defaulter report fetching data from new tables created to enhance report service --- 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 de690d9b6..93308438a 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5976,3 +5976,116 @@ ReportDefinitions: and o.propertyid in (select id from eg_pt_property where tenantid='pb.hoshiarpur' 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 + 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 From 88d25da0e52e55f52385dc2869b6bc0579dfc12c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 3 Aug 2021 17:37:49 +0530 Subject: [PATCH 0619/1630] minor addition --- 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 93308438a..23e12a7a9 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6054,7 +6054,7 @@ ReportDefinitions: ( select propertyid, - string_agg(concat(assessmentyears,'(Rs.',totalamount,')'),',') as fy, + string_agg(concat(assessmentyears,'(Rs.',totalamount,') '),',') as fy, max(assessmentyears) as latest_fy, max(totalamount) as maxtotal, max(propertytax) as max_pt_tax From 5abc982d0cc93ea4fa7bf6da7f1f95d04096f432 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 3 Aug 2021 17:43:09 +0530 Subject: [PATCH 0620/1630] 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 23e12a7a9..d46e110dc 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6054,7 +6054,7 @@ ReportDefinitions: ( select propertyid, - string_agg(concat(assessmentyears,'(Rs.',totalamount,') '),',') as fy, + string_agg(concat(assessmentyears,' (Rs.',totalamount,')'),', ') as fy, max(assessmentyears) as latest_fy, max(totalamount) as maxtotal, max(propertytax) as max_pt_tax From fe916a2e3aed40128eb8e380d127c21065011148 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 4 Aug 2021 13:59:36 +0530 Subject: [PATCH 0621/1630] changes for mobile number on receipt --- configs/pdf-service/data-config/property-receipt.json | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index d402165c7..2bfcce299 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -756,7 +756,10 @@ "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')]", @@ -771,11 +774,7 @@ { "variable":"fatherOrHusbandName2", "value":"fatherOrHusbandName" - }, - { - "variable":"ownerMobileNumber", - "value":"mobileNumber" - } + } ] } }, From 0a3ba1976c5da688a094637233a85aaf50f05972 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 4 Aug 2021 15:19:20 +0530 Subject: [PATCH 0622/1630] added filters in un-synched Defaulter Report --- configs/reports/configs/pt-reports.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index d46e110dc..2908e7527 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6049,6 +6049,20 @@ ReportDefinitions: 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' + source: pt + isMandatory: false + searchClause: AND 1=1 + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND props.localitycode IN ($localityArray) query: | with assessments as ( @@ -6060,7 +6074,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=$tenantid and assessmentyears ='2020-21') + and propertyid not in (select propertyid from report_assessments where tenantid=$tenantid and assessmentyears =$finYear) group by propertyid ), owners as @@ -6089,3 +6103,4 @@ ReportDefinitions: from report_properties props inner join assessments on assessments.propertyid=props.propertyid inner join owners on owners.propertyid=props.propertyid + where 1=1 From b6e2e866afe86a5cd51e3130278908859f2a6b98 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 4 Aug 2021 15:39:32 +0530 Subject: [PATCH 0623/1630] added usageType filter in un-synched defaulter report --- 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 2908e7527..51ccd50cb 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6057,6 +6057,13 @@ ReportDefinitions: 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 From d8c5e47f49cdc08e5547dfd588022eaa980249b8 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 4 Aug 2021 16:50:41 +0530 Subject: [PATCH 0624/1630] property id addition on wns bill --- configs/pdf-service/data-config/ws-bill.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json index d81c224cd..520b4ef12 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": "$.connection.oldConnectionNo" } }, { "variable": "rate", @@ -470,7 +470,7 @@ { "variable": "ledgerId", "value": { - "path": "$.additionalDetails.ledgerId" + "path": "$.connection.additionalDetails.ledgerId" } }, { @@ -734,13 +734,13 @@ { "variable": "phoneNumber", "value": "$.MdmsRes.tenant.tenants[0].contactNumber" + }, { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" }, { "variable": "website", "value": "$.MdmsRes.tenant.tenants[0].domainUrl" - },{ - "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" }, { "variable": "email", @@ -795,7 +795,7 @@ }, { "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": [ { From 7bc8c02fa40c18ef8fc8095eca67fb94008ddf96 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 5 Aug 2021 09:55:00 +0530 Subject: [PATCH 0625/1630] added property id in bill search --- 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 0f764b5f3..a69ec3115 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, @@ -255,4 +255,4 @@ SearchDefinitions: output: jsonFormat: {"ResponseInfo": {},"Bills": []} outJsonPath: $.Bills - responseInfoPath: $.ResponseInfo \ No newline at end of file + responseInfoPath: $.ResponseInfo From b8dff75903ef3b9078fb7f1366f6f8b5ba9120fb Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 5 Aug 2021 09:55:43 +0530 Subject: [PATCH 0626/1630] added Property id in sewerage 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 a69ec3115..84b4ec34c 100644 --- a/configs/egov-searcher/bill-genie.yml +++ b/configs/egov-searcher/bill-genie.yml @@ -180,7 +180,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 5460adaad681c11c304f212e730cc16c5e1b2ed6 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 5 Aug 2021 16:21:26 +0530 Subject: [PATCH 0627/1630] added receiptRegister fetching data from new report tables --- configs/reports/configs/pt-reports.yml | 170 +++++++++++++++++++++++++ 1 file changed, 170 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 51ccd50cb..8e39546f5 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6111,3 +6111,173 @@ ReportDefinitions: inner join assessments on assessments.propertyid=props.propertyid inner join owners on owners.propertyid=props.propertyid where 1=1 + +- 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: 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 = $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, + rp.receiptdate, + 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 + where rp.paymentstatus!='CANCELLED' and rp.tenantid=$tenantid + orderby: order by receiptnumber From 55c895875e66f2d541c08b9b56b0c39dc75ecc8b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 6 Aug 2021 10:48:21 +0530 Subject: [PATCH 0628/1630] shown cancelled receipts even for INACTIVE properties --- 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 8e39546f5..584f3d242 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2721,7 +2721,7 @@ ReportDefinitions: 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.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id --and pt_addr.propertyid=pt.id orderby: ORDER BY pd.receiptdate DESC; From ca4916eab68bf272ee18e21a84bd4933276809f1 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 6 Aug 2021 15:05:36 +0530 Subject: [PATCH 0629/1630] added PT Deump report from new report tables --- configs/reports/configs/pt-reports.yml | 213 +++++++++++++++++++++++++ 1 file changed, 213 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 584f3d242..5d25e3bb8 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6281,3 +6281,216 @@ ReportDefinitions: inner join assessments as asmt on asmt.billid=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: 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 and rp.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + 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 = $paymentMode + - 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='pb.hoshiarpur' + group by propertyid + ), + units as + ( + select + propertyid, + sum(builtuparea) as builtuparea, + string_agg(occupancytype,',') as occupancytype + from report_units + where active='true' and tenantid='pb.hoshiarpur' + group by propertyid + ) + select + rp.billid, + --ra.billid, + pt.tenantid as ulbn, + pt.propertyid as propertytaxuniqueid, + rp.transactiondate as dateoftransaction, + rp.receiptnumber as receiptnumber, + rp.receiptdate as paymentdate, + rp.paymentmode as paymentmode, + pt.oldpropertyid as existingpropertyid, + ra.assessmentyears 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.transactiondate as transcationdate, + owners.emailid as emailid, + pt.address as address, + pt.additionaldetails->>'remarks' as remarks, + --pt.additionaldetails->>'businessName' as firmbusinessname, + pt.firmbusinessname as businessname, + pt.localitycode as localitycode, + pt.localityname as localityname + 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 + 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 + where pt.tenantid='pb.hoshiarpur' + From ed62a09d9cc59f4d0d77f3c35a5286c00bd670a3 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 6 Aug 2021 15:56:21 +0530 Subject: [PATCH 0630/1630] hard coded pb.hoshiarpur to $tenantid --- 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 5d25e3bb8..ed6d37aa6 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5969,12 +5969,12 @@ ReportDefinitions: 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='pb.hoshiarpur' inner join eg_user as u + 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='pb.hoshiarpur' and p.status='ACTIVE' + where p.tenantid=$tenantid and p.status='ACTIVE' and - o.propertyid in (select id from eg_pt_property where tenantid='pb.hoshiarpur' and status='ACTIVE') + o.propertyid in (select id from eg_pt_property where tenantid=$tenantid and status='ACTIVE') orderby: ORDER BY p.propertyid @@ -6445,7 +6445,7 @@ ReportDefinitions: 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='pb.hoshiarpur' + from report_owners where status='ACTIVE' and tenantid=$tenantid group by propertyid ), units as @@ -6455,7 +6455,7 @@ ReportDefinitions: sum(builtuparea) as builtuparea, string_agg(occupancytype,',') as occupancytype from report_units - where active='true' and tenantid='pb.hoshiarpur' + where active='true' and tenantid=$tenantid group by propertyid ) select @@ -6492,5 +6492,5 @@ ReportDefinitions: inner join report_payments as rp on rp.propertyid=pt.propertyid 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 - where pt.tenantid='pb.hoshiarpur' + where pt.tenantid=$tenantid From 04df2c1c6cd69abdbd191e9dce7c1b03af42852c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 6 Aug 2021 16:58:38 +0530 Subject: [PATCH 0631/1630] added bock wise and zone wise reports from report tables --- configs/reports/configs/pt-reports.yml | 332 ++++++++++++++++++++++++- 1 file changed, 331 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index ed6d37aa6..448c62967 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6493,4 +6493,334 @@ ReportDefinitions: 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 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: 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(*) as totalcount + from report_assessments as asmt + inner join report_properties as pt on pt.propertyid=asmt.propertyid + where 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 FY2013_14Collection, + sum(case when assessmentyears='2013-14' then totalcount else 0 end) as FY2013_14PTR, + sum(case when assessmentyears='2014-15' then amount else 0 end) as FY2014_15Collection, + sum(case when assessmentyears='2014-15' then totalcount else 0 end) as FY2014_15PTR, + sum(case when assessmentyears='2015-16' then amount else 0 end) as FY2015_16Collection, + sum(case when assessmentyears='2015-16' then totalcount else 0 end) as FY2015_16PTR, + sum(case when assessmentyears='2016-17' then amount else 0 end) as FY2016_17Collection, + sum(case when assessmentyears='2016-17' then totalcount else 0 end) as FY2016_17PTR, + sum(case when assessmentyears='2017-18' then amount else 0 end) as FY2017_18Collection, + sum(case when assessmentyears='2017-18' then totalcount else 0 end) as FY2017_18PTR, + sum(case when assessmentyears='2018-19' then amount else 0 end) as FY2018_19Collection, + sum(case when assessmentyears='2018-19' then totalcount else 0 end) as FY2018_19PTR, + sum(case when assessmentyears='2019-20' then amount else 0 end) as FY2019_20Collection, + sum(case when assessmentyears='2019-20' then totalcount else 0 end) as FY2019_20PTR, + sum(case when assessmentyears='2020-21' then amount else 0 end) as FY2020_21Collection, + sum(case when assessmentyears='2020-21' then totalcount else 0 end) as FY2020_21PTR, + sum(case when assessmentyears='2021-22' then amount else 0 end) as FY2021_22Collection, + sum(case when assessmentyears='2021-22' then totalcount else 0 end) as FY2021_22PTR, + sum(amount) as totalcollection, + sum(totalcount) as totalptr + from summary + 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: 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(*) as totalcount + from report_assessments as asmt + inner join report_properties as pt on pt.propertyid=asmt.propertyid + where 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 FY2013_14Collection, + sum(case when assessmentyears='2013-14' then totalcount else 0 end) as FY2013_14PTR, + sum(case when assessmentyears='2014-15' then amount else 0 end) as FY2014_15Collection, + sum(case when assessmentyears='2014-15' then totalcount else 0 end) as FY2014_15PTR, + sum(case when assessmentyears='2015-16' then amount else 0 end) as FY2015_16Collection, + sum(case when assessmentyears='2015-16' then totalcount else 0 end) as FY2015_16PTR, + sum(case when assessmentyears='2016-17' then amount else 0 end) as FY2016_17Collection, + sum(case when assessmentyears='2016-17' then totalcount else 0 end) as FY2016_17PTR, + sum(case when assessmentyears='2017-18' then amount else 0 end) as FY2017_18Collection, + sum(case when assessmentyears='2017-18' then totalcount else 0 end) as FY2017_18PTR, + sum(case when assessmentyears='2018-19' then amount else 0 end) as FY2018_19Collection, + sum(case when assessmentyears='2018-19' then totalcount else 0 end) as FY2018_19PTR, + sum(case when assessmentyears='2019-20' then amount else 0 end) as FY2019_20Collection, + sum(case when assessmentyears='2019-20' then totalcount else 0 end) as FY2019_20PTR, + sum(case when assessmentyears='2020-21' then amount else 0 end) as FY2020_21Collection, + sum(case when assessmentyears='2020-21' then totalcount else 0 end) as FY2020_21PTR, + sum(case when assessmentyears='2021-22' then amount else 0 end) as FY2021_22Collection, + sum(case when assessmentyears='2021-22' then totalcount else 0 end) as FY2021_22PTR, + sum(amount) as totalcollection, + sum(totalcount) as totalptr + from summary + group by blockname + From 250a8c942ed6d4a49f1bb5d32fb1539b8498a116 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 7 Aug 2021 07:36:18 +0530 Subject: [PATCH 0632/1630] corrected groupby syntax --- 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 448c62967..79f014070 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6657,7 +6657,7 @@ ReportDefinitions: sum(amount) as totalcollection, sum(totalcount) as totalptr from summary - group by zonename + groupby: group by zonename - reportName: PT_BlockFYReport_V2 @@ -6822,5 +6822,5 @@ ReportDefinitions: sum(amount) as totalcollection, sum(totalcount) as totalptr from summary - group by blockname + groupby: group by blockname From 417c0a7939bf864f9194cef5a6c77ffbeb4b2a1d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 7 Aug 2021 07:40:13 +0530 Subject: [PATCH 0633/1630] sql syntax correction --- 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 79f014070..f1a7ad8ee 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6415,7 +6415,7 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND and rp.receiptdate >= $fromDate + searchClause: AND rp.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch From 7c9e9fda2fdb06dd28a95de236299b70d88fed35 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 7 Aug 2021 07:47:14 +0530 Subject: [PATCH 0634/1630] 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 f1a7ad8ee..0580a9833 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6657,6 +6657,7 @@ ReportDefinitions: sum(amount) as totalcollection, sum(totalcount) as totalptr from summary + where 1=1 groupby: group by zonename @@ -6821,6 +6822,7 @@ ReportDefinitions: sum(case when assessmentyears='2021-22' then totalcount else 0 end) as FY2021_22PTR, sum(amount) as totalcollection, sum(totalcount) as totalptr - from summary + from summary + where 1=1 groupby: group by blockname From 69e630883f2004b0c084b46413f30bd8da7875c4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sun, 8 Aug 2021 22:13:50 +0530 Subject: [PATCH 0635/1630] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 72 +++++++++++++------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 0580a9833..c12f21632 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6636,24 +6636,24 @@ ReportDefinitions: ) select zonename, - sum(case when assessmentyears='2013-14' then amount else 0 end) as FY2013_14Collection, - sum(case when assessmentyears='2013-14' then totalcount else 0 end) as FY2013_14PTR, - sum(case when assessmentyears='2014-15' then amount else 0 end) as FY2014_15Collection, - sum(case when assessmentyears='2014-15' then totalcount else 0 end) as FY2014_15PTR, - sum(case when assessmentyears='2015-16' then amount else 0 end) as FY2015_16Collection, - sum(case when assessmentyears='2015-16' then totalcount else 0 end) as FY2015_16PTR, - sum(case when assessmentyears='2016-17' then amount else 0 end) as FY2016_17Collection, - sum(case when assessmentyears='2016-17' then totalcount else 0 end) as FY2016_17PTR, - sum(case when assessmentyears='2017-18' then amount else 0 end) as FY2017_18Collection, - sum(case when assessmentyears='2017-18' then totalcount else 0 end) as FY2017_18PTR, - sum(case when assessmentyears='2018-19' then amount else 0 end) as FY2018_19Collection, - sum(case when assessmentyears='2018-19' then totalcount else 0 end) as FY2018_19PTR, - sum(case when assessmentyears='2019-20' then amount else 0 end) as FY2019_20Collection, - sum(case when assessmentyears='2019-20' then totalcount else 0 end) as FY2019_20PTR, - sum(case when assessmentyears='2020-21' then amount else 0 end) as FY2020_21Collection, - sum(case when assessmentyears='2020-21' then totalcount else 0 end) as FY2020_21PTR, - sum(case when assessmentyears='2021-22' then amount else 0 end) as FY2021_22Collection, - sum(case when assessmentyears='2021-22' then totalcount else 0 end) as FY2021_22PTR, + 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(amount) as totalcollection, sum(totalcount) as totalptr from summary @@ -6802,24 +6802,24 @@ ReportDefinitions: ) select blockname, - sum(case when assessmentyears='2013-14' then amount else 0 end) as FY2013_14Collection, - sum(case when assessmentyears='2013-14' then totalcount else 0 end) as FY2013_14PTR, - sum(case when assessmentyears='2014-15' then amount else 0 end) as FY2014_15Collection, - sum(case when assessmentyears='2014-15' then totalcount else 0 end) as FY2014_15PTR, - sum(case when assessmentyears='2015-16' then amount else 0 end) as FY2015_16Collection, - sum(case when assessmentyears='2015-16' then totalcount else 0 end) as FY2015_16PTR, - sum(case when assessmentyears='2016-17' then amount else 0 end) as FY2016_17Collection, - sum(case when assessmentyears='2016-17' then totalcount else 0 end) as FY2016_17PTR, - sum(case when assessmentyears='2017-18' then amount else 0 end) as FY2017_18Collection, - sum(case when assessmentyears='2017-18' then totalcount else 0 end) as FY2017_18PTR, - sum(case when assessmentyears='2018-19' then amount else 0 end) as FY2018_19Collection, - sum(case when assessmentyears='2018-19' then totalcount else 0 end) as FY2018_19PTR, - sum(case when assessmentyears='2019-20' then amount else 0 end) as FY2019_20Collection, - sum(case when assessmentyears='2019-20' then totalcount else 0 end) as FY2019_20PTR, - sum(case when assessmentyears='2020-21' then amount else 0 end) as FY2020_21Collection, - sum(case when assessmentyears='2020-21' then totalcount else 0 end) as FY2020_21PTR, - sum(case when assessmentyears='2021-22' then amount else 0 end) as FY2021_22Collection, - sum(case when assessmentyears='2021-22' then totalcount else 0 end) as FY2021_22PTR, + 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(amount) as totalcollection, sum(totalcount) as totalptr from summary From 5a83afc47d7e433edc9ddf8e75a83298d32ffb39 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 9 Aug 2021 10:26:48 +0530 Subject: [PATCH 0636/1630] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 72 +++++++++++++------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index c12f21632..564ff9da5 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6636,24 +6636,24 @@ ReportDefinitions: ) 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='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(amount) as totalcollection, sum(totalcount) as totalptr from summary @@ -6802,24 +6802,24 @@ ReportDefinitions: ) 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='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(amount) as totalcollection, sum(totalcount) as totalptr from summary From 8729fe9d3f1c322a685821a0733afbe50e08aef0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 10 Aug 2021 11:43:52 +0530 Subject: [PATCH 0637/1630] joins report_assessments and report_payments by billid update one bill may have many demands, therfore as report_assessments table is fetched grouping by demandid, we join it with payments looking billid as substring --- 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 564ff9da5..1b7fc34c6 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6278,7 +6278,7 @@ ReportDefinitions: 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 + inner join assessments as asmt on asmt.billid like concat('%',rp.billid,'%') where rp.paymentstatus!='CANCELLED' and rp.tenantid=$tenantid orderby: order by receiptnumber From eee56b02b0325afae8303f1616cb66340a224193 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 11 Aug 2021 10:58:14 +0530 Subject: [PATCH 0638/1630] PT_DATA_DUMP_REPORT_V2 updated --- configs/reports/configs/pt-reports.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 1b7fc34c6..447281e13 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6468,7 +6468,8 @@ ReportDefinitions: rp.receiptdate as paymentdate, rp.paymentmode as paymentmode, pt.oldpropertyid as existingpropertyid, - ra.assessmentyears as financialyear, + --ra.assessmentyears as financialyear, + getfinancialyear(rp.billid) as financialyear, owners.ownername as ownername, owners.guardianname as guardianname, owners.mobilenumber as mobileno, @@ -6478,7 +6479,8 @@ ReportDefinitions: ru.occupancytype as occupancy, pt.propertytype as propertytype, rp.payermobilenumber as mobilenumber, - ra.totalamount as paymentamount, + --ra.totalamount as paymentamount, + rp.amoutpaid as paymentamount, --rp.transactiondate as transcationdate, owners.emailid as emailid, pt.address as address, @@ -6490,7 +6492,7 @@ ReportDefinitions: 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 - inner join report_assessments ra on split_part(ra.billid,',',1)=rp.billid and ra.propertyid=rp.propertyid + --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 where pt.tenantid=$tenantid From e0554b608f08c231ebdb9cdf950426d8cdbe38bb Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 11 Aug 2021 15:16:33 +0530 Subject: [PATCH 0639/1630] excluded CANCELLED RECEIPTS in new reprots through report tables --- 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 447281e13..d2310a39a 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6491,7 +6491,7 @@ ReportDefinitions: pt.localityname as localityname 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 + 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 where pt.tenantid=$tenantid @@ -6631,7 +6631,7 @@ ReportDefinitions: count(*) as totalcount from report_assessments as asmt inner join report_properties as pt on pt.propertyid=asmt.propertyid - where pt.tenantid=$tenantid + where paymentstatus!='CANCELLED' and pt.tenantid=$tenantid and asmt.createdtime>=$fromDate and asmt.createdtime<=$toDate group by assessmentyears,zonename @@ -6797,7 +6797,7 @@ ReportDefinitions: count(*) as totalcount from report_assessments as asmt inner join report_properties as pt on pt.propertyid=asmt.propertyid - where pt.tenantid=$tenantid + where paymentstatus!='CANCELLED' and pt.tenantid=$tenantid and asmt.createdtime>=$fromDate and asmt.createdtime<=$toDate group by assessmentyears,blockname From 5e1530fef745833fa076fd2e6d763514afe396f7 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 11 Aug 2021 21:25:37 +0530 Subject: [PATCH 0640/1630] 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 d2310a39a..343b403b8 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6461,7 +6461,7 @@ ReportDefinitions: select rp.billid, --ra.billid, - pt.tenantid as ulbn, + pt.tenantid as ulb, pt.propertyid as propertytaxuniqueid, rp.transactiondate as dateoftransaction, rp.receiptnumber as receiptnumber, From e1f0bf02e8716c52ddee98c97dc59e25903e4a05 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 13 Aug 2021 15:35:04 +0530 Subject: [PATCH 0641/1630] excluded ikon paid records for defaulter e.g. 2020-21 specialy for amritsar --- 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 343b403b8..751959092 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6110,7 +6110,7 @@ ReportDefinitions: from report_properties props inner join assessments on assessments.propertyid=props.propertyid inner join owners on owners.propertyid=props.propertyid - where 1=1 + 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 From 075e7d7d0308d5c6d1f985c00d28382ab6cf9999 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 16 Aug 2021 13:07:19 +0530 Subject: [PATCH 0642/1630] corrected OFFLINE_NEFT search when underscore ( _ ) was being receplace by comma ( , ) --- 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 751959092..62be2aff4 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2455,7 +2455,7 @@ ReportDefinitions: 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 + searchClause: AND payment.paymentmode = replace($paymentMode,',','_') query: | -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( From 2578beb035e85e7e7fe7b62898c4fd863d19b36a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 16 Aug 2021 14:30:36 +0530 Subject: [PATCH 0643/1630] updated paymentmode search parameter to support OFFLINE_NEFT --- configs/reports/configs/pt-reports.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 62be2aff4..ffc8bcb7a 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -158,7 +158,7 @@ ReportDefinitions: pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' source: pt isMandatory: false - searchClause: AND instrumenttype = $paymentMode + searchClause: AND instrumenttype = $paymentMo - name: financialyear label: Financial Year type: singlevaluelist @@ -2228,7 +2228,7 @@ ReportDefinitions: 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 + searchClause: AND payment.paymentmode = replace($paymentMode,',','_') - name: localityArray label: reports.pt.zoneList type: boundarylist @@ -2672,7 +2672,7 @@ ReportDefinitions: 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 + searchClause: AND payment.paymentmode = replace($paymentMode,',','_') query: | -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( @@ -2939,7 +2939,7 @@ ReportDefinitions: 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 + searchClause: AND payment.paymentmode = replace($paymentMode,',','_') query: | -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( @@ -3254,7 +3254,7 @@ ReportDefinitions: 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 + searchClause: AND payment.paymentmode = replace($paymentMode,',','_') - name: financialyear label: Financial Year type: singlevaluelist @@ -3393,7 +3393,7 @@ ReportDefinitions: 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 + searchClause: AND payment.paymentmode = replace($paymentMode,',','_') - name: financialyear label: Financial Year type: singlevaluelist @@ -3589,7 +3589,7 @@ ReportDefinitions: 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 + searchClause: AND payment.paymentmode = replace($paymentMode,',','_') - name: localityArray label: reports.pt.zoneList type: boundarylist @@ -3804,7 +3804,7 @@ ReportDefinitions: 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 + searchClause: AND instrumenttype = replace($paymentMode,',','_') - name: financialyear label: Financial Year type: singlevaluelist @@ -6235,7 +6235,7 @@ ReportDefinitions: 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 = $paymentMode + searchClause: AND rp.paymentmode = replace($paymentMode,',','_') query: | with assessments as ( @@ -6428,7 +6428,7 @@ ReportDefinitions: 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 = $paymentMode + searchClause: AND rp.paymentmode = replace($paymentMode,',','_') - name: localityArray label: reports.pt.zoneList type: boundarylist From 786fcbfa42d8c4790581c5a61e001c6f581d44c3 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Wed, 18 Aug 2021 12:01:48 +0530 Subject: [PATCH 0644/1630] Adding new report PT_NO_PAYMENT_DEFAULTERS --- .../reports/configs/rainmaker-pt-reports.yml | 108 +++++++++++++++++- 1 file changed, 107 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/rainmaker-pt-reports.yml b/configs/reports/configs/rainmaker-pt-reports.yml index 227966166..6203a4e52 100644 --- a/configs/reports/configs/rainmaker-pt-reports.yml +++ b/configs/reports/configs/rainmaker-pt-reports.yml @@ -984,4 +984,110 @@ 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 inner join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber - where rh.tenantid = $tenantid \ No newline at end of file + 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 + From d8eae10f0c4632def5a1c8ded1feecc80847e9a8 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Wed, 18 Aug 2021 16:00:48 +0530 Subject: [PATCH 0645/1630] ADDING PT_NO_PAYMENT_DEFAULTERS_REPORT in pt reports --- configs/reports/configs/pt-reports.yml | 105 +++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index ffc8bcb7a..0e0089a0c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6827,4 +6827,109 @@ ReportDefinitions: 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: 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 From 2e5f9174438541c089f85e8430485f491f93c81e Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 19 Aug 2021 11:09:39 +0530 Subject: [PATCH 0646/1630] updated report PT_NO_PAYMENT_DEFAULTERS_REPORT --- configs/reports/configs/pt-reports.yml | 37 ++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 0e0089a0c..88760875b 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6908,11 +6908,42 @@ ReportDefinitions: 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 + 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: true + searchClause: AND plotsize <= ($toPlotsize)::int query: | select tenantid, @@ -6923,6 +6954,7 @@ ReportDefinitions: concat(address,' ',localityname) as address, blockname, zonename, + plotsize, propertyusagetype, propertytype, superbuilduparea, @@ -6931,5 +6963,6 @@ ReportDefinitions: source, channel, propertystatus - from report_properties_withoutdemand where tenantid=$tenantid + from report_properties_withoutdemand + where tenantid=$tenantid From de56e67d4cb172291e0eddf106f046609f6450f4 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 19 Aug 2021 16:55:54 +0530 Subject: [PATCH 0647/1630] 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 88760875b..2c3368c91 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6942,7 +6942,7 @@ ReportDefinitions: label: reports.pt.toPlotsize type: string source: pt - isMandatory: true + isMandatory: false searchClause: AND plotsize <= ($toPlotsize)::int query: | select From b55a96dcd59803f1bde5fb29f7a14ba788943b10 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 26 Aug 2021 10:30:49 +0530 Subject: [PATCH 0648/1630] PT_RECEIPT_REGISTER updated for unsynched reports --- 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 2c3368c91..1545245d2 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6278,7 +6278,7 @@ ReportDefinitions: 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 like concat('%',rp.billid,'%') + 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 From dba3e4f82cbd7b97133aea1a4523fd99aa4fd6e0 Mon Sep 17 00:00:00 2001 From: poonam1512 Date: Thu, 26 Aug 2021 14:47:04 +0530 Subject: [PATCH 0649/1630] adding ownership percentage to PT receipt --- configs/pdf-service/data-config/property-receipt.json | 4 ++++ configs/pdf-service/format-config/property-receipt.json | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 2bfcce299..8033082e3 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -774,6 +774,10 @@ { "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 f30dc44b4..11b888592 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 %\",\"border\":[false,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{ownerShipPercentage}}\",\"border\":[false,true,true,true]}]{{/var_owners}}"] }, "layout": {} }, { From f6c31b6a9b8478ee145eb84444f901b358fd5386 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 8 Sep 2021 16:33:23 +0530 Subject: [PATCH 0650/1630] added guardian name on wnS bill --- configs/pdf-service/data-config/ws-bill.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json index 520b4ef12..98ecad054 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" } + ] } ] From 02ce7f38d71ae968506644a58a7f921931cbc01b Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 8 Sep 2021 16:34:10 +0530 Subject: [PATCH 0651/1630] guardian name for WnS bill --- configs/pdf-service/format-config/ws-bill.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index 0e579c1ec..304e42df1 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}} {{ulbGrade}}", + "text": "{{logo_header}} {{mcGrade}}", "style": "receipt-logo-header" }, { @@ -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 db6f599fd03e09dac4194aad3d446b0cd5758193 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 14 Sep 2021 16:02:51 +0530 Subject: [PATCH 0652/1630] count Nos of assessments fix for non zero payments in Zone Wise Report --- configs/reports/configs/pt-reports.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 1545245d2..53f96d614 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6628,9 +6628,10 @@ ReportDefinitions: assessmentyears, zonename, sum(totalamount) as amount, - count(*) as totalcount + 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 paymentstatus!='CANCELLED' and pt.tenantid=$tenantid and asmt.createdtime>=$fromDate and asmt.createdtime<=$toDate @@ -6794,9 +6795,10 @@ ReportDefinitions: assessmentyears, blockname, sum(totalamount) as amount, - count(*) as totalcount + 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 paymentstatus!='CANCELLED' and pt.tenantid=$tenantid and asmt.createdtime>=$fromDate and asmt.createdtime<=$toDate From 9c7d2399f6af3c15300017b0efb717cd06520a1d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 15 Sep 2021 09:55:42 +0530 Subject: [PATCH 0653/1630] 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 53f96d614..db19896a7 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6632,7 +6632,7 @@ ReportDefinitions: 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 paymentstatus!='CANCELLED' and pt.tenantid=$tenantid + where payment.paymentstatus!='CANCELLED' and pt.tenantid=$tenantid and asmt.createdtime>=$fromDate and asmt.createdtime<=$toDate group by assessmentyears,zonename @@ -6799,7 +6799,7 @@ ReportDefinitions: 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 paymentstatus!='CANCELLED' and pt.tenantid=$tenantid + where payment.paymentstatus!='CANCELLED' and pt.tenantid=$tenantid and asmt.createdtime>=$fromDate and asmt.createdtime<=$toDate group by assessmentyears,blockname From 73897fc7ca337e0e3f83f7658117b772f1ef150c Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 24 Sep 2021 12:16:56 +0530 Subject: [PATCH 0654/1630] added two row in Overview --- .../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 a3e11fc1d..917ce6d29 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -147,10 +147,64 @@ }, { "row": 3, + "name": "DSS_REVENUE", + "vizArray": [ + { + "id": 131, + "name": "PT ,TL ,WS TOTAL COLLECTION ", + "dimensions": { + "height": 350, + "width": 12 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "collectionByModule", + "name": "COLLECTION_BY_MODULE", + "code": "", + "chartType": "table", + "filter": "", + "headers": [] + } + ] + } + ] + }, + { + "row": 4, + "name": "DSS_REVENUE", + "vizArray": [ + { + "id": 141, + "name": "W&S ERP TOTAL COLLECTION", + "dimensions": { + "height": 350, + "width": 12 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "wsTaxHeadDDR", + "name": "DSS_W&S_TAX_HEAD_BOUNDARY", + "code": "", + "chartType": "table", + "filter": "", + "headers": [] + } + ] + } + ] + }, + { + "row": 5, "name": "DSS_SERVICE", "vizArray": [ { - "id": 131, + "id": 151, "name": "DSS_OVERVIEW", "dimensions": { "height": 450, @@ -195,7 +249,7 @@ ] }, { - "id": 132, + "id": 152, "name": "DSS_TOTAL_APPLICATION_&_CLOSED_APPLICATION", "dimensions": { "height": 450, @@ -217,11 +271,11 @@ ] }, { - "row": 4, + "row": 6, "name": "DSS_SERVICE", "vizArray": [ { - "id": 141, + "id": 161, "name": "DSS_TOP_PERFORMING_ULBS", "dimensions": { "height": 250, @@ -242,7 +296,7 @@ ] }, { - "id": 142, + "id": 162, "name": "DSS_BOTTOM_PERFORMING_ULBS", "dimensions": { "height": 250, @@ -262,7 +316,7 @@ ] }, { - "id": 143, + "id": 163, "name": "DSS_TOTAL_APPLICATIONS:_DEPARTMENT_WISE", "dimensions": { "height": 250, From 2fe487fce961fe544c87730bb5cd379649099d0a Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 24 Sep 2021 12:25:56 +0530 Subject: [PATCH 0655/1630] added new chartname COLLECTION_BY_MODULE --- .../dashboard-analytics/ChartApiConfig.json | 46 ++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index f11e4ffc2..1aebfaa19 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -781,7 +781,51 @@ }, "_comment": "" }, - "demandCollectionIndexBoundaryRevenue": { + "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\"}}}}}}}}}}" + } + ], + "isMdmsEnabled": false, + "filterKeys": [ + { + "key": "tenantId", + "column": "ULBs" + } + ], + "chartType": "table", + "valueType": "number", + "drillChart": "none", + "action": "", + "plotLabel": "ULBs", + "isPostResponseHandler": true, + "postAggregationTheory": "repsonseToDifferenceOfDates", + "aggregationPaths": [ + "PT", + "TL", + "WS" + ], + "pathDataTypeMapping": [ + { + "PT": "amount" + }, + { + "TL": "amount" + }, + { + "WS": "amount" + } + ], + "insight": {}, + "_comment": "" + }, + "demandCollectionIndexBoundaryRevenue": { "chartName": "DSS_PT_DEMAND_COLLECTION_BOUNDARY", "queries": [ { From f739070e0464f11203bd9b0caae5a3113d1d46a3 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 29 Sep 2021 21:38:15 +0530 Subject: [PATCH 0656/1630] [PI-1767]-Added whatsapp adoption data indexer config file --- configs/egov-indexer/whatsapp-adoption-data.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 configs/egov-indexer/whatsapp-adoption-data.yaml diff --git a/configs/egov-indexer/whatsapp-adoption-data.yaml b/configs/egov-indexer/whatsapp-adoption-data.yaml new file mode 100644 index 000000000..4f7b13c0c --- /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: $.* From fbcc6c2c4217bb5d0c9cb18eeadf3b18e3788d42 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Fri, 1 Oct 2021 10:14:16 +0530 Subject: [PATCH 0657/1630] added sw-bill.json in data-config --- configs/pdf-service/data-config/sw-bill.json | 834 +++++++++++++++++++ 1 file changed, 834 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 000000000..cfe8ebfe4 --- /dev/null +++ b/configs/pdf-service/data-config/sw-bill.json @@ -0,0 +1,834 @@ +{ + "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.ulbType" + }, + { + "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" + } + + ] + } + ] + } + ] + } + ] + } +} \ No newline at end of file From bbe61d02f0cbd42263cbb4d5d39fdfae14ee8b84 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Fri, 1 Oct 2021 10:17:30 +0530 Subject: [PATCH 0658/1630] adding sw-bill.json in format config --- .../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 000000000..e2253fd83 --- /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}} {{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}}" + }, + { + "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": "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 {{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" + } + ], + "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" + } + } + } +} \ No newline at end of file From 553132e3d27b5e72fbff0a5d502144e63f8517e0 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 1 Oct 2021 10:45:55 +0530 Subject: [PATCH 0659/1630] Update id=222 --- .../dashboard-analytics/MasterDashboardConfig.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 917ce6d29..88ea10d22 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", @@ -447,20 +447,20 @@ }, { "id": 222, - "name": "DSS_PT_BOTTOM_3_PERFORMING_ULBS", + "name": "DSS_PT_COLLECTION_BY_PAYMENT_MODE", "dimensions": { "height": 250, "width": 4 }, - "vizType": "performing-metric", - "noUnit": false, + "vizType": "chart", + "noUnit": true, "isCollapsible": false, "charts": [ { - "id": "bottomPerformingUlbs", - "name": "DSS_PT_BOTTOM_3_PERFORMING_ULBS", + "id": "ptcollectionByPaymentMode", + "name": "DSS_PT_COLLECTION_BY_PAYMENT_MODE", "code": "", - "chartType": "bar", + "chartType": "donut", "filter": "", "headers": [] } From 18080edffb4e9d1f5212a6c75f8b3fd1170ffaeb Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 1 Oct 2021 10:53:26 +0530 Subject: [PATCH 0660/1630] added wsTaxHeadDDROverview --- .../dashboard-analytics/ChartApiConfig.json | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 1aebfaa19..09a9736fa 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": [ + "Payment Mode" + ], + "insight": { + }, + "_comment": " collection/amount per payment mode" + }, "_comment": "PT NON-COLLECTION CHARTS", "propertiesByUsageType": { @@ -3419,6 +3442,51 @@ "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" + ], + "pathDataTypeMapping": [ + { + "Total Collection": "amount" + }, + { + "Total Receipt": "number" + } + ], + "insight": { + }, + "_comment": "" }, "wsTaxHeadUlb": { "chartName": "DSS_W&S_TAX_HEAD_BOUNDARY", From 27ea32a6008190bf53c5b4b61e2b03ab3f7a0ca9 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Fri, 1 Oct 2021 14:36:37 +0530 Subject: [PATCH 0661/1630] updating guardian name in sw-bill data config --- configs/pdf-service/data-config/sw-bill.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/sw-bill.json b/configs/pdf-service/data-config/sw-bill.json index cfe8ebfe4..4a274c08f 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" } ] @@ -831,4 +839,4 @@ } ] } -} \ No newline at end of file +} From e98fb35f18c0c11172a1cb9fd75a37e09be1ff82 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 1 Oct 2021 15:04:40 +0530 Subject: [PATCH 0662/1630] 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 09a9736fa..c2915c095 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 2967bd20a394b129b93e23c3c21c848458858ac7 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 1 Oct 2021 16:12:13 +0530 Subject: [PATCH 0663/1630] 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 c2915c095..09a9736fa 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 f5a4907bbf2fd6f784a8af06b0587ccf25933025 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Fri, 1 Oct 2021 16:29:19 +0530 Subject: [PATCH 0664/1630] changes for guardian name in sw.bill format config PROD --- configs/pdf-service/format-config/sw-bill.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/pdf-service/format-config/sw-bill.json b/configs/pdf-service/format-config/sw-bill.json index e2253fd83..007fda510 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, @@ -1227,4 +1227,4 @@ } } } -} \ No newline at end of file +} From 7f73e56452683b837c0a80cd80dbfb61bc7e1c0b Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 5 Oct 2021 12:01:12 +0530 Subject: [PATCH 0665/1630] update wsTaxHeadDDROverview --- .../dashboard-analytics/ChartApiConfig.json | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 09a9736fa..6a28eb025 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": "W&S", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", + "dateRefField": "", + "indexName": "dss-target_v1", + "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" } ], "translateTenantCode": true, @@ -3468,13 +3475,14 @@ ], "chartType": "table", "valueType": "number", - "drillChart": "wsTaxHeadUlb", + "drillChart": "none", "action": "", "plotLabel": "DDRs", "postAggregationTheory" : "", "aggregationPaths": [ "Total Collection", - "Total Receipt" + "Total Receipt", + "Target Collection" ], "pathDataTypeMapping": [ { @@ -3482,7 +3490,10 @@ }, { "Total Receipt": "number" - } + }, + { + "Target Collection": "number" + } ], "insight": { }, From 09e98906c172b21606e4422afafcdaa2a2023156 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Thu, 7 Oct 2021 12:20:44 +0530 Subject: [PATCH 0666/1630] echallan persister changes --- 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 000000000..dfe351cec --- /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 From 5d9d2aa65ca32fe3d52a21933654d63c7de0bc1d Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Thu, 7 Oct 2021 14:03:44 +0530 Subject: [PATCH 0667/1630] Create mcollect-challan.json --- .../data-config/mcollect-challan.json | 707 ++++++++++++++++++ 1 file changed, 707 insertions(+) create mode 100644 configs/pdf-service/data-config/mcollect-challan.json 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 000000000..7a3cf788d --- /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-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": "$.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-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" + } + } + ] + } + ] + }, + { + "qrcodeConfig": [ + { + "variable": "qrcodeimage", + "value": "Payer Name : {{consumnerName}},Challan number: {{challanNo}}, Challan Date: {{billDate}}, Total Amount: {{totalAmount}}, Billing Period: {{fromPeriod}} to {{toPeriod}}" + } + ] + } + ] + } + ] + } +} From 80e370b7219fe9ada215e4a0790dcaa37753b56c Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Thu, 7 Oct 2021 14:04:32 +0530 Subject: [PATCH 0668/1630] Create mcollect-bill.json --- .../data-config/mcollect-bill.json | 674 ++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 configs/pdf-service/data-config/mcollect-bill.json 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 000000000..c27d60ac2 --- /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}}" + } + ] + } + ] + } + ] + } +} From a95c396c6b91e984ea1d32a34f090fbe695f2388 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Thu, 7 Oct 2021 14:09:57 +0530 Subject: [PATCH 0669/1630] Create mcollect-bill.json --- .../format-config/mcollect-bill.json | 775 ++++++++++++++++++ 1 file changed, 775 insertions(+) create mode 100644 configs/pdf-service/format-config/mcollect-bill.json 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 000000000..dccd278d3 --- /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" + } + } + } +} From 484c1bf117e92a194ec4f666d520af31a86e61cb Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Thu, 7 Oct 2021 14:10:57 +0530 Subject: [PATCH 0670/1630] Create mcollect-challan.json --- .../format-config/mcollect-challan.json | 830 ++++++++++++++++++ 1 file changed, 830 insertions(+) create mode 100644 configs/pdf-service/format-config/mcollect-challan.json 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 000000000..740c632fe --- /dev/null +++ b/configs/pdf-service/format-config/mcollect-challan.json @@ -0,0 +1,830 @@ +{ + "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}} {{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" + } + } + } +} From bfec15c74515f56744e097c2dd5bf4137338dd53 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 7 Oct 2021 14:56:15 +0530 Subject: [PATCH 0671/1630] Update consolidatedreceipt.json --- .../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 e82d4e406..2e42a5c58 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 339cccc26c0de1acb5a3cbe66ca54a9b9184aacc Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 7 Oct 2021 15:26:17 +0530 Subject: [PATCH 0672/1630] Update consolidatedreceipt.json --- .../data-config/consolidatedreceipt.json | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index 2e42a5c58..1eacbd512 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -186,6 +186,12 @@ "value": { "path": "$.paymentDetails[0].bill.consumerCode" } + }, + { + "variable": "comments", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.comment" + } }, { "variable": "transactionID", @@ -563,19 +569,7 @@ } } ] - }, - { - "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 b0f7416f891ed1afe331ea363f20a0f1e4b030c1 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Thu, 7 Oct 2021 17:03:39 +0530 Subject: [PATCH 0673/1630] Added echallan searcher configs --- configs/egov-searcher/bill-genie.yml | 80 ++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/configs/egov-searcher/bill-genie.yml b/configs/egov-searcher/bill-genie.yml index 84b4ec34c..155a029a7 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 From b2ebe2ec77e74216c58061653a270853405811a0 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 8 Oct 2021 11:04:46 +0530 Subject: [PATCH 0674/1630] Update consolidatedreceipt.json --- .../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 1eacbd512..bb210200a 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -186,12 +186,6 @@ "value": { "path": "$.paymentDetails[0].bill.consumerCode" } - }, - { - "variable": "comments", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.comment" - } }, { "variable": "transactionID", @@ -569,7 +563,19 @@ } } ] + }, + { + "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" + } + ] } + ] } ] From 12a13d0f7be92000e5ec299504ebe9edc281742e Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Fri, 8 Oct 2021 15:42:49 +0530 Subject: [PATCH 0675/1630] Changes from UAT to PROD in mCollect Challan --- .../data-config/mcollect-challan.json | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/configs/pdf-service/data-config/mcollect-challan.json b/configs/pdf-service/data-config/mcollect-challan.json index 7a3cf788d..fa102fe89 100644 --- a/configs/pdf-service/data-config/mcollect-challan.json +++ b/configs/pdf-service/data-config/mcollect-challan.json @@ -333,22 +333,23 @@ { "variable": "challanRemarks", "value": { - "path": "$.additionalDetail.cancellComment" - }, - "type": "statusMessage" + "path": "$.description" + + } }, { "variable": "mohalla", "value": { "path": "$.address.locality.code" }, + "type": "label", "localisation": { "required": true, "prefix": "TENANTS_MOHALLA", "module": "rainmaker-common", "prefixCbName": true - }, - "type": "boundary" + + } }, { "variable": "mcollect_comment", @@ -687,6 +688,21 @@ "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" } ] } From 4fb54b4c3b474f7dbbb74ace8b1ad463b2cbac15 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Fri, 8 Oct 2021 15:46:04 +0530 Subject: [PATCH 0676/1630] Changes from UAT to PROD in mCollect challan Format config --- configs/pdf-service/format-config/mcollect-challan.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/mcollect-challan.json b/configs/pdf-service/format-config/mcollect-challan.json index 740c632fe..597bcb79c 100644 --- a/configs/pdf-service/format-config/mcollect-challan.json +++ b/configs/pdf-service/format-config/mcollect-challan.json @@ -43,6 +43,7 @@ 0 ] } + ] ] }, @@ -60,7 +61,7 @@ { "stack": [ { - "text": "{{cb-name}} {{cantonment-board}}", + "text": "{{cb-name}} {{mcGrade}}", "alignment": "center", "style": "receipt-logo-title-name" }, @@ -389,7 +390,7 @@ "style": "receipt-table-value" }, { - "text": "{{doorHouseNo}}, {{buildingName}}, {{streetName}}, {{mohalla}}, {{pinCode}}", + "text": "{{doorHouseNo}}, {{buildingName}}, {{streetName}},{{pinCode}}", "border": [ false, false, From 164b0500ed8869150c25437a9afdd45bc8b6a5c6 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Fri, 8 Oct 2021 15:51:10 +0530 Subject: [PATCH 0677/1630] Changes from UAT to PROD in Consolidatedreceipt.json format config --- 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 bfb6e4d39..9efb17f46 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 2417a6ef02dbbe185be2a55fc677fcca8c20edb5 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Fri, 8 Oct 2021 15:58:13 +0530 Subject: [PATCH 0678/1630] Changes from UAT to PROD in consolidatedreceipt data config --- .../data-config/consolidatedreceipt.json | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index bb210200a..fc92ebcc9 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -568,11 +568,28 @@ "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":[ + "responseMapping":[ { "variable":"comments", - "value":"$.challans[0].description" - } + "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" + } ] } From 421c11a9ea405b87cdf7b65a56fb5383f227f094 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 8 Oct 2021 16:19:26 +0530 Subject: [PATCH 0679/1630] Update consolidatedreceipt.json --- 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 9efb17f46..fdbc19161 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 f743b30349d31172c1a29397062bb04760c2dd03 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 11 Oct 2021 16:54:51 +0530 Subject: [PATCH 0680/1630] Update consolidatedreceipt.json --- .../pdf-service/data-config/consolidatedreceipt.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index fc92ebcc9..d0b8aba8a 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -182,15 +182,15 @@ "type": "date" }, { - "variable": "consumerID", + "variable": "transactionID", "value": { - "path": "$.paymentDetails[0].bill.consumerCode" + "path": "$.transactionNumber" } }, { - "variable": "transactionID", + "variable": "consumerID", "value": { - "path": "$.transactionNumber" + "path": "$.paymentDetails[0].bill.consumerCode" } }, { @@ -573,6 +573,10 @@ "variable":"comments", "value":"$.challans[0].description" }, + { + "variable":"consumerName", + "value":"$.challans[0].citizen.name" + }, { "variable": "doorHouseNo", "value": "$.challans[0].address.doorNo" From a0c87a3612954ee3cb82c23b9aaa0fe16a77e2a1 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 11 Oct 2021 16:55:21 +0530 Subject: [PATCH 0681/1630] 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 fdbc19161..3064d3356 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, @@ -793,7 +793,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerName}}", + "text": "{{consumerName}}", "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 3b8564959de3ddccac7e7368911b76238a05fff1 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 12 Oct 2021 13:15:53 +0530 Subject: [PATCH 0682/1630] update chartapi updated table on overview(added target) --- .../dashboard-analytics/ChartApiConfig.json | 53 +++++++++++++------ 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 6a28eb025..ffca8abf5 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", @@ -813,7 +813,14 @@ "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": [ @@ -823,7 +830,7 @@ } ], "chartType": "table", - "valueType": "number", + "valueType": "", "drillChart": "none", "action": "", "plotLabel": "ULBs", @@ -831,18 +838,30 @@ "postAggregationTheory": "repsonseToDifferenceOfDates", "aggregationPaths": [ "PT", + "Target Collection PT", "TL", - "WS" - ], + "Target Collection TL", + "WS", + "Target Collection WS" + ], "pathDataTypeMapping": [ - { - "PT": "amount" - }, - { - "TL": "amount" - }, - { - "WS": "amount" + { + "PT": "amount" + }, + { + "Target Collection PT": "amount" + }, + { + "TL": "amount" + }, + { + "Target Collection TL": "amount" + }, + { + "WS": "amount" + }, + { + "Target Collection WS": "amount" } ], "insight": {}, @@ -2982,7 +3001,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 9816b2e62cdca111ed297f85e6b3ba15cce4f2c2 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 12 Oct 2021 14:28:17 +0530 Subject: [PATCH 0683/1630] updated wsTaxHeadDDROverview --- .../dashboard-analytics/ChartApiConfig.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index ffca8abf5..12d8eaf1d 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3500,8 +3500,7 @@ "postAggregationTheory" : "", "aggregationPaths": [ "Total Collection", - "Total Receipt", - "Target Collection" + "Total Receipt" ], "pathDataTypeMapping": [ { @@ -3509,9 +3508,6 @@ }, { "Total Receipt": "number" - }, - { - "Target Collection": "number" } ], "insight": { From 21597d45bf4157ad33d9dd4b73f1d0449026d247 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 14 Oct 2021 13:56:43 +0530 Subject: [PATCH 0684/1630] UC report for echallan in PROD --- configs/reports/configs/uc-reports.yml | 62 ++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 3ed29827f..acf26786e 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1747,3 +1747,65 @@ 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: eChallan Report + 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: 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 + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND ch.createdtime >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND ch.createdtime <= $toDate + query: | + -- 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 + inner JOIN egcl_bill AS b + ON ch.challanno=b.consumercode where ch.tenantid=$tenantid + orderby: ORDER BY ch.createdtime DESC From 98ed231373c3defbe66ecd1934a4cca6c13bfac6 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 14 Oct 2021 14:43:31 +0530 Subject: [PATCH 0685/1630] correcting syntax error of order by in UC challan 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 acf26786e..7e0a17c8b 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1808,4 +1808,4 @@ 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 + orderby: ORDER BY ch.createdtime DESC From bdb7ddd0be0874a788cd200446d75dc0177bce23 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 14 Oct 2021 16:21:08 +0530 Subject: [PATCH 0686/1630] adding total amount column in echallan report of UC --- configs/reports/configs/uc-reports.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 7e0a17c8b..ee631473f 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1758,8 +1758,8 @@ ReportDefinitions: print: pdfPageSize: "A3" sourceColumns: - - name: ulb - label: reports.uc.ulb + - name: totalamount + label: reports.uc.totalamount type: string source: uc total: false @@ -1804,7 +1804,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 0d530e7f02dc5694cbd418dc79225b720d529351 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Fri, 22 Oct 2021 16:33:13 +0530 Subject: [PATCH 0687/1630] adding receipt number and receipt date to echallan report --- configs/reports/configs/uc-reports.yml | 34 +++++++++++++++++++------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index ee631473f..041d6a5ea 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1762,7 +1762,7 @@ ReportDefinitions: label: reports.uc.totalamount type: string source: uc - total: false + total: true - name: challanno label: reports.uc.challanno type: string @@ -1788,24 +1788,40 @@ 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 - orderby: ORDER BY ch.createdtime DESC + 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 From 9326f3a50660797d9b983c8153e9012a61caa56b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 25 Oct 2021 16:39:27 +0530 Subject: [PATCH 0688/1630] cancelled receipt register update --- configs/reports/configs/pt-reports.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index db19896a7..8e6af5a66 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2539,7 +2539,7 @@ ReportDefinitions: label: reports.pt.g8receiptno type: string source: pt - total: false + total: false - name: amount label: reports.pt.amount type: string @@ -2605,11 +2605,6 @@ 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 @@ -2702,7 +2697,7 @@ ReportDefinitions: SELECT pd.tenantid AS tenantid, pd.id, - pt.propertyid as consumercode, + 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, @@ -2713,15 +2708,16 @@ ReportDefinitions: 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, + --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 + 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.propertyid = bill.consumercode + and receipt_breakup.pdid=pd.id --and pt_addr.propertyid=pt.id orderby: ORDER BY pd.receiptdate DESC; From 99db43b9bc85613e3fb0115b84d68b9e8bd02c57 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 25 Oct 2021 16:54:46 +0530 Subject: [PATCH 0689/1630] adding firenocreceipt.json in data config --- .../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 000000000..f5c4258b3 --- /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" + } + } + ] +} + ] + } + ] + } + ] + } +} From 4d02caa99d9eb12444a5f9b48260a2a9cfa7d63c Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 25 Oct 2021 16:56:17 +0530 Subject: [PATCH 0690/1630] adding firenocreceipt.json in format config --- .../format-config/firenocreceipt.json | 1369 +++++++++++++++++ 1 file changed, 1369 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 000000000..2b408bf76 --- /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 + ] + } + } + } +} From 4161e2ee51353448b801ae3c2a7439b7d8cff8c7 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:15:03 +0530 Subject: [PATCH 0691/1630] 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 12d8eaf1d..fb323a239 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 877585087750c049ec4bf9b30d4f812f9188f23b Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Fri, 29 Oct 2021 10:48:19 +0530 Subject: [PATCH 0692/1630] 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 fb323a239..48608be5f 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 eedd8cef78a58b86fb9508e4706e60d0bdfb198b Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Fri, 29 Oct 2021 17:03:12 +0530 Subject: [PATCH 0693/1630] PI-1806: 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 48608be5f..bd9739eff 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 bca5f8be614a7ab164e0ae030675881cbe2ed273 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Fri, 29 Oct 2021 17:04:44 +0530 Subject: [PATCH 0694/1630] [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 88ea10d22..91e8ed5b2 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 a10ae20d13b9b45672032bff73d68cb237b94105 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 1 Nov 2021 13:36:14 +0530 Subject: [PATCH 0695/1630] ADDING NEW MISC. RECIECPT REGISTER --- configs/reports/configs/uc-reports.yml | 194 +++++++++++++++++++++++++ 1 file changed, 194 insertions(+) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 041d6a5ea..80e1d2026 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1825,3 +1825,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 adaf50fd7063d55f9abe64a2fb7f5faad89e9bca Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Mon, 8 Nov 2021 15:08:37 +0530 Subject: [PATCH 0696/1630] PI-1806 Added PT--> SERVICE Total Properties Available --- .../dashboard-analytics/ChartApiConfig.json | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index bd9739eff..545b87ae9 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -624,6 +624,27 @@ "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", From abc99bd0fdcbd52865c4996d571e2b33b8617efa Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Mon, 8 Nov 2021 15:10:12 +0530 Subject: [PATCH 0697/1630] PI-1806 Added PT--> SERVICE Total Properties Available --- .../dashboard-analytics/MasterDashboardConfig.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 91e8ed5b2..ddbe519b6 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -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 e7a7cfa155a319ac5ef18c031849d1429bb0fb82 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Mon, 8 Nov 2021 17:37:25 +0530 Subject: [PATCH 0698/1630] PI-1806-Changed index name for projected demands amount on prod --- .../dashboard-analytics/ChartApiConfig.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 545b87ae9..cf241c72b 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3230,8 +3230,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, @@ -3292,8 +3292,8 @@ "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\"}}}}}}" + "indexName": "demandbillconsumers", + "aggrQuery": "{\"aggs\":{\"ULB\":{\"terms\":{\"field\":\"cityname.keyword\",\"size\":200},\"aggs\":{\"Project Demand\":{\"sum\":{\"field\":\"billamount\"}}}}}}" } ], "isMdmsEnabled": false, @@ -3354,8 +3354,8 @@ "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\"}}}}}}" + "indexName": "demandbillconsumers", + "aggrQuery": "{\"aggs\":{\"Ward\":{\"terms\":{\"field\":\"block.keyword\",\"size\":200},\"aggs\":{\"Project Demand\":{\"sum\":{\"field\":\"billamount\"}}}}}}" } ], "isMdmsEnabled": false, From 157d411bd4dd50a18b6aa6f22ad42687d4443cd7 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 9 Nov 2021 14:22:49 +0530 Subject: [PATCH 0699/1630] adding payer name to new Misc. receipt register --- 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 80e1d2026..8971fd70e 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1965,7 +1965,7 @@ ReportDefinitions: source: uc wrapper: true isMandatory: false - searchClause: AND businessservice = $businessservice + searchClause: AND bill.businessservice = $businessservice - name: collectorname label: reports.uc.collectorname type: singlevaluelist @@ -1996,6 +1996,7 @@ ReportDefinitions: 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, From e96fc2c83474276ab634c48864ac2ceb134637e7 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:23:13 +0530 Subject: [PATCH 0700/1630] PI1806: Updated DSL query for tlStatusByDDR on PROD --- .../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 cf241c72b..a511655f9 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1754,9 +1754,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 02e9e6db2052684c37dc10e08ac6f4fbba6ebf06 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 9 Nov 2021 14:48:13 +0530 Subject: [PATCH 0701/1630] Adding New Employee wise Report in HRMS --- configs/reports/configs/hrms-reports.yml | 85 ++++++++++++++++++++++++ 1 file changed, 85 insertions(+) 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 000000000..c27579332 --- /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 + inner 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 From d3a6c33a7043240147c52b60080c7e44ff241124 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 9 Nov 2021 14:50:27 +0530 Subject: [PATCH 0702/1630] Adding config for new HRMS reports file --- configs/reports/report.config | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/report.config b/configs/reports/report.config index e605e133d..d61eda0e0 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 3c86bf84c2d24f581b3d59995612c5bc8775efaa Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 9 Nov 2021 14:52:37 +0530 Subject: [PATCH 0703/1630] updating Employee wise HRMS report --- 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 c27579332..c41187ca1 100644 --- a/configs/reports/configs/hrms-reports.yml +++ b/configs/reports/configs/hrms-reports.yml @@ -77,7 +77,7 @@ ReportDefinitions: 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 + 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' From 6d15dca752ec2d47736037dabb7bccb0c7a8d0d1 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Wed, 10 Nov 2021 11:01:10 +0530 Subject: [PATCH 0704/1630] Adding payername to new receipt register of UC --- configs/reports/configs/uc-reports.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 8971fd70e..9703b0bcc 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1860,6 +1860,11 @@ ReportDefinitions: 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 From a84226b1a7465fb8e217349bba56d141e7963e8d Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 11 Nov 2021 16:37:22 +0530 Subject: [PATCH 0705/1630] Adding Business Service in search filter of Misc. State Collection Report --- 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 9703b0bcc..651daec1e 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 26ebae8e0ba0650a5d3262064980aef320592687 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Fri, 12 Nov 2021 12:20:05 +0530 Subject: [PATCH 0706/1630] Changed Font color of Remarks and Status of Challan from Red to Black --- 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 597bcb79c..0326c09a6 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 6786056b68ec337778d01d4fb96a66f6c9ac2a7d Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 18 Nov 2021 14:32:50 +0530 Subject: [PATCH 0707/1630] Adding new PT report for 7 to 10 Sept 2020(Roll back) --- configs/reports/configs/pt-reports.yml | 155 +++++++++++++++++++++++++ 1 file changed, 155 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 8e6af5a66..2dc52cafd 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6963,4 +6963,159 @@ ReportDefinitions: 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.ddChequeTransactionNo + type: string + source: pt + total: false + - name: pdid + 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 + + 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; + From f9fb9b69abc5e126a261fbad33aa34082a461afa Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 18 Nov 2021 14:55:29 +0530 Subject: [PATCH 0708/1630] removing pdid from PT rollback report --- configs/reports/configs/pt-reports.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 2dc52cafd..b1999b1f6 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7084,17 +7084,12 @@ ReportDefinitions: source: pt total: false - name: surveyid - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: pdid - label: reports.pt.ddChequeTransactionNo + label: reports.pt.surveyid type: string source: pt total: false - name: transactiondate - label: reports.pt.ddChequeTransactionDate + label: reports.pt.transactiondate type: string source: pt total: false From 45b402914329f34ee5a6265c52be2876343059e9 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 18 Nov 2021 15:20:43 +0530 Subject: [PATCH 0709/1630] adding new report for UC 7to10sept2020 receipts --- configs/reports/configs/uc-reports.yml | 113 +++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 651daec1e..cf3166d24 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -2033,3 +2033,116 @@ ReportDefinitions: 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 tenantid=$tenantid + orderby: ORDER BY receiptdate DESC; + From 9fed4510963c9a2ee6d2467757f4397b8d6f63eb Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 18 Nov 2021 16:39:53 +0530 Subject: [PATCH 0710/1630] Adding TL receipt Report for Roll back period 7 to 10 sept 2020 --- configs/reports/configs/tl-reports.yml | 102 ++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index a7333e688..624afa678 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2800,4 +2800,104 @@ ReportDefinitions: 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 + 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; From d2c2a145d66e8c9ea782cf14e3e1cf0943332ec3 Mon Sep 17 00:00:00 2001 From: mohammadrafeek-eGov Date: Thu, 18 Nov 2021 17:20:48 +0530 Subject: [PATCH 0711/1630] PI-1809: Updated ptData query --- configs/egov-searcher/weekly-impact-emailer-searcher.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-searcher/weekly-impact-emailer-searcher.yml b/configs/egov-searcher/weekly-impact-emailer-searcher.yml index 3d5b20454..841e3c93d 100644 --- a/configs/egov-searcher/weekly-impact-emailer-searcher.yml +++ b/configs/egov-searcher/weekly-impact-emailer-searcher.yml @@ -55,7 +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 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 + 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'),TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, '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'),(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') ,TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, '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'),(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'), TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected,'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'),(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') ,TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected,'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'), (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'),TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, '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'), (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'),TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, '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: @@ -129,4 +129,4 @@ output: jsonFormat: {"ResponseInfo": {}} outJsonPath: $.data - responseInfoPath: $.ResponseInfo \ No newline at end of file + responseInfoPath: $.ResponseInfo From 7d2091e8827f4c49ed77ba21e962f1b98b446f77 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 22 Nov 2021 09:46:07 +0530 Subject: [PATCH 0712/1630] Correcting TL new report yaml --- configs/reports/configs/tl-reports.yml | 184 ++++++++++++------------- 1 file changed, 92 insertions(+), 92 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 624afa678..9c7d59694 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2801,98 +2801,98 @@ ReportDefinitions: 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 - source: tl - total: false - - name: collectorname - label: reports.tl.collectorname - type: string - source: tl - total: false + 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 + 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 From b24c385eb6e8b9d3fe52edfb00c809db8973e160 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:23:14 +0530 Subject: [PATCH 0713/1630] UPDATING PT REPORT FOR ROLL BACK PERIOD --- 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 cf3166d24..fcc675a24 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -2142,7 +2142,7 @@ ReportDefinitions: 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 + ulb,receiptnumber,receiptdate,g8issuedate,g8receiptno,payername,status,servicecategory,cgst,tax,sgst,fieldcollection,totalamount,paymentmode,ddorchequenumber,ddchequedate, collectiontype,collectorname,remarks from uc_7to10sept2020_receipts where tenantid=$tenantid - orderby: ORDER BY receiptdate DESC; + orderby: ORDER BY receiptdate DESC From 7b7f5d8d8e26c5055e389b2d5e7b20899aa1dde0 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:23:25 +0530 Subject: [PATCH 0714/1630] 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 9c7d59694..5765e2ee2 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2800,7 +2800,7 @@ ReportDefinitions: WHERE payment.tenantid=$tenantid AND businessservice in ('TL') and payment.paymentstatus != 'CANCELLED' groupby: GROUP BY collectorname , paymentmode -- reportName: TLReceiptRegister_7to10Sept2020 +- reportName: TLReceiptRegister_7to10Sept2020 decryptionPathId: TradeLicenseRegistryReport_v2 summary: TLReceiptRegister_7to10Sept2020 version: 1.0.0 @@ -2900,4 +2900,4 @@ ReportDefinitions: 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; + orderby: ORDER BY receiptissuedate DESC From 6d5c8d7c9e759eba19cc0b5f1f5785f60891bbf5 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:41:08 +0530 Subject: [PATCH 0715/1630] Decriptionreport_NEW_v2 added --- configs/reports/configs/pgr-reports.yml | 146 ++++++++++++++++++++++++ 1 file changed, 146 insertions(+) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index c4730b335..04b626520 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -1086,6 +1086,152 @@ ReportDefinitions: AND eg_pgr_service.status IN ('open','assigned','reassigrequested','rejected','closed','resolved') orderby: ORDER BY servicerequestid, epa."when" desc +- 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.id::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, + epa.when + 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) + 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 From 639e1426f509106663c3b0005310b319904219e9 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:50:00 +0530 Subject: [PATCH 0716/1630] updated report of UC --- configs/reports/configs/uc-reports.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index fcc675a24..ac2161d63 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -2034,7 +2034,7 @@ ReportDefinitions: 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 + - reportName: uc_7to10sept2020_receipts decryptionPathId: MiscReceiptULB_v2 summary: uc_7to10sept2020_receipts version: 1.0.0 @@ -2142,7 +2142,7 @@ ReportDefinitions: query: | -- Use CTE to force query plan, compute & use CTE later SELECT - ulb,receiptnumber,receiptdate,g8issuedate,g8receiptno,payername,status,servicecategory,cgst,tax,sgst,fieldcollection,totalamount,paymentmode,ddorchequenumber,ddchequedate, collectiontype,collectorname,remarks from uc_7to10sept2020_receipts - where tenantid=$tenantid + 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 From 68df65b44b292099e418c55768d67000c0e6d6ad Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:50:24 +0530 Subject: [PATCH 0717/1630] updated report of tl --- 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 5765e2ee2..5924e9d97 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2886,6 +2886,7 @@ ReportDefinitions: total: false - name: mobilenumber label: reports.tl.mobilenumber + type: string source: tl total: false - name: collectorname From dd0b0906e3fe2531445fafed3df83274b519cdff 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:14:53 +0530 Subject: [PATCH 0718/1630] 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 a511655f9..09b7abea8 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 2dab4dc1f13a62250dd702cdb74eaa60513faf2e 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:53:44 +0530 Subject: [PATCH 0719/1630] Removed date filter for 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 09b7abea8..a511655f9 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 79257dfd83563da97b58ef7a84928f72a9b8fe85 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:06:26 +0530 Subject: [PATCH 0720/1630] 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 a511655f9..a4bd7ac4d 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 8965bf1947f69a9596444691ef722a44e654625b 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:12:06 +0530 Subject: [PATCH 0721/1630] 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 a4bd7ac4d..8a879eb0e 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3172,7 +3172,7 @@ ], "translateTenantCode": true, "chartType": "pie", - "valueType": "number", + "valueType": "amount", "action": "", "documentType": "_doc", "drillChart": "none", @@ -3197,7 +3197,7 @@ ], "translateTenantCode": true, "chartType": "pie", - "valueType": "number", + "valueType": "amount", "action": "", "documentType": "_doc", "drillChart": "none", From a7ae3d5a4157e314dc87a25481c256c4f45f728f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 23 Nov 2021 09:58:32 +0530 Subject: [PATCH 0722/1630] cyphertext id to name --- configs/reports/configs/pgr-reports.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 04b626520..bbc9f2a28 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -1203,7 +1203,7 @@ ReportDefinitions: ) SELECT DISTINCT ON (servicerequestid) - (case when ua.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else ua.id::varchar end) as lastassignedto, --value for Unassigned + (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, @@ -1217,8 +1217,7 @@ ReportDefinitions: 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, - epa.when + 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 From 39ba2e3c57d6893e5bd0ad512bafe9067e4c415f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 23 Nov 2021 12:44:07 +0530 Subject: [PATCH 0723/1630] assignee name correction --- configs/reports/configs/pgr-reports.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index bbc9f2a28..bac6d6633 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -1223,7 +1223,8 @@ ReportDefinitions: 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 = 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 From 3d34fe871b21ea037347da5b5beba5578146a0b3 Mon Sep 17 00:00:00 2001 From: mohammadrafeek-eGov Date: Tue, 23 Nov 2021 12:46:29 +0530 Subject: [PATCH 0724/1630] PI-1812:State wide data query changes --- 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 841e3c93d..505e94a20 100644 --- a/configs/egov-searcher/weekly-impact-emailer-searcher.yml +++ b/configs/egov-searcher/weekly-impact-emailer-searcher.yml @@ -5,7 +5,7 @@ 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 + 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 trunc((SELECT sum((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'))/100000),3)) 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 trunc((SELECT sum((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'))/100000),3)) 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 trunc((SELECT sum((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'))/100000),3)) 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 trunc((SELECT sum((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'))/100000),3)) 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 trunc((SELECT sum((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'))/100000),3)) 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 trunc((SELECT sum((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'))/100000),3)) 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: From c805a3f9cbd3227a8cc742d804b6c17e513a835d Mon Sep 17 00:00:00 2001 From: mohammadrafeek-eGov Date: Tue, 23 Nov 2021 15:38:17 +0530 Subject: [PATCH 0725/1630] PI-1812: Updated TL Data query --- 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 505e94a20..0caab3e50 100644 --- a/configs/egov-searcher/weekly-impact-emailer-searcher.yml +++ b/configs/egov-searcher/weekly-impact-emailer-searcher.yml @@ -72,7 +72,7 @@ - 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 + baseQuery: 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 From be86dfc6ad662c89fb80d3c759c45b7723d4edf2 Mon Sep 17 00:00:00 2001 From: mohammadrafeek-eGov Date: Tue, 23 Nov 2021 15:44:43 +0530 Subject: [PATCH 0726/1630] PI-1812: PGR Data query update --- 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 0caab3e50..29e09eecf 100644 --- a/configs/egov-searcher/weekly-impact-emailer-searcher.yml +++ b/configs/egov-searcher/weekly-impact-emailer-searcher.yml @@ -22,7 +22,7 @@ - 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 + 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: From b7c7556e0f6cb9ff8a07415594dcfed10e4381ee Mon Sep 17 00:00:00 2001 From: mohammadrafeek-eGov Date: Tue, 23 Nov 2021 16:13:56 +0530 Subject: [PATCH 0727/1630] PI-1812: MiscCollection query changes --- 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 29e09eecf..69e2dec51 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 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 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: From c45c5355cb8db0c0340fe198a9a9b9a6ea96ba40 Mon Sep 17 00:00:00 2001 From: mohammadrafeek-eGov Date: Tue, 23 Nov 2021 16:19:15 +0530 Subject: [PATCH 0728/1630] PI-1812:Fixed yml validation issue --- 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 69e2dec51..13660166c 100644 --- a/configs/egov-searcher/weekly-impact-emailer-searcher.yml +++ b/configs/egov-searcher/weekly-impact-emailer-searcher.yml @@ -72,7 +72,7 @@ - name: tlData query: - baseQuery: 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 + 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 From eb078a36e77068df136ff30d9a5e5e51ee9c2070 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 24 Nov 2021 12:31:53 +0530 Subject: [PATCH 0729/1630] Added dateRefField for dss target index --- .../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 8a879eb0e..152b9de6c 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -69,7 +69,7 @@ { "module": "COMMON", "requestQueryMap": "{\r\n \"module\" : \"businessService.keyword\", \n\"tenantId\" : \"tenantIdForMunicipalCorporation\"}", - "dateRefField": "", + "dateRefField": "startdate", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Actual collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" }, @@ -161,7 +161,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\"}}}}}}" }, @@ -194,7 +194,7 @@ { "module": "COMMON", "requestQueryMap": "{\"module\" : \"businessService.keyword\",\"tenantId\" : \"tenantIdForMunicipalCorporation\" }", - "dateRefField": "", + "dateRefField": "startdate", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"asc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" }, From 6811009418ae72f4aeaa213c2e2fadc1d9c6f16c Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 24 Nov 2021 14:24:48 +0530 Subject: [PATCH 0730/1630] PI-1819: Added overviewTargetAchieved visualization --- .../dashboard-analytics/ChartApiConfig.json | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 152b9de6c..1028c661f 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1,6 +1,45 @@ { "_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": [ From 602316ee5f030a607db33a44f70d75274e4211f2 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 24 Nov 2021 14:26:10 +0530 Subject: [PATCH 0731/1630] Pi-1819: Added overviewTargetAchieved visualization in the overview 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 ddbe519b6..d29525d1c 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -42,7 +42,7 @@ "headers": [] }, { - "id": "targetAchieved", + "id": "overviewTargetAchieved", "name": "DSS_TARGET_ACHIEVED", "code": "", "chartType": "metric", From fd5c21e66c0b6a029aa9895605ac0cf609b90ce1 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 24 Nov 2021 14:52:26 +0530 Subject: [PATCH 0732/1630] W&S target collection query modified --- .../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 1028c661f..45701f42d 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3069,7 +3069,7 @@ { "module": "COMMON", "requestQueryMap": "{\r\n \"module\" : \"businessService.keyword\", \n\"tenantId\" : \"ulbName.keyword\"}", - "dateRefField": "", + "dateRefField": "startdate", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Actual collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" }, @@ -3136,7 +3136,7 @@ { "module": "COMMON", "requestQueryMap": "{\r\n \"module\" : \"businessService.keyword\", \n\"tenantId\" : \"ulbName.keyword\"}", - "dateRefField": "", + "dateRefField": "startdate", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"terms\":{\"field\":\"ulbName.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"desc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" }, @@ -3170,7 +3170,7 @@ { "module": "COMMON", "requestQueryMap": "{\"module\" : \"businessService.keyword\",\"tenantId\" : \"ulbName.keyword\" }", - "dateRefField": "", + "dateRefField": "startdate", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"terms\":{\"field\":\"ulbName.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"asc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" }, From 42ff695837c6b5fb70a2ad7ad6e8a8702cd34f4b Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 24 Nov 2021 15:17:21 +0530 Subject: [PATCH 0733/1630] Changed the topPerformingUlbs limit --- .../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 45701f42d..2e9419a3a 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -219,7 +219,7 @@ "action": "percentage", "plotLabel": "DSS_TARGET_ACHIEVED", "order": "desc", - "limit": 3, + "limit": 4, "aggregationPaths": [ "Total Collection","Target Collection" ], From 3fc2199d97156cc729f0364731a05c596f95cd1f Mon Sep 17 00:00:00 2001 From: mohammadrafeek-eGov Date: Thu, 25 Nov 2021 15:17:17 +0530 Subject: [PATCH 0734/1630] PI-1812: Reverted statewide data query changes --- 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 13660166c..e12a1f156 100644 --- a/configs/egov-searcher/weekly-impact-emailer-searcher.yml +++ b/configs/egov-searcher/weekly-impact-emailer-searcher.yml @@ -5,7 +5,7 @@ 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 trunc((SELECT sum((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'))/100000),3)) 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 trunc((SELECT sum((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'))/100000),3)) 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 trunc((SELECT sum((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'))/100000),3)) 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 trunc((SELECT sum((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'))/100000),3)) 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 trunc((SELECT sum((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'))/100000),3)) 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 trunc((SELECT sum((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'))/100000),3)) 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 + 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: From 392895c60db97bdbbcfdd4f985fdcc50d253d34a Mon Sep 17 00:00:00 2001 From: mohammadrafeek-eGov Date: Thu, 25 Nov 2021 17:37:27 +0530 Subject: [PATCH 0735/1630] PI-1812:Showing citizen count in lakhs --- 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 e12a1f156..5d126b15e 100644 --- a/configs/egov-searcher/weekly-impact-emailer-searcher.yml +++ b/configs/egov-searcher/weekly-impact-emailer-searcher.yml @@ -5,7 +5,7 @@ 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 + 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)), '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: From 378c915f5ca96fa2654c88f0c8dec89ac8a80b71 Mon Sep 17 00:00:00 2001 From: mohammadrafeek-eGov Date: Thu, 25 Nov 2021 18:09:26 +0530 Subject: [PATCH 0736/1630] PI-1812:Added alias name --- 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 5d126b15e..3204d5b75 100644 --- a/configs/egov-searcher/weekly-impact-emailer-searcher.yml +++ b/configs/egov-searcher/weekly-impact-emailer-searcher.yml @@ -5,7 +5,7 @@ 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)), '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 + 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: From 9a6db53de66e8725e5dc4df63f12ed4bf458fdb4 Mon Sep 17 00:00:00 2001 From: Anjalichhoker <85220077+Anjalichhoker@users.noreply.github.com> Date: Fri, 3 Dec 2021 16:01:32 +0530 Subject: [PATCH 0737/1630] added surveyid and paymentmode in pt dump report --- configs/reports/configs/pt-reports.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index b1999b1f6..4dcdfbfc2 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6127,6 +6127,11 @@ ReportDefinitions: 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 @@ -6255,7 +6260,8 @@ ReportDefinitions: select rp.receiptnumber, rp.propertyid as consumercode, - rp.receiptdate, + 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, @@ -6279,6 +6285,8 @@ ReportDefinitions: orderby: order by receiptnumber + + - reportName: PT_DATA_DUMP_REPORT_V2 decryptionPathId: ULBPTDataDumpReport_V2 summary: ULB level report @@ -6365,6 +6373,11 @@ ReportDefinitions: type: string source: pt total: true + - name: paymentmode + label: reports.pt.paymentmode + type: string + source: pt + total: false - name: paymentdate label: reports.pt.paymentdate type: string @@ -6461,7 +6474,7 @@ ReportDefinitions: pt.propertyid as propertytaxuniqueid, rp.transactiondate as dateoftransaction, rp.receiptnumber as receiptnumber, - rp.receiptdate as paymentdate, + to_char((To_timestamp(rp.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "paymentmode", rp.paymentmode as paymentmode, pt.oldpropertyid as existingpropertyid, --ra.assessmentyears as financialyear, @@ -6480,6 +6493,7 @@ ReportDefinitions: --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, From d1217296e03783ca2a0c7e61cf09133151047b42 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Fri, 3 Dec 2021 16:20:08 +0530 Subject: [PATCH 0738/1630] added survey id and payment mode to PT dump report --- 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 4dcdfbfc2..1b7cfe9e8 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6393,6 +6393,11 @@ ReportDefinitions: type: string source: pt total: false + - name: surveyid + label: reports.pt.surveyid + type: string + source: pt + total: false - name: payeraddress label: reports.pt.payeraddress type: string @@ -6474,7 +6479,7 @@ ReportDefinitions: pt.propertyid as propertytaxuniqueid, rp.transactiondate as dateoftransaction, rp.receiptnumber as receiptnumber, - to_char((To_timestamp(rp.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "paymentmode", + 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, From efc95a6cce3b2ac465bb95e353343255a0fadefb Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 9 Dec 2021 12:38:17 +0530 Subject: [PATCH 0739/1630] refining query of PT data dump report --- configs/reports/configs/pt-reports.yml | 30 +++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 1b7cfe9e8..7cd647a78 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6473,39 +6473,39 @@ ReportDefinitions: group by propertyid ) select - rp.billid, + --rp.billid, --ra.billid, pt.tenantid as ulb, - pt.propertyid as propertytaxuniqueid, - rp.transactiondate as dateoftransaction, - rp.receiptnumber as receiptnumber, + --pt.propertyid as propertytaxuniqueid, + --rp.transactiondate as dateoftransaction, + --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, + --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, + --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.amoutpaid as paymentamount, --rp.transactiondate as transcationdate, - owners.emailid as emailid, + --owners.emailid as emailid, pt.address as address, pt.surveyid, - pt.additionaldetails->>'remarks' as remarks, + --pt.additionaldetails->>'remarks' as remarks, --pt.additionaldetails->>'businessName' as firmbusinessname, - pt.firmbusinessname as businessname, + --pt.firmbusinessname as businessname, pt.localitycode as localitycode, pt.localityname as localityname from report_properties pt - inner join units as ru on ru.propertyid=pt.propertyid + --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 From 54d8f696000c06c968619243484b7b18464c0630 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 9 Dec 2021 15:21:39 +0530 Subject: [PATCH 0740/1630] Added zonename and blockname/wardname in PT Dump report --- configs/reports/configs/pt-reports.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 7cd647a78..9c1058b0b 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6423,6 +6423,16 @@ ReportDefinitions: type: string source: pt total: false + - name: zonename + label: reports.pt.zonename + type: string + source: pt + total: false + - name: blockname + label: reports.pt.blockname + type: string + source: pt + total: false searchParams: - name: fromDate label: reports.pt.fromDate @@ -6503,7 +6513,9 @@ ReportDefinitions: --pt.additionaldetails->>'businessName' as firmbusinessname, --pt.firmbusinessname as businessname, pt.localitycode as localitycode, - pt.localityname as localityname + pt.localityname as localityname, + pt.zonename as zonename, + pt.blockname as blockname 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' From 7ecad554de0e912ff58bc32adc4792ca42dee3fb Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Sun, 12 Dec 2021 10:50:25 +0530 Subject: [PATCH 0741/1630] Added PT id to Data dump report --- 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 9c1058b0b..03bb97bee 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6486,12 +6486,12 @@ ReportDefinitions: --rp.billid, --ra.billid, pt.tenantid as ulb, - --pt.propertyid as propertytaxuniqueid, + pt.propertyid as propertytaxuniqueid, --rp.transactiondate as dateoftransaction, --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, + pt.oldpropertyid as existingpropertyid, --ra.assessmentyears as financialyear, getfinancialyear(rp.billid) as financialyear, owners.ownername as ownername, From 392973e8387fe16475a0696823af1114221f580f Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 13 Dec 2021 11:30:21 +0530 Subject: [PATCH 0742/1630] PT Dump Report changes --- configs/reports/configs/pt-reports.yml | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 03bb97bee..b712955eb 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6483,12 +6483,12 @@ ReportDefinitions: group by propertyid ) select - --rp.billid, + rp.billid, --ra.billid, pt.tenantid as ulb, pt.propertyid as propertytaxuniqueid, - --rp.transactiondate as dateoftransaction, - --rp.receiptnumber as receiptnumber, + rp.transactiondate as dateoftransaction, + 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, @@ -6497,27 +6497,27 @@ ReportDefinitions: 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, + 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.amoutpaid as paymentamount, --rp.transactiondate as transcationdate, - --owners.emailid as emailid, + 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.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 from report_properties pt - --inner join units as ru on ru.propertyid=pt.propertyid + 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 From 63e952768eb80bfbeeca504892e0ad210a2c70a4 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 13 Dec 2021 12:37:29 +0530 Subject: [PATCH 0743/1630] Update pt-reports.yml --- 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 b712955eb..aec352c05 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6303,8 +6303,8 @@ ReportDefinitions: type: string source: pt total: false - - name: transcationdate - label: reports.pt.transcationdate + - name: transactiondate + label: reports.pt.transactiondate type: string source: pt total: false @@ -6487,7 +6487,7 @@ ReportDefinitions: --ra.billid, pt.tenantid as ulb, pt.propertyid as propertytaxuniqueid, - rp.transactiondate as dateoftransaction, + 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, From e49ab0d6b692f4d626d044653fcaf381bf8eb462 Mon Sep 17 00:00:00 2001 From: mohammadrafeek-eGov Date: Mon, 13 Dec 2021 17:04:23 +0530 Subject: [PATCH 0744/1630] PI-1812:Updated where clause in misc report --- 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 3204d5b75..2729351c8 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 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 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 + 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: From 931fce6316b84fe78b61ca139ef6ca76776780e9 Mon Sep 17 00:00:00 2001 From: mohammadrafeek-eGov Date: Thu, 16 Dec 2021 09:46:46 +0530 Subject: [PATCH 0745/1630] PI-1812:Updated ptData query --- 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 2729351c8..ee2e907ed 100644 --- a/configs/egov-searcher/weekly-impact-emailer-searcher.yml +++ b/configs/egov-searcher/weekly-impact-emailer-searcher.yml @@ -55,7 +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 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'),TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, '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'),(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') ,TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, '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'),(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'), TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected,'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'),(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') ,TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected,'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'), (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'),TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, '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'), (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'),TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, '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 + 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: From 432e65955a6aff77cfe5102aadddd1f0c7bb163a Mon Sep 17 00:00:00 2001 From: mohammadrafeek-eGov Date: Wed, 22 Dec 2021 15:52:25 +0530 Subject: [PATCH 0746/1630] PI-1842: Showing RB Bot grievances in emailer --- configs/egov-searcher/weekly-impact-emailer-searcher.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/egov-searcher/weekly-impact-emailer-searcher.yml b/configs/egov-searcher/weekly-impact-emailer-searcher.yml index ee2e907ed..c2c7f9349 100644 --- a/configs/egov-searcher/weekly-impact-emailer-searcher.yml +++ b/configs/egov-searcher/weekly-impact-emailer-searcher.yml @@ -38,7 +38,8 @@ - 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 + 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: From 582e50523a6af0bd9bdaaf10864b5a4319c5acfe Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 23 Dec 2021 16:46:39 +0530 Subject: [PATCH 0747/1630] added temprary report to fetch mobilenumbers --- configs/reports/configs/pt-reports.yml | 36 ++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index aec352c05..96680b975 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7143,5 +7143,37 @@ ReportDefinitions: 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: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobilenumber + type: string + source: pt + total: false + query: | + select propertyid as propertyuid, + name as owenrrname, + mobilenumber as mobileno + from eg_pt_owner + inner join eg_user on eg_pt_owner.userid=eg_user.uuid + where propertyid in + (select id + from eg_pt_property + where tenantid='pb.patiala' and status='ACTIVE' and propertyid not in (select consumercode from egbs_demand_v1 where tenantid='pb.patiala' and businessservice='PT' and taxperiodfrom=1617215400000) -- 2021-22 + ) From 6f5f936c84c4aa05a20105ac533b7ee70e95a4fc Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 29 Dec 2021 16:58:50 +0530 Subject: [PATCH 0748/1630] added firenocSearch for 3rd party --- .../rainmaker-pt-customsearch-punjab.yml | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml b/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml index 00a553ac6..723c7966b 100644 --- a/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml +++ b/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml @@ -104,4 +104,31 @@ SearchDefinitions: 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,validfrom,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: tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + operator: = + - name: firenocnumber + isMandatory: true + jsonPath: $.searchCriteria.firenocNumber + operator: = + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo + From 23a37321a12eb5498a089d5c768f7fc725908129 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 29 Dec 2021 17:22:37 +0530 Subject: [PATCH 0749/1630] updated yml params under condition --- configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml b/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml index 723c7966b..a7b1df1c5 100644 --- a/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml +++ b/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml @@ -118,7 +118,7 @@ SearchDefinitions: orderBy: searchParams: condition: AND - params: + params: - name: tenantid isMandatory: true jsonPath: $.searchCriteria.tenantId From 4931ad00b6230e53163c26690dea0e410e39ee3a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 29 Dec 2021 17:32:16 +0530 Subject: [PATCH 0750/1630] updated query fn.tenantid --- configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml b/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml index a7b1df1c5..1abcb420c 100644 --- a/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml +++ b/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml @@ -119,7 +119,7 @@ SearchDefinitions: searchParams: condition: AND params: - - name: tenantid + - name: fn.tenantid isMandatory: true jsonPath: $.searchCriteria.tenantId operator: = From 4572952073e89865141ec8f6f2ed664976abcda8 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 29 Dec 2021 17:38:30 +0530 Subject: [PATCH 0751/1630] updated date formats --- configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml b/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml index 1abcb420c..b0acd93e5 100644 --- a/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml +++ b/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml @@ -108,7 +108,10 @@ SearchDefinitions: query: baseQuery: | select array_to_json(array_agg(row_to_json(data))) from ( - select fnd.uuid,firenocuuid,applicationnumber,firenocnumber,firenoctype,firestationid,validfrom,validto,status,concat(addressline1,' ',addressline2,' ',street,' ',city,' ',locality,' ',subdistrict,' ') as address,fnb.name,concat(fnb.usagetype,' ',fnb.usagesubtype) + 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 From e7da454d84e674ec357c465bf3a4ebd5b3bc12dc Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 30 Dec 2021 07:30:17 +0530 Subject: [PATCH 0752/1630] made tenantId as mandatory false --- configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml b/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml index b0acd93e5..4773f42db 100644 --- a/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml +++ b/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml @@ -123,7 +123,7 @@ SearchDefinitions: condition: AND params: - name: fn.tenantid - isMandatory: true + isMandatory: false jsonPath: $.searchCriteria.tenantId operator: = - name: firenocnumber From 24e58626b7d323db45a03bda63212c9efe0f191c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 30 Dec 2021 07:38:57 +0530 Subject: [PATCH 0753/1630] Update rainmaker-pt-customsearch-punjab.yml --- configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml b/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml index 4773f42db..56456ec83 100644 --- a/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml +++ b/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml @@ -122,10 +122,6 @@ SearchDefinitions: searchParams: condition: AND params: - - name: fn.tenantid - isMandatory: false - jsonPath: $.searchCriteria.tenantId - operator: = - name: firenocnumber isMandatory: true jsonPath: $.searchCriteria.firenocNumber From 016f0ade707a3037727404173dea4df6685a7063 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 14 Jan 2022 12:13:00 +0530 Subject: [PATCH 0754/1630] added DailyCollectionReport for Patiala Challan requirements --- configs/reports/configs/pt-reports.yml | 91 ++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 96680b975..d849575df 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7177,3 +7177,94 @@ ReportDefinitions: from eg_pt_property where tenantid='pb.patiala' and status='ACTIVE' and propertyid not in (select consumercode from egbs_demand_v1 where tenantid='pb.patiala' and businessservice='PT' 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 + payment.paymentmode 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 + groupby: group by instrumenttype From 422e674efc40c54aca7109b7dda48236493e51f5 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 17 Jan 2022 14:57:39 +0530 Subject: [PATCH 0755/1630] added report DailyChequeDetail patiala specific for 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 d849575df..0ff67103b 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7268,3 +7268,124 @@ ReportDefinitions: where pd.paymentid=payment.id and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid and receipt_breakup.pdid=pd.id groupby: group by instrumenttype + + +- reportName: DailyChequeDetail + summary: Cheque DD 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: 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 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; From 56c9dba8c15d9c32b8ca8fb1de7bb1a09658c43c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 19 Jan 2022 14:11:13 +0530 Subject: [PATCH 0756/1630] chaged papersize --- 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 0ff67103b..1000c0e9b 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7276,7 +7276,7 @@ ReportDefinitions: moduleName: rainmaker-pt additionalConfig: print: - pdfPageSize: "A4" + pdfPageSize: "A3" sourceColumns: - name: instrumenttype label: reports.pt.paymentMode From af0f5ce4d3a8430352e32aef5bd442e1cf3c12bc Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 19 Jan 2022 16:15:05 +0530 Subject: [PATCH 0757/1630] pos machine number group for card payments, daily challan pta --- 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 1000c0e9b..74fd058c8 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7267,7 +7267,7 @@ ReportDefinitions: 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 - groupby: group by instrumenttype + groupby: group by instrumenttype,substring(instrumentnumber,0,position ('/' in instrumentnumber)) - reportName: DailyChequeDetail From 17886a29335abd2354f1127c7939d789908643b2 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 20 Jan 2022 12:47:00 +0530 Subject: [PATCH 0758/1630] updated daily challan reports --- configs/reports/configs/pt-reports.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 74fd058c8..583f73caf 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7258,7 +7258,7 @@ ReportDefinitions: GROUP BY pdid ) SELECT - payment.paymentmode as instrumenttype, + 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, @@ -7266,12 +7266,12 @@ ReportDefinitions: 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 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 DD Collection Register + summary: Cheque RTGS NEFT Collection Register version: 1.0.0 moduleName: rainmaker-pt additionalConfig: @@ -7370,6 +7370,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 paymentmode in ('CHEQUE','OFFLINE_NEFT','OFFLINE_RTGS') AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate GROUP BY pdid ) From 1e0cfcb4cae91877826decfd1a7a6f7797062046 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 31 Jan 2022 16:09:09 +0530 Subject: [PATCH 0759/1630] TempReport to show defulters for particular year --- configs/reports/configs/pt-reports.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 583f73caf..6b09b240c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7165,7 +7165,15 @@ ReportDefinitions: label: reports.pt.mobilenumber type: string source: pt - total: false + total: false + searchParams: + - name: finYear + label: Financial Year + type: singlevaluelist + pattern: 'list://1554057000000:2019-20,1585679400000:2020-21,1617215400000:2021-22' + source: pt + isMandatory: true + searchClause: AND taxperiodfrom=$finYear query: | select propertyid as propertyuid, name as owenrrname, @@ -7175,7 +7183,7 @@ ReportDefinitions: where propertyid in (select id from eg_pt_property - where tenantid='pb.patiala' and status='ACTIVE' and propertyid not in (select consumercode from egbs_demand_v1 where tenantid='pb.patiala' and businessservice='PT' and taxperiodfrom=1617215400000) -- 2021-22 + where tenantid='pb.patiala' and status='ACTIVE' and propertyid not in (select consumercode from egbs_demand_v1 where tenantid=$tenantid and businessservice='PT') -- and taxperiodfrom=1617215400000 -- 2021-22 ) From e6dd5bf87f53475fb44dac3a925978b372c60e11 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 31 Jan 2022 16:21:58 +0530 Subject: [PATCH 0760/1630] 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 6b09b240c..582a7e21e 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7173,7 +7173,7 @@ ReportDefinitions: pattern: 'list://1554057000000:2019-20,1585679400000:2020-21,1617215400000:2021-22' source: pt isMandatory: true - searchClause: AND taxperiodfrom=$finYear + searchClause: AND 1=1 query: | select propertyid as propertyuid, name as owenrrname, @@ -7183,7 +7183,7 @@ ReportDefinitions: where propertyid in (select id from eg_pt_property - where tenantid='pb.patiala' and status='ACTIVE' and propertyid not in (select consumercode from egbs_demand_v1 where tenantid=$tenantid and businessservice='PT') -- and taxperiodfrom=1617215400000 -- 2021-22 + where tenantid='pb.patiala' and status='ACTIVE' and propertyid not in (select consumercode from egbs_demand_v1 where tenantid=$tenantid and businessservice='PT' and taxperiodfrom=$finYear ) -- and taxperiodfrom=1617215400000) -- 2021-22 ) From 2a964573affbd11192ef09ad5e11a72cce7fef76 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 31 Jan 2022 16:27:24 +0530 Subject: [PATCH 0761/1630] 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 582a7e21e..147dca9a7 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7183,7 +7183,7 @@ ReportDefinitions: where propertyid in (select id from eg_pt_property - where tenantid='pb.patiala' and status='ACTIVE' and propertyid not in (select consumercode from egbs_demand_v1 where tenantid=$tenantid and businessservice='PT' and taxperiodfrom=$finYear ) -- and taxperiodfrom=1617215400000) -- 2021-22 + where tenantid='pb.patiala' 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 ) From 2b33f755b3e89285a15a15baea98711861b250bf Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 31 Jan 2022 16:42:45 +0530 Subject: [PATCH 0762/1630] shown propertyid in temp defaulter report --- configs/reports/configs/pt-reports.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 147dca9a7..f0e8ca776 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7175,12 +7175,14 @@ ReportDefinitions: isMandatory: true searchClause: AND 1=1 query: | - select propertyid as propertyuid, - name as owenrrname, + select eg_pt_owner.propertyid as propertyuid, + pt.propertyid, + name as ownername, mobilenumber as mobileno from eg_pt_owner inner join eg_user on eg_pt_owner.userid=eg_user.uuid - where propertyid in + inner join eg_pt_property pt on pt.id=eg_pt_owner.propertyid + where eg_pt_owner.propertyid in (select id from eg_pt_property where tenantid='pb.patiala' 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 From bd72366e77c4b21849971b58170c2d6d7f26ae70 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 31 Jan 2022 16:48:21 +0530 Subject: [PATCH 0763/1630] Update pt-reports.yml --- 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 f0e8ca776..d8ab32ed2 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7156,6 +7156,11 @@ ReportDefinitions: 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 @@ -7176,7 +7181,7 @@ ReportDefinitions: searchClause: AND 1=1 query: | select eg_pt_owner.propertyid as propertyuid, - pt.propertyid, + pt.propertyid as propertyid, name as ownername, mobilenumber as mobileno from eg_pt_owner From 2473b167eae0d5be7b2406868f72a28f3e67f63d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 1 Feb 2022 09:56:38 +0530 Subject: [PATCH 0764/1630] 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 d8ab32ed2..65382668e 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7190,7 +7190,7 @@ ReportDefinitions: where eg_pt_owner.propertyid in (select id from eg_pt_property - where tenantid='pb.patiala' 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 + where tenantid=$tenanid 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 ) From 944653f56bebba456cb06404ddd391fcea47f09a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 1 Feb 2022 12:09:32 +0530 Subject: [PATCH 0765/1630] 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 65382668e..782110388 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7190,7 +7190,7 @@ ReportDefinitions: where eg_pt_owner.propertyid in (select id from eg_pt_property - where tenantid=$tenanid 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 + 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 ) From 1c48ed95cabdd10112a0821995e3ed1f1229e1d4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 11 Feb 2022 12:25:22 +0530 Subject: [PATCH 0766/1630] added address in temp report --- configs/reports/configs/pt-reports.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 782110388..b7dd59ea0 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7161,6 +7161,16 @@ ReportDefinitions: 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 @@ -7182,11 +7192,14 @@ ReportDefinitions: 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 From 28915e2810de486ca5c11d40743a3d0696b84b2f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 19 Feb 2022 18:13:56 +0530 Subject: [PATCH 0767/1630] corrected finYear in TempReport --- 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 b7dd59ea0..0b97da70c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7185,7 +7185,7 @@ ReportDefinitions: - name: finYear label: Financial Year type: singlevaluelist - pattern: 'list://1554057000000:2019-20,1585679400000:2020-21,1617215400000:2021-22' + pattern: 'list://1554076800000:2019-20,1585699200000:2020-21,1617235200000:2021-22' source: pt isMandatory: true searchClause: AND 1=1 From fb5a6077a0a6fb3d0b28ea499edb50a25a9422a6 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 22 Feb 2022 16:47:28 +0530 Subject: [PATCH 0768/1630] Adding New PT Report cybertech_additional_transactions --- configs/reports/configs/pt-reports.yml | 172 +++++++++++++++++++++++++ 1 file changed, 172 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 0b97da70c..e3f7dd752 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7418,3 +7418,175 @@ ReportDefinitions: 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 + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB Defaulter Pt report + 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 + searchParams: + query: | + select * from patiala_cybertech_additional_transactions + orderby: ORDER BY paymentdate From 873a40fc6ce7de0029b36bb1ce5d283680828e95 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Wed, 23 Feb 2022 11:15:40 +0530 Subject: [PATCH 0769/1630] adding new PT report WithoutUpinTransactions for patiala --- configs/reports/configs/pt-reports.yml | 211 +++++++++++++++++++++++++ 1 file changed, 211 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index e3f7dd752..93c55f46b 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7590,3 +7590,214 @@ ReportDefinitions: query: | select * from patiala_cybertech_additional_transactions orderby: ORDER BY paymentdate + +- reportName: WithoutUpinTransactions + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + 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 + searchParams: + query: | + select * from patiala_without_upin_transactions + orderby: ORDER BY paymentdate From 2bfd5b3478fa11b40e82a6691da850ed746f6244 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 24 Feb 2022 11:57:21 +0530 Subject: [PATCH 0770/1630] order by corrected --- 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 93c55f46b..3dc42b315 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7589,7 +7589,7 @@ ReportDefinitions: searchParams: query: | select * from patiala_cybertech_additional_transactions - orderby: ORDER BY paymentdate + orderby: ORDER BY paymentdate - reportName: WithoutUpinTransactions decryptionPathId: ULBDEFAULTERPTREPORT_V2 @@ -7800,4 +7800,4 @@ ReportDefinitions: searchParams: query: | select * from patiala_without_upin_transactions - orderby: ORDER BY paymentdate + orderby: ORDER BY paymentdate From 17177b89870f64503065d8e19963cde1e0ac103b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 24 Feb 2022 15:46:33 +0530 Subject: [PATCH 0771/1630] removed searchParamaters from pta report --- configs/reports/configs/pt-reports.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 3dc42b315..fedce4242 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7421,8 +7421,7 @@ ReportDefinitions: - reportName: cybertech_additional_transactions - decryptionPathId: ULBDEFAULTERPTREPORT_V2 - summary: ULB Defaulter Pt report + summary: CyberTech Additional Transactions version: 1.0.0 moduleName: rainmaker-pt sourceColumns: @@ -7586,13 +7585,11 @@ ReportDefinitions: type: string source: pt total: false - searchParams: query: | select * from patiala_cybertech_additional_transactions orderby: ORDER BY paymentdate - reportName: WithoutUpinTransactions - decryptionPathId: ULBDEFAULTERPTREPORT_V2 summary: WithoutUpinTransactions version: 1.0.0 moduleName: rainmaker-pt @@ -7797,7 +7794,6 @@ ReportDefinitions: type: string source: pt total: false - searchParams: query: | select * from patiala_without_upin_transactions orderby: ORDER BY paymentdate From e55682903c17f30763561eda8ac71950a0b5626e Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 28 Feb 2022 12:38:53 +0530 Subject: [PATCH 0772/1630] creating separate receipt for Old miscellaneous 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 000000000..b754b62b5 --- /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 2e87db5ee931f9d7c1c47f689337d799e8cb4459 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 28 Feb 2022 12:43:57 +0530 Subject: [PATCH 0773/1630] Adding new pdf for old consolidate receipts of misc --- .../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 000000000..bfb6e4d39 --- /dev/null +++ b/configs/pdf-service/format-config/consolidatedreceiptold.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": "{{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 563b2950e7ded2112a85c846707635e54f902b0d Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 28 Feb 2022 12:44:31 +0530 Subject: [PATCH 0774/1630] Update consolidatedreceiptold.json --- configs/pdf-service/format-config/consolidatedreceiptold.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/consolidatedreceiptold.json b/configs/pdf-service/format-config/consolidatedreceiptold.json index bfb6e4d39..ef1aad3f0 100644 --- a/configs/pdf-service/format-config/consolidatedreceiptold.json +++ b/configs/pdf-service/format-config/consolidatedreceiptold.json @@ -1,5 +1,5 @@ { - "key": "consolidatedreceipt", + "key": "consolidatedreceiptold", "config": { "defaultStyle": { "font": "Cambay" From 21ba17cde97a73fa8c1f8a4184ccc014d2a4a9ef Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Wed, 2 Mar 2022 13:51:34 +0530 Subject: [PATCH 0775/1630] Adding new Table in Property receipt for partial payment --- .../data-config/property-receipt.json | 166 ++++++++++++++---- 1 file changed, 133 insertions(+), 33 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 8033082e3..79102e7a1 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" } }, { @@ -597,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", @@ -607,7 +695,8 @@ "localisation":{ "required":true, "prefix": null, - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } }, { @@ -619,7 +708,8 @@ "localisation":{ "required":true, "prefix": null, - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } } ] @@ -674,7 +764,8 @@ "localisation":{ "required":true, "prefix": "TENANT_TENANTS", - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } } ] @@ -716,7 +807,8 @@ "localisation": { "required": true, "prefix": "COMMON_PROPUSGTYPE", - "module": "rainmaker-pt" + "module": "rainmaker-pt", + "locale":"en_IN" } }, { @@ -745,21 +837,22 @@ "localisation": { "required": true, "prefix": "WS_PROPTYPE", - "module": "rainmaker-ws" + "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')]", @@ -778,7 +871,11 @@ { "variable":"ownerShipPercentage", "value":"ownerShipPercentage" - } + }, + { + "variable":"ownerType", + "value":"ownerType" + } ] } }, @@ -795,7 +892,8 @@ "localisation": { "required": true, "prefix": "PROPERTYTAX_FLOOR", - "module": "rainmaker-pt" + "module": "rainmaker-pt", + "locale":"en_IN" } }, { @@ -804,7 +902,8 @@ "localisation": { "required": true, "prefix": "COMMON_PROPUSGTYPE", - "module": "rainmaker-pt" + "module": "rainmaker-pt", + "locale":"en_IN" } }, { @@ -814,7 +913,8 @@ "required": true, "prefix": "COMMON_PROPSUBUSGTYPE", "module": "rainmaker-pt", - "isSubTypeRequired":true + "isSubTypeRequired":true, + "locale":"en_IN" } }, { From 2c582e321a3e9bb6a21b4046f586da82f154458d Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Wed, 2 Mar 2022 13:55:41 +0530 Subject: [PATCH 0776/1630] Adding new table in PT receipt for partial payment --- .../format-config/property-receipt.json | 276 ++++++++---------- 1 file changed, 120 insertions(+), 156 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 11b888592..eeb10c582 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" } ] ] @@ -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": [ @@ -487,11 +562,11 @@ "style": "amounts" }, { - "text": "Usage Exemption", + "text": "Usage Exemp.", "style": "amounts" }, { - "text": "Special Category Exemption", + "text": "Category Exemp.", "style": "amounts" }, { @@ -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 ], @@ -611,7 +644,7 @@ "text": "₹ {{paidAmount}}", "border": [ false, - false, + true, true, false ], @@ -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,34 +813,17 @@ 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 ], @@ -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" } + ] ] }, @@ -864,7 +881,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\":[false,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": {} }, { @@ -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 66fddbc2d029e80b25759a75a0856f82954093e4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 4 Mar 2022 12:27:08 +0530 Subject: [PATCH 0777/1630] StateDescriptionReport_v2 prod --- configs/reports/configs/pgr-reports.yml | 143 ++++++++++++++++++++++++ 1 file changed, 143 insertions(+) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index bac6d6633..84c467a7f 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2050,3 +2050,146 @@ 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 bec283c3d2d752bdedc8f634f9da6eb1e18a4fe7 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Fri, 4 Mar 2022 15:25:53 +0530 Subject: [PATCH 0778/1630] Adding Zonename and blockname to TL defaulter report --- configs/reports/configs/tl-reports.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 5924e9d97..c0ee6a9fb 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2479,16 +2479,21 @@ ReportDefinitions: total: false query: | select - split_part(tenantid,'.',2) as ulb, + distinct on (tl.applicationnumber) + applicationnumber, + split_part(tl.tenantid,'.',2) as ulb, licensenumber, - applicationnumber, 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 @@ -2497,6 +2502,8 @@ 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 From fb9af78b55900336f4420c6d3bfcb14cba618acc Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 7 Mar 2022 10:11:08 +0530 Subject: [PATCH 0779/1630] updated Defaulter report of TL --- configs/reports/configs/tl-reports.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index c0ee6a9fb..0dc2b9ab5 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2472,6 +2472,16 @@ ReportDefinitions: 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 @@ -2501,7 +2511,7 @@ ReportDefinitions: 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 + and tl.tenantid = $tenantid From 8bcfb39aa43774a4bf269f16c8edde40fef43c9f Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 22 Mar 2022 14:53:53 +0530 Subject: [PATCH 0780/1630] correcting PGR state description report --- configs/reports/configs/pgr-reports.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 84c467a7f..9505eef8d 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2066,10 +2066,6 @@ 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: - name: department label: reports.rainmaker-pgr.department @@ -2106,11 +2102,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 @@ -2170,7 +2161,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 f09385278cb437313a028b9c681e4d93cb5ab2ce Mon Sep 17 00:00:00 2001 From: poonam1512 Date: Tue, 22 Mar 2022 15:02:26 +0530 Subject: [PATCH 0781/1630] adding new point in disclaimer of PT receipt --- 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 eeb10c582..e9fff43b0 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 45587fc39c92925675deb4e3648aa95c9f3d5e71 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Wed, 23 Mar 2022 21:55:50 +0530 Subject: [PATCH 0782/1630] removed the ids.gro --- 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 94ad3eae4..c7c4224af 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 a7b16251159643d11806aee05a7b76c5f7c3e639 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Wed, 23 Mar 2022 22:25:00 +0530 Subject: [PATCH 0783/1630] reverted the changes back --- 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 c7c4224af..94ad3eae4 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 + 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: From fb3f0a79ff90d0a00b6809ba0a3fb6327f6e74f0 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Wed, 23 Mar 2022 22:39:09 +0530 Subject: [PATCH 0784/1630] changed the inJsonoath to $.Employees[0].user.name --- 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 94ad3eae4..8d0693f06 100644 --- a/configs/egov-indexer/rainmaker-pgr-indexer.yml +++ b/configs/egov-indexer/rainmaker-pgr-indexer.yml @@ -251,7 +251,7 @@ ServiceMaps: 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 + - inJsonPath: $.Employees[0].user.name outJsonPath: $.Data.assignee - path: http://egov-hrms.egov:8080/egov-hrms/employees/_search queryParam: tenantId=$.tenantId,ids=$.assignee From c668b08356b9750a1756414ab57fb5c6f32ab43a Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Wed, 23 Mar 2022 23:16:57 +0530 Subject: [PATCH 0785/1630] changed ids=$.gro to ids=$.assignee --- configs/egov-indexer/rainmaker-pgr-indexer.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-indexer/rainmaker-pgr-indexer.yml b/configs/egov-indexer/rainmaker-pgr-indexer.yml index 8d0693f06..8a8e1b8d4 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,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: @@ -272,7 +272,7 @@ ServiceMaps: 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] + - inJsonPath: $.TenantBoundary[0].boundary[0].name outJsonPath: $.Data.complaintWard mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search From 1d852d87601421f9633a26fbf5a2c0c1cd15abf1 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Wed, 23 Mar 2022 23:37:09 +0530 Subject: [PATCH 0786/1630] Reverted back all the changes done today. --- configs/egov-indexer/rainmaker-pgr-indexer.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-indexer/rainmaker-pgr-indexer.yml b/configs/egov-indexer/rainmaker-pgr-indexer.yml index 8a8e1b8d4..94ad3eae4 100644 --- a/configs/egov-indexer/rainmaker-pgr-indexer.yml +++ b/configs/egov-indexer/rainmaker-pgr-indexer.yml @@ -251,7 +251,7 @@ ServiceMaps: 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 + - inJsonPath: $.Employee[0].name outJsonPath: $.Data.assignee - path: http://egov-hrms.egov:8080/egov-hrms/employees/_search queryParam: tenantId=$.tenantId,ids=$.assignee @@ -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=$.assignee + 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: @@ -272,7 +272,7 @@ ServiceMaps: 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 + - inJsonPath: $.TenantBoundary[0].boundary[0] outJsonPath: $.Data.complaintWard mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search From af465baadab877dab2824c015987dce8ec41ea10 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 30 Mar 2022 16:56:09 +0530 Subject: [PATCH 0787/1630] receipt regsiter summary checque count correction --- 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 fedce4242..eabf4c950 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4015,7 +4015,7 @@ ReportDefinitions: + 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) end) as countcheque, + 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 265697f08ab0542ffeddc9e14298a16c346edde1 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 31 Mar 2022 12:46:49 +0530 Subject: [PATCH 0788/1630] receiptregister to show receipts for INACTIVE properties --- configs/reports/configs/pt-reports.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index eabf4c950..9962a6870 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2503,10 +2503,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 f054ae88b82055b4e2f8740276a95991fe46a4e3 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 4 Apr 2022 10:38:55 +0530 Subject: [PATCH 0789/1630] ReceiptRegisterShort to include receipts for 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 9962a6870..4e6c4672f 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3426,11 +3426,12 @@ 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 Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, + 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' + and pt.propertyid = bd.consumercodei --and pt.status!='INACTIVE' orderby: ORDER BY pd.receiptdate DESC; From ff3b71d901259d9c4a16ddcdcb70d5b46b5cc492 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 4 Apr 2022 10:56:36 +0530 Subject: [PATCH 0790/1630] FY collection report to include payments 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 4e6c4672f..0e261b5ec 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4270,10 +4270,12 @@ ReportDefinitions: 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, + 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.status!='INACTIVE' and pt_addr.propertyid=pt.id + and pt.propertyid = bill.consumercode and pt_addr.propertyid=pt.id --and pt.status!='INACTIVE' groupby: GROUP BY financialyear orderby: ORDER BY financialyear @@ -4403,9 +4405,11 @@ ReportDefinitions: 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 + 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' + and pt.propertyid = bill.consumercode --and pt.status!='INACTIVE' groupby: GROUP BY financialyear orderby: ORDER BY financialyear From ea8b1463b276dc4fa69517381a86fa3583eba200 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 4 Apr 2022 12:24:35 +0530 Subject: [PATCH 0791/1630] Adding ULB Search and Employee code to the state description report --- configs/reports/configs/pgr-reports.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 9505eef8d..28e06f280 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2143,6 +2143,14 @@ ReportDefinitions: 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 tenantid = $ulb - name: fromDate label: reports.rainmaker-pgr.datefrom type: epoch @@ -2158,7 +2166,7 @@ ReportDefinitions: query: | SELECT DISTINCT ON (servicerequestid) - (case when ua.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else ua.name end) as lastassignedto, --value for Unassigned + (case when ua.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_hrms_employee.code 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, @@ -2179,6 +2187,7 @@ ReportDefinitions: 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) + left outer join eg_hrms_employee on eg_pgr_service.lastmodifiedby::bigint = eg_hrms_employee.id WHERE eg_pgr_service.tenantid !='pb.testing' AND eg_pgr_address.uuid = eg_pgr_service.addressid From bca5b0532e7482d97de6283ac2a8214cb784c6f8 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 4 Apr 2022 13:18:05 +0530 Subject: [PATCH 0792/1630] Resolving error ERROR: column reference \"tenantid\" is ambiguous\n --- 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 28e06f280..74701ea6a 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2150,7 +2150,7 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND tenantid = $ulb + searchClause: AND eg_pgr_service.tenantid = $ulb - name: fromDate label: reports.rainmaker-pgr.datefrom type: epoch From 64529ecba9caf10bf64945610e5ccf51bce41b70 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 4 Apr 2022 15:18:36 +0530 Subject: [PATCH 0793/1630] correcting error egov-enc-service/crypto/v1/_decrypt in state description of PGR "ERROR_IN_RETRIEVING_REPORT_DATA","message":"500 : [{\"timestamp\":\"2022-04-04T09:17:50.045+0000\",\"status\":500,\"error\":\"Internal Server Error\",\"message\":\"PWSSBAB4: Invalid Ciphertext\",\"path\":\"/egov-enc-service/crypto/v1/_decrypt\"}]" --- 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 74701ea6a..32b540cb3 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2117,6 +2117,11 @@ ReportDefinitions: type: string source: eg_pgr_service total: false + - name: employeeid_lastassignedto + label: reports.rainmaker-pgr.employeeid_lastassignedto + type: string + source: eg_pgr_service + total: false - name: status label: reports.rainmaker-pgr.status type: string @@ -2166,7 +2171,8 @@ ReportDefinitions: query: | SELECT DISTINCT ON (servicerequestid) - (case when ua.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_hrms_employee.code 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 + (case when ua.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_hrms_employee.code end) as employeeid_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, From d194c8e31154604960bd76372575c14262d42615 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 7 Apr 2022 14:42:03 +0530 Subject: [PATCH 0794/1630] UlbwisePgrSlaReport_v2 added --- configs/reports/configs/pgr-reports.yml | 75 +++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 32b540cb3..d2daf7a2b 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2199,3 +2199,78 @@ ReportDefinitions: 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 From f1fb2d2d5841e891ccd705108d44ce74a3adb017 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 12 Apr 2022 15:56:25 +0530 Subject: [PATCH 0795/1630] 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 d2daf7a2b..94b0481ee 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -1798,7 +1798,6 @@ ReportDefinitions: groupby: GROUP BY assignee orderby: ORDER BY assignee NULLS FIRST - - reportName: UlbPgrSlaReport_v2 summary: Fetches employee sla version: 1.0.0 From 03f7155c0469d28837992760478ee8240ee87756 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 19 Apr 2022 11:37:56 +0530 Subject: [PATCH 0796/1630] updated fy support --- configs/reports/configs/pt-reports.yml | 100 ++++++++++++++++++++++--- 1 file changed, 91 insertions(+), 9 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 0e261b5ec..bd85b40fa 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4784,7 +4784,7 @@ ReportDefinitions: - 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' + 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' source: pt isMandatory: true searchClause: AND 1=1 @@ -5075,6 +5075,16 @@ ReportDefinitions: 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 @@ -5246,6 +5256,22 @@ ReportDefinitions: 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 + ), zones as ( select zonecode,string_agg(distinct zonename,',') as zname from eg_bndry_mohalla where tenantid=$tenantid group by zonecode @@ -5271,8 +5297,10 @@ ReportDefinitions: coalesce(fy2020.amount,0) as "2020_21Collection", coalesce(fy2021.totalcount,0) as "2021_22PTR", coalesce(fy2021.amount,0) as "2021_22Collection", - 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) 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) as "totalcollection" + 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) 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) as "totalcollection" from zones left outer join fy2013 on fy2013.zonecode=zones.zonecode left outer join fy2014 on fy2014.zonecode=zones.zonecode @@ -5283,6 +5311,7 @@ ReportDefinitions: 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 where 1=1 orderby: order by zonename @@ -5387,6 +5416,16 @@ ReportDefinitions: 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 @@ -5557,6 +5596,22 @@ ReportDefinitions: 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 + ), blocks as ( select blockcode,string_agg(distinct blockname,',') as zname from eg_bndry_mohalla where tenantid=$tenantid group by blockcode @@ -5582,8 +5637,10 @@ ReportDefinitions: coalesce(fy2021.amount,0) as "2021_22Collection", coalesce(fy2021.totalcount,0) as "2021_22PTR", 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)+coalesce(fy2021.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) as "totalcollection" + 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) 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) as "totalcollection" from blocks left outer join fy2013 on fy2013.blockcode=blocks.blockcode left outer join fy2014 on fy2014.blockcode=blocks.blockcode @@ -5594,6 +5651,7 @@ ReportDefinitions: 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 where 1=1 orderby: order by blockname @@ -5667,8 +5725,8 @@ ReportDefinitions: AND status = 'ACTIVE' AND active = true ) ownerdt ON eg_pt_property.id=ownerdt.propertyid where - fromperiod='1585699200000' - and toperiod='1617215399000' + fromperiod=1617235200000 + and toperiod=1648684800000 and egcl_bill.status='ACTIVE' --and billid='00088a80-5671-408d-8494-2fb83b91b04f' orderby: order by amountpaid desc @@ -6056,7 +6114,7 @@ ReportDefinitions: - 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' + 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' source: pt isMandatory: false searchClause: AND 1=1 @@ -6630,7 +6688,17 @@ ReportDefinitions: 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 @@ -6691,6 +6759,8 @@ ReportDefinitions: 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(amount) as totalcollection, sum(totalcount) as totalptr from summary @@ -6798,6 +6868,16 @@ ReportDefinitions: 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 @@ -6858,6 +6938,8 @@ ReportDefinitions: 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(amount) as totalcollection, sum(totalcount) as totalptr from summary @@ -7192,7 +7274,7 @@ ReportDefinitions: - name: finYear label: Financial Year type: singlevaluelist - pattern: 'list://1554076800000:2019-20,1585699200000:2020-21,1617235200000:2021-22' + pattern: 'list://1554076800000:2019-20,1585699200000:2020-21,1617235200000:2021-22,1648771200000:2022-23' source: pt isMandatory: true searchClause: AND 1=1 From e43054c193b9b84023b54332e1ef148cf2c8934d Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 20 Apr 2022 09:32:12 +0530 Subject: [PATCH 0797/1630] Added connection status for bill search --- 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 155a029a7..bac783382 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, @@ -180,7 +180,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 2cd0ba160c5cce5c4d3da3eecaed3e433d2268e5 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Fri, 6 May 2022 12:44:04 +0530 Subject: [PATCH 0798/1630] added signature --- 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 304e42df1..b405b666f 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -836,6 +836,10 @@ } ] }, + { + "text": "Authorized Signatory", + "style": "footer-bottom" + }, { "image": "{{scissorImage}}", "width": 19, From c91ad4da44d87eb460c54ad7e0d2c84f0d414327 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Fri, 6 May 2022 12:45:41 +0530 Subject: [PATCH 0799/1630] added signature for sw-bill --- configs/pdf-service/format-config/sw-bill.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/pdf-service/format-config/sw-bill.json b/configs/pdf-service/format-config/sw-bill.json index 007fda510..27064b85c 100644 --- a/configs/pdf-service/format-config/sw-bill.json +++ b/configs/pdf-service/format-config/sw-bill.json @@ -835,6 +835,10 @@ } } ] + }, + { + "text": "Authorized Signatory", + "style": "footer-bottom" }, { "image": "{{scissorImage}}", From 7819de9c8843f4733fe30cc2cfdb0c069c1a5fc0 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 10 May 2022 16:03:58 +0530 Subject: [PATCH 0800/1630] updated WS to SW --- configs/pdf-service/data-config/sw-bill.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/pdf-service/data-config/sw-bill.json b/configs/pdf-service/data-config/sw-bill.json index 4a274c08f..7376803e4 100644 --- a/configs/pdf-service/data-config/sw-bill.json +++ b/configs/pdf-service/data-config/sw-bill.json @@ -769,27 +769,27 @@ "responseMapping": [ { "variable": "ws_advanceAmount", - "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_ADVANCE_CARRYFORWARD')].taxAmount" + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'SW_ADVANCE_CARRYFORWARD')].taxAmount" }, { "variable": "ws_roundoff", - "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_Round_Off')].taxAmount" + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'SW_Round_Off')].taxAmount" }, { "variable": "ws_charge", - "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_CHARGE')].taxAmount" + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'SW_CHARGE')].taxAmount" }, { "variable": "ws_water_cess", - "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_WATER_CESS')].taxAmount" + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'SW_WATER_CESS')].taxAmount" }, { "variable": "ws_time_interest", - "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_TIME_INTEREST')].taxAmount" + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'SW_TIME_INTEREST')].taxAmount" }, { "variable": "ws_time_penalty", - "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_TIME_PENALTY')].taxAmount" + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'SW_TIME_PENALTY')].taxAmount" } ] }, From 6b30cad8763974f2424bba3c9d84e233e6f50cbe Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 10 May 2022 16:22:21 +0530 Subject: [PATCH 0801/1630] filtered active demands --- 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 7376803e4..2e7262c3e 100644 --- a/configs/pdf-service/data-config/sw-bill.json +++ b/configs/pdf-service/data-config/sw-bill.json @@ -764,7 +764,7 @@ }, { "path": "http://billing-service:8080/billing-service/demand/_search", - "queryParam": "tenantId=$.tenantId,consumerCode=$.consumerCode,businessService=SW", + "queryParam": "tenantId=$.tenantId&consumerCode=$.consumerCode&businessService=SW&filter=%5B?(@.status=='ACTIVE')%5D", "apiRequest": null, "responseMapping": [ { From 16988c66734ea1318d6749a87eee8dbe7e011585 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 10 May 2022 16:26:32 +0530 Subject: [PATCH 0802/1630] 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 2e7262c3e..ce8d869ad 100644 --- a/configs/pdf-service/data-config/sw-bill.json +++ b/configs/pdf-service/data-config/sw-bill.json @@ -764,7 +764,7 @@ }, { "path": "http://billing-service:8080/billing-service/demand/_search", - "queryParam": "tenantId=$.tenantId&consumerCode=$.consumerCode&businessService=SW&filter=%5B?(@.status=='ACTIVE')%5D", + "queryParam": "tenantId=$.tenantId,consumerCode=$.consumerCode,businessService=SW,filter=%5B?(@.status=='ACTIVE')%5D", "apiRequest": null, "responseMapping": [ { From f192397267340c715bcabe46f6e11db640755cab Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 10 May 2022 16:29:59 +0530 Subject: [PATCH 0803/1630] 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 98ecad054..8409af5e3 100644 --- a/configs/pdf-service/data-config/ws-bill.json +++ b/configs/pdf-service/data-config/ws-bill.json @@ -764,7 +764,7 @@ }, { "path": "http://billing-service:8080/billing-service/demand/_search", - "queryParam": "tenantId=$.tenantId,consumerCode=$.consumerCode,businessService=WS", + "queryParam": "tenantId=$.tenantId,consumerCode=$.consumerCode,businessService=WS,filter=%5B?(@.status=='ACTIVE')%5D"", "apiRequest": null, "responseMapping": [ { From 7dc7fdd83ea356e87e87b6ab86bd0844e19910a4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 18 May 2022 14:52:32 +0530 Subject: [PATCH 0804/1630] TL Receipt number order by --- 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 0dc2b9ab5..e90f9c524 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -1373,7 +1373,7 @@ ReportDefinitions: 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 From 67b805464b09776580e24d22b725e8c63f00b5b3 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 26 May 2022 10:22:45 +0530 Subject: [PATCH 0805/1630] echallan report added door street mobile building name as per bathinda request UC --- configs/reports/configs/uc-reports.yml | 30 ++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index ac2161d63..1aa0d5acb 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1806,6 +1806,27 @@ ReportDefinitions: 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 + searchParams: - name: fromDate label: reports.uc.fromDate @@ -1829,9 +1850,14 @@ ReportDefinitions: eg_echallan.description, eg_echallan.applicationstatus, egcl_paymentdetail.receiptnumber, + doorno, + buildingname, + street, + payment.mobilenumber, 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 + 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) + where eg_echallan.tenantid=$tenantid and egcl_bill.businessservice not in ('PT','TL','FIRENOC','WS','SW','WS.ONE_TIME_FEE') and payment.paymentstatus != 'CANCELLED' orderby: ORDER BY eg_echallan.createdtime DESC - reportName: NewMiscReceiptULB_v2 From ea4b2ef02c21fd32284228f26938d8af1c0af019 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 26 May 2022 10:45:10 +0530 Subject: [PATCH 0806/1630] ECHALLAN REPORT UPDATE --- 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 1aa0d5acb..8ad58746d 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1855,8 +1855,8 @@ ReportDefinitions: street, payment.mobilenumber, 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) + 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) where eg_echallan.tenantid=$tenantid and egcl_bill.businessservice not in ('PT','TL','FIRENOC','WS','SW','WS.ONE_TIME_FEE') and payment.paymentstatus != 'CANCELLED' orderby: ORDER BY eg_echallan.createdtime DESC From 0275e85d277c6fdd6c2feeba1194d852139918cf Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Mon, 30 May 2022 17:11:07 +0530 Subject: [PATCH 0807/1630] Removed 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 2e9419a3a..1c7ed2106 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -200,7 +200,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 712b183c612d5a3ec3d835c4826e9fb4ea5c8ec6 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Mon, 30 May 2022 17:24:44 +0530 Subject: [PATCH 0808/1630] Removed startdate from "bottomPerformingUlbs" --- .../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 1c7ed2106..f15a310ec 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -233,7 +233,7 @@ { "module": "COMMON", "requestQueryMap": "{\"module\" : \"businessService.keyword\",\"tenantId\" : \"tenantIdForMunicipalCorporation\" }", - "dateRefField": "startdate", + "dateRefField": "", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"asc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" }, From 58253af5d2cbed6879f7d83a96ce3a33e2a192ac Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Mon, 30 May 2022 17:31:32 +0530 Subject: [PATCH 0809/1630] Removed startdate for top&bottom of WnS --- .../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 f15a310ec..cb67446bc 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3136,7 +3136,7 @@ { "module": "COMMON", "requestQueryMap": "{\r\n \"module\" : \"businessService.keyword\", \n\"tenantId\" : \"ulbName.keyword\"}", - "dateRefField": "startdate", + "dateRefField": "", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"terms\":{\"field\":\"ulbName.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"desc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" }, @@ -3170,7 +3170,7 @@ { "module": "COMMON", "requestQueryMap": "{\"module\" : \"businessService.keyword\",\"tenantId\" : \"ulbName.keyword\" }", - "dateRefField": "startdate", + "dateRefField": "", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"terms\":{\"field\":\"ulbName.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"asc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" }, From 1379fda4a0d5d70e73cc4efaf5753b95cd5db97b Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 31 May 2022 15:08:08 +0530 Subject: [PATCH 0810/1630] 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 cb67446bc..59de64093 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -601,7 +601,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 cddf2c8f801a728662c6d5eaa76320d059a42562 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 31 May 2022 15:16:20 +0530 Subject: [PATCH 0811/1630] 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 59de64093..867ef502e 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -624,7 +624,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 cb1bbcfb8d07f8b08f5eeac89171a3af4081fc3f Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 7 Jun 2022 12:24:24 +0530 Subject: [PATCH 0812/1630] 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 8409af5e3..15da51c45 100644 --- a/configs/pdf-service/data-config/ws-bill.json +++ b/configs/pdf-service/data-config/ws-bill.json @@ -764,7 +764,7 @@ }, { "path": "http://billing-service:8080/billing-service/demand/_search", - "queryParam": "tenantId=$.tenantId,consumerCode=$.consumerCode,businessService=WS,filter=%5B?(@.status=='ACTIVE')%5D"", + "queryParam": "tenantId=$.tenantId,consumerCode=$.consumerCode,businessService=WS,filter=%5B?(@.status=='ACTIVE')%5D", "apiRequest": null, "responseMapping": [ { From 676711ff7468f9c3bda578ee9aca3d85530f37c1 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Wed, 22 Jun 2022 11:25:37 +0530 Subject: [PATCH 0813/1630] Updated in Receipts --- .../data-config/ws-onetime-receipt.json | 44 +++++++++++++++++++ .../format-config/ws-onetime-receipt.json | 40 +++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index 08f2e8f32..4d74d3e07 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 be4e1be5f..fe887276f 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -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 07883a7b5fd30267efc281ddf0bf398da15d0e0a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 23 Jun 2022 07:40:15 +0530 Subject: [PATCH 0814/1630] temp defaulter report fromPeriod epoch 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 bd85b40fa..5b7a06acc 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7274,7 +7274,7 @@ ReportDefinitions: - name: finYear label: Financial Year type: singlevaluelist - pattern: 'list://1554076800000:2019-20,1585699200000:2020-21,1617235200000:2021-22,1648771200000:2022-23' + pattern: 'list://1554057000000:2019-20,1585679400000:2020-21,1617215400000:2021-22,1648751400000:2022-23' source: pt isMandatory: true searchClause: AND 1=1 From 6de2addd2d06428d88da5e3658e59c4176c3c778 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 28 Jun 2022 12:39:00 +0530 Subject: [PATCH 0815/1630] updated receiptregister_short for FY --- 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 5b7a06acc..3d6d088e3 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3399,7 +3399,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: collectorname label: reports.pt.collectorname type: singlevaluelist From bf03ef5895568886cf1a53e6dbc53f4c049c5b62 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Tue, 28 Jun 2022 16:47:03 +0530 Subject: [PATCH 0816/1630] Changed label on PT receipt from Generated By to Printed By --- 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 4d74d3e07..b2faafa5c 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -402,7 +402,7 @@ } }, { - "variable": "generated_by", + "variable": "Printed By", "value": { "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" }, From 3f42682412039854c825464240d8a8962a49ad3f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 30 Jun 2022 14:58:12 +0530 Subject: [PATCH 0817/1630] added new report as OCCUPANCY_TYPE_REPORT to filter RENTED Properties --- configs/reports/configs/pt-reports.yml | 131 +++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 3d6d088e3..4a41f5fef 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4708,6 +4708,7 @@ ReportDefinitions: where pt.tenantid = $tenantid and pt.status!='INACTIVE' and pt.propertyid not in ( + select consumercode from egcl_bill where tenantid=$tenantid and businessservice='PT' @@ -7886,3 +7887,133 @@ ReportDefinitions: query: | select * from patiala_without_upin_transactions orderby: ORDER BY paymentdate + +- reportName: OCCUPANCY_TYPE_REPORT + 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: true + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: true + - name: plotsize + label: reports.pt.plotsize + type: string + source: pt + total: true + - name: unit + label: reports.pt.units + type: string + source: pt + total: true + - name: fy + label: reports.pt.financialyear + 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: occupacny + 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 $occupancy + - 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 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 + ) + select + props.propertyid, + oldpropertyid, + propertystatus, + firmbusinessname, + address, + localityname, + blockname, + propertyusagetype, + propertytype, + plotsize, + units.unit as unit, + assessments.fy as fy + from report_properties props + inner join units on units.propertyid=props.propertyid + left outer join assessments on assessments.propertyid=props.propertyid + where props.tenantid=$tenantid and propertystatus!='INACTIVE' + --and assessments.fy not like '%2021-22%' + + From 22f4af05bc471f36dcb7de4f16ca1433f25ac51e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 30 Jun 2022 15:17:21 +0530 Subject: [PATCH 0818/1630] added owner in occupancy type report --- configs/reports/configs/pt-reports.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 4a41f5fef..086058323 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7889,6 +7889,7 @@ ReportDefinitions: orderby: ORDER BY paymentdate - reportName: OCCUPANCY_TYPE_REPORT + decryptionPathId: ULBDEFAULTERPTREPORT_V2 summary: Occupancy Type Report version: 1.0.0 moduleName: rainmaker-pt @@ -7996,6 +7997,16 @@ ReportDefinitions: 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, @@ -8009,7 +8020,9 @@ ReportDefinitions: propertytype, plotsize, units.unit as unit, - assessments.fy as fy + 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 From 4b5027e0f4e88a2521ad2409db2fd5d3652424fa Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 30 Jun 2022 16:05:57 +0530 Subject: [PATCH 0819/1630] added ownername decryption --- configs/reports/configs/pt-reports.yml | 32 ++++++++++++-------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 086058323..1e7a51325 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7936,34 +7936,38 @@ ReportDefinitions: label: reports.pt.propertyusage type: string source: pt - total: true + total: false - name: propertytype label: reports.pt.propertytype type: string source: pt - total: true + total: false - name: plotsize label: reports.pt.plotsize type: string source: pt - total: true + total: false - name: unit label: reports.pt.units type: string source: pt - total: true + total: false - name: fy label: reports.pt.financialyear type: string source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch + total: false + - name: ownername + label: reports.pt.ownername + type: string source: pt - isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + searchParams: - name: occupacny label: Occupancy Type type: singlevaluelist @@ -7971,12 +7975,6 @@ ReportDefinitions: source: pt isMandatory: false searchClause: and units.unit like $occupancy - - 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 units as From 3342365c2cfce5a86998ad0a53ee8c3ead67af88 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 30 Jun 2022 16:34:39 +0530 Subject: [PATCH 0820/1630] 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 1e7a51325..4bf072995 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8024,6 +8024,7 @@ ReportDefinitions: 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%' From d9a9da9fe650173513b8693a5ad8ce0c404a2130 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 30 Jun 2022 16:46:27 +0530 Subject: [PATCH 0821/1630] 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 4bf072995..5214b3f57 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7968,7 +7968,7 @@ ReportDefinitions: source: pt total: false searchParams: - - name: occupacny + - name: occupancy label: Occupancy Type type: singlevaluelist pattern: 'list://RENTED:Rented,SELFOCCUPIED:SelfOccupied,UNOCCUPIED:UnOccupied,PG:Paying Guest' From a06a097bf31b95744e8dccdb737d822af96e30d6 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 30 Jun 2022 16:57:11 +0530 Subject: [PATCH 0822/1630] 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 5214b3f57..f534adc39 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7974,7 +7974,7 @@ ReportDefinitions: pattern: 'list://RENTED:Rented,SELFOCCUPIED:SelfOccupied,UNOCCUPIED:UnOccupied,PG:Paying Guest' source: pt isMandatory: false - searchClause: and units.unit like $occupancy + searchClause: and units.unit like '%$occupancy%' query: | -- Use CTE to force query plan, compute & use CTE later with units as From 43079cd129e3dcada37f07ad624c01a2b3595469 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 1 Jul 2022 09:50:29 +0530 Subject: [PATCH 0823/1630] like clause in occupancy search filter --- 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 f534adc39..d4ae14fb3 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7974,7 +7974,7 @@ ReportDefinitions: pattern: 'list://RENTED:Rented,SELFOCCUPIED:SelfOccupied,UNOCCUPIED:UnOccupied,PG:Paying Guest' source: pt isMandatory: false - searchClause: and units.unit like '%$occupancy%' + searchClause: and units.unit like concat('%',$occupancy,'%') query: | -- Use CTE to force query plan, compute & use CTE later with units as From 8f194a0fdade66a0fa068175e32af05af1e357bf Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 1 Jul 2022 13:47:31 +0530 Subject: [PATCH 0824/1630] added Defulter report with block locality code and name --- configs/reports/configs/pt-reports.yml | 125 +++++++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index d4ae14fb3..3918e55e4 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8028,4 +8028,129 @@ ReportDefinitions: 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://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' + source: pt + isMandatory: true + searchClause: and assessments.fy not like concat('%',$fy,'%') + 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='pb.patiala' + 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='pb.patiala' + 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='pb.patiala' and propertystatus!='INACTIVE' + From a790257c91bed2dca28788de54daf8c629b505e3 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 4 Jul 2022 15:20:50 +0530 Subject: [PATCH 0825/1630] constant pb.patiala to update with $tenantid --- 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 3918e55e4..3432875ea 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8121,7 +8121,7 @@ ReportDefinitions: --max(totalamount) as maxtotal, --max(propertytax) as max_pt_tax from eg_pt_asmt_assessment - where tenantid='pb.patiala' + where tenantid=$tenantid group by propertyid ), owners as @@ -8131,7 +8131,7 @@ ReportDefinitions: split_part(string_agg(mobileNumber,','),',',1) as mobilenumber, propertyid from report_owners - where tenantid='pb.patiala' + where tenantid=$tenantid group by propertyid ) select @@ -8151,6 +8151,6 @@ ReportDefinitions: 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='pb.patiala' and propertystatus!='INACTIVE' + where props.tenantid=$tenantid and propertystatus!='INACTIVE' From 3fe2e488802f4d7a978c782199035a1a978e7665 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 4 Jul 2022 15:35:34 +0530 Subject: [PATCH 0826/1630] Count_UsageCategory_V2 report --- configs/reports/configs/pt-reports.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 3432875ea..a1cd2ade1 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8153,4 +8153,30 @@ ReportDefinitions: left outer join owners on owners.propertyid=props.propertyid where props.tenantid=$tenantid and propertystatus!='INACTIVE' +- 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: true + - 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 ,count (propertyid) as count from eg_pt_property + where tenantid=$tenantid and status='ACTIVE' + groupby: GROUP BY usagecategory + From a0c0e683b5170b1db0d6d4580b1970263ca31606 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 4 Jul 2022 16:30:11 +0530 Subject: [PATCH 0827/1630] count 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 a1cd2ade1..4bebef17f 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8177,6 +8177,6 @@ ReportDefinitions: SELECT (case when position('.' in usagecategory)=0 then usagecategory else split_part(usagecategory,'.',2) end) as category ,count (propertyid) as count from eg_pt_property where tenantid=$tenantid and status='ACTIVE' - groupby: GROUP BY usagecategory + groupby: GROUP BY category From b57e63e65b412b3ba28c67502a5fa8a2f24e8408 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 4 Jul 2022 16:36:27 +0530 Subject: [PATCH 0828/1630] count pt reports --- configs/reports/configs/pt-reports.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 4bebef17f..8d180d509 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8172,6 +8172,21 @@ ReportDefinitions: type: string source: pt total: true + - 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 query: | -- Use CTE to force query plan, compute & use CTE later SELECT From 617667575fd1ae6f02e76f3532a95b7de79d3b04 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 4 Jul 2022 16:41:23 +0530 Subject: [PATCH 0829/1630] count report --- configs/reports/configs/pt-reports.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 8d180d509..4bebef17f 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8172,21 +8172,6 @@ ReportDefinitions: type: string source: pt total: true - - 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 query: | -- Use CTE to force query plan, compute & use CTE later SELECT From 0c3660a35be11f7e5caf7573c127cecc265bd53c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 4 Jul 2022 16:51:59 +0530 Subject: [PATCH 0830/1630] count report update --- 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 4bebef17f..0891b5fb3 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8178,5 +8178,4 @@ ReportDefinitions: (case when position('.' in usagecategory)=0 then usagecategory else split_part(usagecategory,'.',2) end) as category ,count (propertyid) as count from eg_pt_property where tenantid=$tenantid and status='ACTIVE' groupby: GROUP BY category - From 689b481f57c0b511dc11672a625e4eb64b854250 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 4 Jul 2022 16:53:22 +0530 Subject: [PATCH 0831/1630] pt count report category --- 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 0891b5fb3..64471a534 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8162,8 +8162,8 @@ ReportDefinitions: print: pdfPageSize: "Legal" sourceColumns: - - name: category - label: reports.pt.category + - name: usagecategory + label: reports.pt.usagecategory type: string source: pt total: true @@ -8175,7 +8175,7 @@ ReportDefinitions: 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 ,count (propertyid) as count from eg_pt_property + usagecategory , count(propertyid) from eg_pt_property where tenantid='pb.zirakpur' and status='ACTIVE' where tenantid=$tenantid and status='ACTIVE' - groupby: GROUP BY category + groupby: GROUP BY usagecategory From a4a115be6f12f3f9324f827e56142268eaa4465c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 4 Jul 2022 16:57:34 +0530 Subject: [PATCH 0832/1630] pt report count report --- 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 64471a534..50142fb23 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8175,7 +8175,7 @@ ReportDefinitions: query: | -- Use CTE to force query plan, compute & use CTE later SELECT - usagecategory , count(propertyid) from eg_pt_property where tenantid='pb.zirakpur' and status='ACTIVE' - where tenantid=$tenantid and status='ACTIVE' + usagecategory , count(propertyid) from eg_pt_property where tenantid=$tenantid and status='ACTIVE' + groupby: GROUP BY usagecategory From 911b85ec41fff8a419bf2a036fc9f643c0f94872 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 4 Jul 2022 17:03:34 +0530 Subject: [PATCH 0833/1630] count report pt --- 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 50142fb23..0891b5fb3 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8162,8 +8162,8 @@ ReportDefinitions: print: pdfPageSize: "Legal" sourceColumns: - - name: usagecategory - label: reports.pt.usagecategory + - name: category + label: reports.pt.category type: string source: pt total: true @@ -8175,7 +8175,7 @@ ReportDefinitions: query: | -- Use CTE to force query plan, compute & use CTE later SELECT - usagecategory , count(propertyid) from eg_pt_property where tenantid=$tenantid and status='ACTIVE' - - groupby: GROUP BY usagecategory + (case when position('.' in usagecategory)=0 then usagecategory else split_part(usagecategory,'.',2) end) as category ,count (propertyid) as count from eg_pt_property + where tenantid=$tenantid and status='ACTIVE' + groupby: GROUP BY category From 0b7cb9533a6eccd3a23b9d9514b771765064aa1a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 5 Jul 2022 09:57:34 +0530 Subject: [PATCH 0834/1630] count 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 0891b5fb3..614c96b1a 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8166,7 +8166,7 @@ ReportDefinitions: label: reports.pt.category type: string source: pt - total: true + total: false - name: count label: reports.pt.count type: string From d6b3e595e26128271bf7de3cbe2c5ad9e23cca0c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 5 Jul 2022 14:44:39 +0530 Subject: [PATCH 0835/1630] count report update vacant --- 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 614c96b1a..910824b52 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8175,7 +8175,7 @@ ReportDefinitions: 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 ,count (propertyid) as count from eg_pt_property + (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 - + groupby: GROUP BY category,property_type + orderby: ORDER BY category From 15e4a375238be28903ad83df1eb3216f7d3c70a9 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 5 Jul 2022 14:49:41 +0530 Subject: [PATCH 0836/1630] PT report count update vacant --- 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 910824b52..8357cd624 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8167,6 +8167,11 @@ ReportDefinitions: 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 From a8b8cf5e324851779e8ca62b4f13500f1cd64d48 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 20 Jul 2022 14:09:51 +0530 Subject: [PATCH 0837/1630] Top payers 100 addon --- configs/reports/configs/pt-reports.yml | 43 +++++++++----------------- 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 8357cd624..c7f399018 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5682,6 +5682,11 @@ ReportDefinitions: type: string source: pt total: false + - name: usagecategory + label: reports.pt.usagecategory + type: string + source: pt + total: false - name: mobileno label: reports.pt.mobileno type: string @@ -5703,34 +5708,16 @@ ReportDefinitions: 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 - billid, - amountpaid, - egcl_bill.status, - consumercode as propertytaxuniqueid, - egcl_billdetial.tenantid, - ownerdt.userName as ownername, - ownerdt.Mobilenumber as mobileno, - concat(addr.doorno,',',addr.street,' ',addr.buildingname,' ',eg_bndry_mohalla.localityname) as address, - oldpropertyid as existingpropertyid - from egcl_billdetial - inner join egcl_bill on egcl_bill.id=billid and egcl_bill.businessservice='PT' - inner join eg_pt_property on eg_pt_property.propertyid=egcl_bill.consumercode and eg_pt_property.status='ACTIVE' - inner join - (SELECT propertyid , locality,doorno,street,buildingname, max(createdtime) - from eg_pt_address group by propertyid, locality, doorno,street,buildingname) addr ON eg_pt_property.id=addr.propertyid - inner join eg_bndry_mohalla on eg_bndry_mohalla.localitycode=addr.locality - inner join (SELECT DISTINCT ON (propertyid) propertyid ,name As userName , mobilenumber As Mobilenumber - FROM eg_pt_owner , eg_user - WHERE uuid = userid - AND status = 'ACTIVE' - AND active = true ) ownerdt ON eg_pt_property.id=ownerdt.propertyid - where - fromperiod=1617235200000 - and toperiod=1648684800000 - and egcl_bill.status='ACTIVE' - --and billid='00088a80-5671-408d-8494-2fb83b91b04f' - orderby: order by amountpaid desc + select distinct bill.consumercode,pt.usagecategory,pd.receiptnumber ,p.totalamountpaid, + concat(pa.doorno,' ',pa.buildingname,pa.street,' ',pa.city,' ,',pa.pincode), u.name, u.mobilenumber + from egcl_payment p inner join + egcl_paymentdetail pd on pd.paymentid=p.id and p.paymentstatus !='CANCELLED' and p.tenantid='pb.amritsar' + 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 From dc942d6631274b44efc47b0be5926bf6e3cc70fe Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 20 Jul 2022 14:36:17 +0530 Subject: [PATCH 0838/1630] change top payers --- 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 c7f399018..b1935f12a 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5711,7 +5711,7 @@ ReportDefinitions: select distinct bill.consumercode,pt.usagecategory,pd.receiptnumber ,p.totalamountpaid, concat(pa.doorno,' ',pa.buildingname,pa.street,' ',pa.city,' ,',pa.pincode), u.name, u.mobilenumber from egcl_payment p inner join - egcl_paymentdetail pd on pd.paymentid=p.id and p.paymentstatus !='CANCELLED' and p.tenantid='pb.amritsar' + 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 From 04e052c7e186401f459dc17e014ff10887f54672 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 20 Jul 2022 15:12:01 +0530 Subject: [PATCH 0839/1630] Top payer addon changes --- configs/reports/configs/pt-reports.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index b1935f12a..1b8d53651 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5662,23 +5662,23 @@ ReportDefinitions: version: 1.0.0 moduleName: rainmaker-pt sourceColumns: - - name: propertytaxuniqueid - label: reports.pt.propertytaxuniqueid + - name: consumercode + label: reports.pt.consumercode type: string source: pt total: false - - name: existingpropertyid - label: reports.pt.existingpropertyid + - name: receiptnumber + label: reports.pt.receiptnumber type: string source: pt total: false - - name: amountpaid - label: reports.pt.amountpaid + - name: totalamountpaid + label: reports.pt.totalamountpaid type: string source: pt total: true - - name: ownername - label: reports.pt.ownername + - name: name + label: reports.pt.name type: string source: pt total: false @@ -5687,8 +5687,8 @@ ReportDefinitions: type: string source: pt total: false - - name: mobileno - label: reports.pt.mobileno + - name: mobilenumber + label: reports.pt.mobilenumber type: string source: pt total: false @@ -5709,7 +5709,7 @@ 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 select distinct bill.consumercode,pt.usagecategory,pd.receiptnumber ,p.totalamountpaid, - concat(pa.doorno,' ',pa.buildingname,pa.street,' ',pa.city,' ,',pa.pincode), u.name, u.mobilenumber + concat(pa.doorno,' ',pa.buildingname,pa.street,' ',pa.city,' ,',pa.pincode) as address, u.name, u.mobilenumber 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 From a018bfd03f746bae78e3a2ade77a2b165d94f287 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 20 Jul 2022 15:22:56 +0530 Subject: [PATCH 0840/1630] application status --- configs/reports/configs/pt-reports.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 1b8d53651..d35e3a05d 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5676,7 +5676,7 @@ ReportDefinitions: label: reports.pt.totalamountpaid type: string source: pt - total: true + total: false - name: name label: reports.pt.name type: string @@ -5836,11 +5836,6 @@ ReportDefinitions: 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 @@ -5876,7 +5871,7 @@ ReportDefinitions: 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, + 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 From 1c1ae316a7d16b65776ca190753f74cf5c123ca0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 20 Jul 2022 15:37:15 +0530 Subject: [PATCH 0841/1630] Top payer Report --- 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 d35e3a05d..99fea3c38 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5657,8 +5657,8 @@ ReportDefinitions: orderby: order by blockname - reportName: TopPayersReport_V2 - decryptionPathId: ULBDEFAULTERPTREPORT_V2 - summary: ULB Defaulter Pt report + decryptionPathId: PT_DATA_DUMP_REPORT_V2 + summary: Top Payers Report version: 1.0.0 moduleName: rainmaker-pt sourceColumns: From 118368887f34839949facc21ad3bb8be86a5d228 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 20 Jul 2022 15:56:46 +0530 Subject: [PATCH 0842/1630] Added Top payer residential commercial --- configs/reports/configs/pt-reports.yml | 127 +++++++++++++++++++++++++ 1 file changed, 127 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 99fea3c38..8e95e579e 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8166,3 +8166,130 @@ ReportDefinitions: where tenantid=$tenantid and status='ACTIVE' groupby: GROUP BY category,property_type orderby: ORDER BY category + +- reportName: TopPayersReportCOM_V2 + decryptionPathId: PT_DATA_DUMP_REPORT_V2 + summary: Top Payers 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: name + label: reports.pt.name + type: string + source: pt + total: false + - name: usagecategory + label: reports.pt.usagecategory + type: string + source: pt + total: false + - name: mobilenumber + 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, u.mobilenumber + 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 in ('NONRESIDENTIAL','NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL.OTHERS','NONRESIDENTIAL.INSTITUTIONAL') 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: TopPayersReportRESD_V2 + decryptionPathId: PT_DATA_DUMP_REPORT_V2 + summary: Top Payers 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: name + label: reports.pt.name + type: string + source: pt + total: false + - name: usagecategory + label: reports.pt.usagecategory + type: string + source: pt + total: false + - name: mobilenumber + 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, u.mobilenumber + 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 in ('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 + + orderby: order by p.totalamountpaid desc limit 150 + From ec104024a7c5db53ba3b207f7af49b2525d9c0d0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 20 Jul 2022 16:17:17 +0530 Subject: [PATCH 0843/1630] Top Payer report --- 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 8e95e579e..80bd7b1eb 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5657,8 +5657,8 @@ ReportDefinitions: orderby: order by blockname - reportName: TopPayersReport_V2 - decryptionPathId: PT_DATA_DUMP_REPORT_V2 - summary: Top Payers Report + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB Defaulter Pt report version: 1.0.0 moduleName: rainmaker-pt sourceColumns: @@ -8168,8 +8168,8 @@ ReportDefinitions: orderby: ORDER BY category - reportName: TopPayersReportCOM_V2 - decryptionPathId: PT_DATA_DUMP_REPORT_V2 - summary: Top Payers Report + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB Defaulter Pt report version: 1.0.0 moduleName: rainmaker-pt sourceColumns: @@ -8231,8 +8231,8 @@ ReportDefinitions: orderby: order by p.totalamountpaid desc limit 150 - reportName: TopPayersReportRESD_V2 - decryptionPathId: PT_DATA_DUMP_REPORT_V2 - summary: Top Payers Report + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB Defaulter Pt report version: 1.0.0 moduleName: rainmaker-pt sourceColumns: From b2ce33f5110b8d8a7f9472f4be0bf2ff44707eca Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 22 Jul 2022 10:24:48 +0530 Subject: [PATCH 0844/1630] updated TOP_PAYER_Report fields for decryption --- 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 80bd7b1eb..0030dffcf 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5677,8 +5677,8 @@ ReportDefinitions: type: string source: pt total: false - - name: name - label: reports.pt.name + - name: ownername + label: reports.pt.ownername type: string source: pt total: false @@ -5687,7 +5687,7 @@ ReportDefinitions: type: string source: pt total: false - - name: mobilenumber + - name: mobileno label: reports.pt.mobilenumber type: string source: pt @@ -5709,7 +5709,7 @@ 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 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, u.mobilenumber + 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 From 17fd25aeb33644b79904968171fd296dde0a760e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 22 Jul 2022 10:54:28 +0530 Subject: [PATCH 0845/1630] updated residential top payers --- configs/reports/configs/pt-reports.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 0030dffcf..482503581 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8251,8 +8251,8 @@ ReportDefinitions: type: string source: pt total: false - - name: name - label: reports.pt.name + - name: ownername + label: reports.pt.ownername type: string source: pt total: false @@ -8261,7 +8261,7 @@ ReportDefinitions: type: string source: pt total: false - - name: mobilenumber + - name: mobileno label: reports.pt.mobilenumber type: string source: pt @@ -8282,14 +8282,14 @@ ReportDefinitions: 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, u.mobilenumber - 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 in ('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 - + 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='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 orderby: order by p.totalamountpaid desc limit 150 From e42a7938c13d1c16b997a6be03e66449ddacf31c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 22 Jul 2022 11:14:46 +0530 Subject: [PATCH 0846/1630] top payer owner name and mobile number change --- 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 482503581..0ecc12097 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8188,7 +8188,7 @@ ReportDefinitions: type: string source: pt total: false - - name: name + - name: ownername label: reports.pt.name type: string source: pt @@ -8198,7 +8198,7 @@ ReportDefinitions: type: string source: pt total: false - - name: mobilenumber + - name: mobileno label: reports.pt.mobilenumber type: string source: pt From dd7cb5866a7501979aa4319e522e7eb65ab4a1ee Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 22 Jul 2022 11:28:55 +0530 Subject: [PATCH 0847/1630] updated toppayers report search filter --- configs/reports/configs/pt-reports.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 0ecc12097..39ee419ad 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8216,18 +8216,17 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND egcl_billdetial.tenantid=$ulb + 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 bill.consumercode,pt.usagecategory,pd.receiptnumber ,p.totalamountpaid, - concat(pa.doorno,' ',pa.buildingname,pa.street,' ',pa.city,' ,',pa.pincode) as address, u.name, u.mobilenumber - 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 in ('NONRESIDENTIAL','NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL.OTHERS','NONRESIDENTIAL.INSTITUTIONAL') 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 - + 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 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%' + 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: TopPayersReportRESD_V2 @@ -8279,13 +8278,13 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND egcl_billdetial.tenantid=$ulb + 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 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_paymentdetail pd on pd.paymentid=p.id and p.paymentstatus !='CANCELLED' and p.tenantid=$ulb 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='RESIDENTIAL' inner join eg_pt_address pa on pa.propertyid=pt.id From a744d20ebbdcc8c1ebfbdb404453c42648f31ecc Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 22 Jul 2022 11:44:57 +0530 Subject: [PATCH 0848/1630] Added changes for NDA --- .../dashboard-ingest/DomainConfig.json | 163 ++++++++++++++++++ 1 file changed, 163 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json index cb5249b7c..98f905a25 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json @@ -79,6 +79,169 @@ "expression": "complainNumber" } ] + }, + + { + "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": "5", + "domain": "FIRENOC", + "indexName": "firenoc-services", + "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" + } + ] + }, + { + "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" + } + ] + }, + { + "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 924b40279f03d7c9794a5d370b73bcd483ffc3c6 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 22 Jul 2022 11:50:16 +0530 Subject: [PATCH 0849/1630] Update payment-indexer.yml --- configs/egov-indexer/payment-indexer.yml | 374 ++++++++++++++++++++--- 1 file changed, 325 insertions(+), 49 deletions(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index cc7e7a09e..fd9cc5213 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 @@ -180,7 +205,7 @@ ServiceMaps: - inJsonPath: $.paymentMode outJsonPath: $.Data.paymentMode - inJsonPath: $.paymentStatus - outJsonPath: $.Data.paymentStatus + outJsonPath: $.Data.paymentStatus - inJsonPath: $.payerId outJsonPath: $.Data.payer.id - inJsonPath: $.payerName @@ -195,15 +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":{"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 + + From cb26f38c88fd8ad234ad9cbc9cc272ed9a0f7575 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 22 Jul 2022 11:54:10 +0530 Subject: [PATCH 0850/1630] Added changes for NDA Added changes for NDA --- .../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 000000000..e145de0a3 --- /dev/null +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_mcollect_v1.json @@ -0,0 +1,8 @@ +[ + { + "operation": "shift", + "spec": { + "ward" : "ward" + } + } +] From 6fb6ec8ce343178e436a1bdb586d66bf0172b54a Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 22 Jul 2022 12:12:10 +0530 Subject: [PATCH 0851/1630] Added changes for NDA Added changes for NDA From 1ba83209fa23909b7c794850fb93941758593a99 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 22 Jul 2022 12:16:58 +0530 Subject: [PATCH 0852/1630] Added changes for NDA Added changes for NDA --- .../rainmaker-firenoc-indexer.yml | 313 ++++++++++++++++-- 1 file changed, 292 insertions(+), 21 deletions(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index 925faa5b6..0486efe89 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -1,33 +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","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 + 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","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 + 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 \ No newline at end of file + - 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 + 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"}} + 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=$.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 b892bde51e6366d1898ec2f17749a91918f7bef5 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 22 Jul 2022 12:19:27 +0530 Subject: [PATCH 0853/1630] Added changes for NDA Added changes for NDA --- .../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 000000000..fc556b581 --- /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 1bdd57cba29d54d32c0c6b82a495203aa0aa78be Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 22 Jul 2022 12:28:58 +0530 Subject: [PATCH 0854/1630] Added changes for NDA Added changes for NDA --- .../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 000000000..182bf44cd --- /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 57a59d1c7a93abaf664730946cd50b8c674d7c51 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 22 Jul 2022 12:32:57 +0530 Subject: [PATCH 0855/1630] Added changes for NDA Added changes for NDA --- .../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 000000000..182bf44cd --- /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 7e2634ec970762b4f95e7e02ec3c99d7cced4d26 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 22 Jul 2022 12:35:01 +0530 Subject: [PATCH 0856/1630] Added changes for NDA Added changes for NDA --- configs/egov-indexer/water-service.yml | 135 +++++++++++++++++++++++-- 1 file changed, 129 insertions(+), 6 deletions(-) diff --git a/configs/egov-indexer/water-service.yml b/configs/egov-indexer/water-service.yml index eb07bfe06..a83eb8ce8 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,10 +404,41 @@ 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 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 + - 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 766cf8592305d949f71fdecb3fd206a483330ad4 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 22 Jul 2022 12:37:45 +0530 Subject: [PATCH 0857/1630] Added changes for NDA Added changes for NDA --- .../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 000000000..182bf44cd --- /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 e32324b499155a299b3dbb7579cf1ac536adf265 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 22 Jul 2022 12:39:03 +0530 Subject: [PATCH 0858/1630] Added changes for NDA Added changes for NDA --- .../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 000000000..182bf44cd --- /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 c125792883a5543633c61ccf659a6b5a3f90942a Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 22 Jul 2022 12:42:27 +0530 Subject: [PATCH 0859/1630] Added changes for NDA Added changes for NDA --- configs/egov-indexer/sewerage-service.yml | 135 ++++++++++++++++++++-- 1 file changed, 128 insertions(+), 7 deletions(-) diff --git a/configs/egov-indexer/sewerage-service.yml b/configs/egov-indexer/sewerage-service.yml index eda259ca2..a6d946fb9 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,14 +270,42 @@ 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 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 + - 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,10 +370,41 @@ 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 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 + - 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 be4244b8a94b5b17e08c85099ab49b3843318fe6 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 22 Jul 2022 15:44:02 +0530 Subject: [PATCH 0860/1630] introduced fy in top payers --- configs/reports/configs/pt-reports.yml | 32 ++++++++++++++++++-------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 39ee419ad..b7b684863 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8250,6 +8250,11 @@ ReportDefinitions: 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 @@ -8279,16 +8284,25 @@ ReportDefinitions: 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' + 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 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=$ulb 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='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 + 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), u.name, u.mobilenumber + from egcl_payment p + inner join egcl_paymentdetail pd on pd.paymentid=p.id and p.paymentstatus !='CANCELLED' and p.tenantid='pb.amritsar' 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 1=1 orderby: order by p.totalamountpaid desc limit 150 From bf82abe432e9c3f73c7b82b3baa19e0652b579db Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 22 Jul 2022 16:19:57 +0530 Subject: [PATCH 0861/1630] 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 b7b684863..c69d48e68 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8297,7 +8297,7 @@ ReportDefinitions: 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), u.name, u.mobilenumber from egcl_payment p - inner join egcl_paymentdetail pd on pd.paymentid=p.id and p.paymentstatus !='CANCELLED' and p.tenantid='pb.amritsar' and pd.businessservice='PT' + 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' From 9fd7a13f186ea3287ed7a3784df620ba1b7ee4a8 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 22 Jul 2022 16:24:56 +0530 Subject: [PATCH 0862/1630] updated column names --- 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 c69d48e68..a65417d51 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8295,7 +8295,7 @@ ReportDefinitions: --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), u.name, u.mobilenumber + 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 From 9481cca5748d48245faa42538312b080c1b508a2 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 22 Jul 2022 16:39:11 +0530 Subject: [PATCH 0863/1630] commercial and industrial top payers --- configs/reports/configs/pt-reports.yml | 38 ++++++++++++++++++++------ 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index a65417d51..8dd3138ec 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8188,8 +8188,13 @@ ReportDefinitions: type: string source: pt total: false + - name: fy + label: reports.pt.fy + type: string + source: pt + total: false - name: ownername - label: reports.pt.name + label: reports.pt.ownername type: string source: pt total: false @@ -8217,16 +8222,33 @@ ReportDefinitions: 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' + 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 bill.consumercode,pt.usagecategory,pd.receiptnumber ,p.totalamountpaid, + 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 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%' - 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 + 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 concat('%',$usageCat,'%') + 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 1=1 orderby: order by p.totalamountpaid desc limit 150 - reportName: TopPayersReportRESD_V2 From ccfb010bd84ad73a5226824ffadbb1ee3fb0c89a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 28 Jul 2022 10:30:47 +0530 Subject: [PATCH 0864/1630] top payers min p.totalamountpaid applied --- 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 8dd3138ec..67e982375 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8248,8 +8248,8 @@ ReportDefinitions: inner join eg_pt_property pt on bd.consumercode=pt.propertyid and pt.status='ACTIVE' and pt.usagecategory like concat('%',$usageCat,'%') 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 1=1 - orderby: order by p.totalamountpaid desc limit 150 + where p.totalamountpaid>=10000 + orderby: order by p.totalamountpaid desc limit 300 - reportName: TopPayersReportRESD_V2 decryptionPathId: ULBDEFAULTERPTREPORT_V2 @@ -8325,6 +8325,6 @@ ReportDefinitions: 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 1=1 - orderby: order by p.totalamountpaid desc limit 150 + where p.totalamountpaid>=1000 + orderby: order by p.totalamountpaid desc limit 300 From 46e74f11dab9830c689d1364ead40450b18ed2d0 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 29 Jul 2022 20:34:47 +0530 Subject: [PATCH 0865/1630] Added for reindexing for NDA --- configs/egov-indexer/property-services.yml | 435 ++++++++++++++++++--- 1 file changed, 371 insertions(+), 64 deletions(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 6f1c2522e..81748ee08 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"}} + 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,8 +662,25 @@ ServiceMaps: 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: @@ -429,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"}} + 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 @@ -463,6 +718,25 @@ ServiceMaps: 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 @@ -473,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"}} + 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 @@ -507,6 +775,25 @@ ServiceMaps: 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 @@ -518,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"}} + 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 @@ -552,3 +833,29 @@ ServiceMaps: 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 + From 0cb13e7e7d1474ce4f7ce868221b3fa72f2e3547 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Sat, 30 Jul 2022 21:43:37 +0530 Subject: [PATCH 0866/1630] Changes for re-indexing --- .../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 99c8df769..e25345f03 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": "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" + + }, + "ward": "ward", + "tradeType": "tradelicense.tradeLicenseDetail.tradeUnits[0].tradeType" + } + } ] From d6ac1ee8d70efb2437fcaf7538da51091ee534c8 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Sat, 30 Jul 2022 23:02:21 +0530 Subject: [PATCH 0867/1630] Revert changes for TL --- .../dashboard-ingest/transform_tl_v1.json | 43 +++++++++---------- 1 file changed, 20 insertions(+), 23 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 e25345f03..99c8df769 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json @@ -1,25 +1,22 @@ [ - { - "operation": "shift", - "spec": { - "tradelicense": { - "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" - - }, - "ward": "ward", - "tradeType": "tradelicense.tradeLicenseDetail.tradeUnits[0].tradeType" - } - } + { + "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 05bb6294ae268b94cedb9f169f1bf78264e45065 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Sun, 31 Jul 2022 10:02:43 +0530 Subject: [PATCH 0868/1630] #Update lagecy index firenoc address details --- 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 0486efe89..f1e3cc44e 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 aed39dea17202464ec2360edd4d522fd806a881f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 2 Aug 2022 15:53:29 +0530 Subject: [PATCH 0869/1630] defaulter report with pending demand --- configs/reports/configs/pt-reports.yml | 65 +++++++++++++------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 67e982375..3b2804ef7 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8088,26 +8088,26 @@ ReportDefinitions: - name: fy 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' + 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_1617215400000,2022-23:2022-23' source: pt isMandatory: true searchClause: and assessments.fy not like concat('%',$fy,'%') query: | -- Use CTE to force query plan, compute & use CTE later - with assessments as + with properties as + ( + select distinct consumercode as propertyid from egbs_demand_v1 where taxperiodfrom=split_part(concat($fy,'_',2)::bigint and businessservice='PT' and status!='CANCELLED' + and ispaymentcompleted=false and tenantid=$tenantid + union + select propertyid from eg_pt_property where tenantid=$tenantid and status='ACTIVE' + and propertyid not in(select distinct propertyid from eg_pt_asmt_assessment where financialyear=split_part($fy,'_',1) and tenantid=$tenantid and status='ACTIVE' ) + ), + props as + ( + select * from report_properties where tenantid=$tenantid and propertystatus='ACTIVE' + ), + owners 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, @@ -8115,25 +8115,24 @@ ReportDefinitions: 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' + ) + select + props.propertyid, + props.oldpropertyid, + props.propertystatus, + firmbusinessname, + address, + localityname, + blockname, + propertyusagetype, + propertytype, + plotsize, + $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 owners on owners.propertyid=properties.propertyid - reportName: Count_UsageCategory_V2 decryptionPathId: ReceiptRegisterShort_V2 From 9d9de99dda45c8c3edbaa45df1f60c3a388eb61f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 2 Aug 2022 16:05:53 +0530 Subject: [PATCH 0870/1630] fy search parameter 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 3b2804ef7..608707b43 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8088,7 +8088,7 @@ ReportDefinitions: - name: fy 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_1617215400000,2022-23:2022-23' + 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_1617215400000:2021-22,2022-23:2022-23' source: pt isMandatory: true searchClause: and assessments.fy not like concat('%',$fy,'%') From c32f832d97b7c5c71ddc42a240cad987bf12a9a5 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 2 Aug 2022 16:39:21 +0530 Subject: [PATCH 0871/1630] rolled back defaulter report --- configs/reports/configs/pt-reports.yml | 67 +++++++++++++------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 608707b43..559289e6c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8088,26 +8088,26 @@ ReportDefinitions: - name: fy 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_1617215400000:2021-22,2022-23:2022-23' + 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' source: pt isMandatory: true searchClause: and assessments.fy not like concat('%',$fy,'%') 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=split_part(concat($fy,'_',2)::bigint and businessservice='PT' and status!='CANCELLED' - and ispaymentcompleted=false and tenantid=$tenantid - union - select propertyid from eg_pt_property where tenantid=$tenantid and status='ACTIVE' - and propertyid not in(select distinct propertyid from eg_pt_asmt_assessment where financialyear=split_part($fy,'_',1) and tenantid=$tenantid and status='ACTIVE' ) - ), - props as - ( - select * from report_properties where tenantid=$tenantid and propertystatus='ACTIVE' - ), - owners as + 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, @@ -8115,25 +8115,26 @@ ReportDefinitions: from report_owners where tenantid=$tenantid group by propertyid - ) - select - props.propertyid, - props.oldpropertyid, - props.propertystatus, - firmbusinessname, - address, - localityname, - blockname, - propertyusagetype, - propertytype, - plotsize, - $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 owners on owners.propertyid=properties.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: Count_UsageCategory_V2 decryptionPathId: ReceiptRegisterShort_V2 summary: Count Usagecategory From 11791575f9860d852c27b30512e5f07268c9a020 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 2 Aug 2022 16:53:44 +0530 Subject: [PATCH 0872/1630] added defaulters with upiad demand report --- configs/reports/configs/pt-reports.yml | 124 ++++++++++++++++++++++++- 1 file changed, 123 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 559289e6c..c7994e9aa 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8134,7 +8134,129 @@ ReportDefinitions: 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: 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://1427826600000:2015-16,1459449000000:2016-17,1490985000000:2017-18,1522521000000:2018-19,1554057000000:2019-20,1585679400000:2020-21,1617215400000:2021-22,1648751400000:2022-23' + source: pt + isMandatory: true + searchClause: and 1=1 + 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=$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' + ), + 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, + firmbusinessname, + address, + localityname, + blockname, + propertyusagetype, + propertytype, + plotsize, + '2021-22', --assessments.fy as fy, + owners.ownername as ownername, + owners.mobilenumber as mobileno + from properties + inner join props on props.propertyid=properties.propertyid + inner join owners on owners.propertyid=properties.propertyid + where 1=1 + - reportName: Count_UsageCategory_V2 decryptionPathId: ReceiptRegisterShort_V2 summary: Count Usagecategory From 3bf5ebe8b59affa8195160f451873b514743a25f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 3 Aug 2022 15:23:29 +0530 Subject: [PATCH 0873/1630] updated defaulter report type conversion --- 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 c7994e9aa..bae7a703e 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8221,7 +8221,7 @@ ReportDefinitions: -- Use CTE to force query plan, compute & use CTE later with properties as ( - select distinct consumercode as propertyid from egbs_demand_v1 where taxperiodfrom=$fy and businessservice='PT' and status!='CANCELLED' + 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 From f9c6fc081f742696c33c004287b3b6a1a363f31d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 5 Aug 2022 11:57:40 +0530 Subject: [PATCH 0874/1630] Receiptregister V2 added gateway_txn_id --- configs/reports/configs/pt-reports.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index bae7a703e..446c3c902 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2181,6 +2181,11 @@ ReportDefinitions: type: string source: pt total: false + - name: gateway_txn_id + label: reports.pt.gateway_txn_id + type: string + source: pt + total: false - name: transactiondate label: reports.pt.ddChequeTransactionDate type: string @@ -2269,7 +2274,8 @@ ReportDefinitions: payment.ifsccode AS bankname, receiptnumber, payment.totalamountpaid as amount, - payment.paymentmode as instrumenttype, + payment.paymentmode as instrumenttype, + gateway_txn_id, 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, @@ -2279,11 +2285,11 @@ 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,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 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; From 04c6ea88817c5ac9220b13e9cb4700c132996b40 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 5 Aug 2022 13:02:22 +0530 Subject: [PATCH 0875/1630] Revert gateway txn id --- 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 446c3c902..77aa1aacd 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2181,11 +2181,6 @@ ReportDefinitions: type: string source: pt total: false - - name: gateway_txn_id - label: reports.pt.gateway_txn_id - type: string - source: pt - total: false - name: transactiondate label: reports.pt.ddChequeTransactionDate type: string @@ -2274,8 +2269,7 @@ ReportDefinitions: payment.ifsccode AS bankname, receiptnumber, payment.totalamountpaid as amount, - payment.paymentmode as instrumenttype, - gateway_txn_id, + 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, From 33e9031516bdc5eb2b1d80c2deb09e8b335cd924 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 5 Aug 2022 16:04:50 +0530 Subject: [PATCH 0876/1630] gateway_txn_id added in receipt regsiter --- configs/reports/configs/pt-reports.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 77aa1aacd..556a01f20 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2181,6 +2181,16 @@ ReportDefinitions: type: string source: pt total: false + - name: gatewaytxnid + label: reports.pt.gateway_txn_id + 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 @@ -2240,6 +2250,7 @@ ReportDefinitions: WITH receipt_breakup AS ( SELECT pd.id as pdid, + gateway_txn_id as gatewaytxnid, 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, @@ -2258,8 +2269,9 @@ 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 + LEFT JOIN eg_pg_transactions as pg on pg.bill_id=bd.billid and txn_status='SUCCESS' WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - GROUP BY pdid + GROUP BY pdid ,gateway_txn_id ) SELECT pd.tenantid AS tenantid, From 9450a762e985f0283a51af327df2585ac38dfb8e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 5 Aug 2022 16:12:34 +0530 Subject: [PATCH 0877/1630] gateway_txn_id --- 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 556a01f20..501f96496 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2250,7 +2250,7 @@ ReportDefinitions: WITH receipt_breakup AS ( SELECT pd.id as pdid, - gateway_txn_id as gatewaytxnid, + gateway_txn_id, 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, From 69508b818255c6475f37897cf502efd70baad358 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 5 Aug 2022 16:15:18 +0530 Subject: [PATCH 0878/1630] revert gateway_txn_id as gatewaytxnid --- configs/reports/configs/pt-reports.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 501f96496..c510bb805 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2249,8 +2249,7 @@ ReportDefinitions: -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( SELECT - pd.id as pdid, - gateway_txn_id, + 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, @@ -2268,8 +2267,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 - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - LEFT JOIN eg_pg_transactions as pg on pg.bill_id=bd.billid and txn_status='SUCCESS' + 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 ,gateway_txn_id ) From 7651c0d9458c4d8e735bcba910e88e26e454ad49 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 5 Aug 2022 16:19:15 +0530 Subject: [PATCH 0879/1630] revert gateway txn id --- 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 c510bb805..e5f599c26 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2269,7 +2269,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' - GROUP BY pdid ,gateway_txn_id + GROUP BY pdid ) SELECT pd.tenantid AS tenantid, From 389fc090a79e4b08b42c468f1d849166e9a33bde Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 5 Aug 2022 16:31:31 +0530 Subject: [PATCH 0880/1630] ReceiptRegister_without_locality_V2 gateway --- 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 e5f599c26..b611ea6c1 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2471,6 +2471,7 @@ ReportDefinitions: WITH receipt_breakup AS ( SELECT pd.id as pdid, + gateway_txn_id as gatewaytxnid, 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, @@ -2489,9 +2490,10 @@ 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 + LEFT JOIN eg_pg_transactions as pg on pg.bill_id=bd.billid and txn_status='SUCCESS' WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate - GROUP BY pdid + GROUP BY pdid,gateway_txn_id ) SELECT pd.tenantid AS tenantid, From 420c07d597fb8638cf2567ed4fd61bbdcf4af144 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 5 Aug 2022 16:37:08 +0530 Subject: [PATCH 0881/1630] ReceiptRegister_without_locality_V2 gateway --- configs/reports/configs/pt-reports.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index b611ea6c1..347feb920 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2180,12 +2180,7 @@ ReportDefinitions: label: reports.pt.ddChequeTransactionNo type: string source: pt - total: false - - name: gatewaytxnid - label: reports.pt.gateway_txn_id - type: string - source: pt - total: false + total: false - name: transactiondate label: reports.pt.ddChequeTransactionDate type: string @@ -2418,6 +2413,11 @@ ReportDefinitions: type: string source: pt total: false + - name: gatewaytxnid + label: reports.pt.gateway_txn_id + type: string + source: pt + total: false - name: transactiondate label: reports.pt.ddChequeTransactionDate type: string @@ -2470,8 +2470,7 @@ ReportDefinitions: -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( SELECT - pd.id as pdid, - gateway_txn_id as gatewaytxnid, + 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, @@ -2489,11 +2488,10 @@ 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 - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - LEFT JOIN eg_pg_transactions as pg on pg.bill_id=bd.billid and txn_status='SUCCESS' + 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,gateway_txn_id + GROUP BY pdid ) SELECT pd.tenantid AS tenantid, From 7fc163db73b338f9440780c8a1f8f721bea9501f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 5 Aug 2022 16:38:42 +0530 Subject: [PATCH 0882/1630] Update pt-reports.yml --- 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 347feb920..a7561313d 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2412,12 +2412,7 @@ ReportDefinitions: label: reports.pt.ddChequeTransactionNo type: string source: pt - total: false - - name: gatewaytxnid - label: reports.pt.gateway_txn_id - type: string - source: pt - total: false + total: false - name: transactiondate label: reports.pt.ddChequeTransactionDate type: string From e763db1d63042a49c00ccecffcf17fb4c7697acf Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 5 Aug 2022 16:58:50 +0530 Subject: [PATCH 0883/1630] added order id in Pt receipt registerwithoutlocality --- configs/reports/configs/pt-reports.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index a7561313d..9a9b7c665 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2412,7 +2412,12 @@ ReportDefinitions: label: reports.pt.ddChequeTransactionNo type: string source: pt - total: false + total: false + - name: gatewaytxnid + label: reports.pt.gateway_txn_id + type: string + source: pt + total: false - name: transactiondate label: reports.pt.ddChequeTransactionDate type: string @@ -2465,7 +2470,8 @@ ReportDefinitions: -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( SELECT - pd.id as pdid, + pd.id as pdid, + gateway_txn_id as gatewaytxnid, 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, @@ -2483,10 +2489,11 @@ 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 - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + LEFT JOIN eg_pg_transactions as pg on pg.bill_id=bd.billid and txn_status='SUCCESS' WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate - GROUP BY pdid + GROUP BY pdid,gateway_txn_id ) SELECT pd.tenantid AS tenantid, From 7ac522cbe43e4ede0556ea1ed747f5d5bac0084b Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 5 Aug 2022 17:19:25 +0530 Subject: [PATCH 0884/1630] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 9a9b7c665..4c40ff5d8 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2413,11 +2413,6 @@ ReportDefinitions: type: string source: pt total: false - - name: gatewaytxnid - label: reports.pt.gateway_txn_id - type: string - source: pt - total: false - name: transactiondate label: reports.pt.ddChequeTransactionDate type: string @@ -2471,7 +2466,6 @@ ReportDefinitions: WITH receipt_breakup AS ( SELECT pd.id as pdid, - gateway_txn_id as gatewaytxnid, 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, @@ -2490,10 +2484,9 @@ 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 - LEFT JOIN eg_pg_transactions as pg on pg.bill_id=bd.billid and txn_status='SUCCESS' WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate - GROUP BY pdid,gateway_txn_id + GROUP BY pdid ) SELECT pd.tenantid AS tenantid, From d25799f35c9f050c618558d79f0d32c2e611ccac Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Sat, 6 Aug 2022 14:46:23 +0530 Subject: [PATCH 0885/1630] Did changes for Ward --- .../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 99c8df769..e25345f03 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": "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" + + }, + "ward": "ward", + "tradeType": "tradelicense.tradeLicenseDetail.tradeUnits[0].tradeType" + } + } ] From e03a823b5184902466ab2c14204759caa922167f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 9 Aug 2022 09:53:40 +0530 Subject: [PATCH 0886/1630] gateway added in rr without locality --- 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 4c40ff5d8..405a195dc 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2412,7 +2412,12 @@ ReportDefinitions: label: reports.pt.ddChequeTransactionNo type: string source: pt - total: false + total: false + - name: gateway_txn_id + label: reports.pt.gateway_txn_id + type: string + source: pt + total: false - name: transactiondate label: reports.pt.ddChequeTransactionDate type: string @@ -2466,6 +2471,7 @@ ReportDefinitions: WITH receipt_breakup AS ( SELECT pd.id as pdid, + gateway_txn_id, 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, @@ -2483,10 +2489,11 @@ 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 - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + LEFT JOIN eg_pg_transactions as pg on pg.bill_id=bd.billid WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate - GROUP BY pdid + GROUP BY pdid,gateway_txn_id ) SELECT pd.tenantid AS tenantid, From 298503f400865200c0e35a174f75bd5c8cc6c6ca Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 9 Aug 2022 10:29:55 +0530 Subject: [PATCH 0887/1630] Gateway txn id in rr without locality --- 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 405a195dc..5241ccfe3 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2490,7 +2490,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 - LEFT JOIN eg_pg_transactions as pg on pg.bill_id=bd.billid + LEFT JOIN eg_pg_transactions as pg on (pg.bill_id=bd.billid and txn_status='SUCCESS') WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate GROUP BY pdid,gateway_txn_id From 9720a946984810b9b5568bfe89bd7a9f179e588c Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Tue, 9 Aug 2022 14:43:07 +0530 Subject: [PATCH 0888/1630] Added ,"Department": "NA" in legacy --- 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 f1e3cc44e..6ce42518b 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 a6afc823abe86e2c8f11c5d99a732afd34401fa8 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 10 Aug 2022 11:26:25 +0530 Subject: [PATCH 0889/1630] ReceiptRegisterGatewayTxnId_V2 report --- 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 5241ccfe3..b405f3dd0 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8462,3 +8462,117 @@ ReportDefinitions: 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; + + + + + From 235c252d34d925668ab278303f19f428267d838b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 10 Aug 2022 11:53:21 +0530 Subject: [PATCH 0890/1630] RR with locality reverted gatewaytxn id --- configs/reports/configs/pt-reports.yml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index b405f3dd0..f371fe026 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2412,12 +2412,7 @@ ReportDefinitions: label: reports.pt.ddChequeTransactionNo type: string source: pt - total: false - - name: gateway_txn_id - label: reports.pt.gateway_txn_id - type: string - source: pt - total: false + total: false - name: transactiondate label: reports.pt.ddChequeTransactionDate type: string @@ -2470,8 +2465,7 @@ ReportDefinitions: -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( SELECT - pd.id as pdid, - gateway_txn_id, + 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, @@ -2489,11 +2483,10 @@ 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 - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - LEFT JOIN eg_pg_transactions as pg on (pg.bill_id=bd.billid and txn_status='SUCCESS') + 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,gateway_txn_id + GROUP BY pdid ) SELECT pd.tenantid AS tenantid, From cea008971926b415516c90c90d5da70932d483a3 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 10 Aug 2022 14:50:56 +0530 Subject: [PATCH 0891/1630] ReceiptRegisterGatewayTxnId_V2 --- configs/reports/configs/pt-reports.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index f371fe026..7052e8902 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8554,8 +8554,7 @@ ReportDefinitions: --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.*, - + --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 From 8d194dd437984004211f26d7e394ba896a0a4517 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 16 Aug 2022 16:27:09 +0530 Subject: [PATCH 0892/1630] show fy in 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 7052e8902..8d64cccf1 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8254,7 +8254,7 @@ ReportDefinitions: propertyusagetype, propertytype, plotsize, - '2021-22', --assessments.fy as fy, + $fy as fy, --assessments.fy as fy, owners.ownername as ownername, owners.mobilenumber as mobileno from properties From c54b748b8229a5d00f5e8fb06877c5acdfa25337 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 16 Aug 2022 16:34:22 +0530 Subject: [PATCH 0893/1630] epoch to 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 8d64cccf1..fcaed3dee 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8254,7 +8254,7 @@ ReportDefinitions: propertyusagetype, propertytype, plotsize, - $fy as fy, --assessments.fy as fy, + to_char((To_timestamp(($fy::bigint)/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as fy, --assessments.fy as fy, owners.ownername as ownername, owners.mobilenumber as mobileno from properties From ad0073d7ef9d5bd0ce0d163be2e4984f921ffe35 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 16 Aug 2022 16:38:21 +0530 Subject: [PATCH 0894/1630] 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 fcaed3dee..49e44a579 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8254,7 +8254,7 @@ ReportDefinitions: propertyusagetype, propertytype, plotsize, - to_char((To_timestamp(($fy::bigint)/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as fy, --assessments.fy as fy, + CONCAT(to_char((To_timestamp(($fy::bigint)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',((To_timestamp(($fy::bigint)/1000) at time Zone 'Asia/Kolkata'),'YYYY')::int + 1)::text) as fy, --assessments.fy as fy, owners.ownername as ownername, owners.mobilenumber as mobileno from properties From 8830802d67e1762bf6f2b8ecc4bb0cf70e5a37aa Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 16 Aug 2022 16:54:11 +0530 Subject: [PATCH 0895/1630] 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 49e44a579..90ce49a53 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8254,7 +8254,7 @@ ReportDefinitions: propertyusagetype, propertytype, plotsize, - CONCAT(to_char((To_timestamp(($fy::bigint)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',((To_timestamp(($fy::bigint)/1000) at time Zone 'Asia/Kolkata'),'YYYY')::int + 1)::text) as fy, --assessments.fy as fy, + 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'),'YYYY')::int + 1)::text as fy, --assessments.fy as fy, owners.ownername as ownername, owners.mobilenumber as mobileno from properties From 970b92848a1e85386fb6f8865e767619f7506dab Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 16 Aug 2022 17:15:23 +0530 Subject: [PATCH 0896/1630] 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 90ce49a53..10f109997 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8254,7 +8254,7 @@ ReportDefinitions: 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'),'YYYY')::int + 1)::text as fy, --assessments.fy as fy, + $fy as fy --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'),'YYYY')::int + 1)::text as fy, --assessments.fy as fy, owners.ownername as ownername, owners.mobilenumber as mobileno from properties From f81c88f84aeecab154d8a4f32883dc314634b896 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 16 Aug 2022 17:20:32 +0530 Subject: [PATCH 0897/1630] 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 10f109997..7052e8902 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8254,7 +8254,7 @@ ReportDefinitions: propertyusagetype, propertytype, plotsize, - $fy as fy --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'),'YYYY')::int + 1)::text as fy, --assessments.fy as fy, + '2021-22', --assessments.fy as fy, owners.ownername as ownername, owners.mobilenumber as mobileno from properties From bab98f124493b24f04869e6360816e8a6ad5f954 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 18 Aug 2022 10:04:31 +0530 Subject: [PATCH 0898/1630] fy in DEMAND Defaulter 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 7052e8902..6ae2833e1 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8254,7 +8254,7 @@ ReportDefinitions: propertyusagetype, propertytype, plotsize, - '2021-22', --assessments.fy as fy, + 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 From 58a5943f26883cc99dda85b5dedbf127de81f874 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 18 Aug 2022 14:45:34 +0530 Subject: [PATCH 0899/1630] unsynch pt data dump usage category --- configs/reports/configs/pt-reports.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 6ae2833e1..742ac18a9 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6466,6 +6466,11 @@ ReportDefinitions: type: string source: pt total: false + - name: usagetype + label: reports.pt.propertyusagetype + type: string + source: pt + total: false - name: localitycode label: reports.pt.localitycode type: string @@ -6568,7 +6573,8 @@ ReportDefinitions: pt.localitycode as localitycode, pt.localityname as localityname, pt.zonename as zonename, - pt.blockname as blockname + 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' From f68e6a5812c27b90a76118508f79829c5aa5392d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 22 Aug 2022 10:09:21 +0530 Subject: [PATCH 0900/1630] usage category filter defaulter report unpaid --- 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 742ac18a9..57a8d809e 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8228,6 +8228,13 @@ ReportDefinitions: source: pt isMandatory: true searchClause: and 1=1 + - 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: | -- Use CTE to force query plan, compute & use CTE later with properties as @@ -8237,7 +8244,7 @@ ReportDefinitions: ), props as ( - select * from report_properties where tenantid=$tenantid and propertystatus='ACTIVE' + select * from report_properties where tenantid=$tenantid and propertystatus='ACTIVE' and propertyusagetype like concat('%',$usageCat,'%') ), owners as ( From 16b5bb693a371c51cec0b567bc13d1224e1ac925 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 22 Aug 2022 10:51:17 +0530 Subject: [PATCH 0901/1630] residential usage category --- 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 57a8d809e..b0d9ff5db 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8231,7 +8231,7 @@ ReportDefinitions: - name: usageCat label: Usage Category type: singlevaluelist - pattern: 'list://NONRESIDENTIAL.COMMERCIAL:Commercial,MIXED:Mixed,NONRESIDENTIAL.INDUSTRIAL:Industrial,NONRESIDENTIAL.INSTITUTIONAL:Institutional' + pattern: 'list://NONRESIDENTIAL.COMMERCIAL:Commercial,MIXED:Mixed,NONRESIDENTIAL.INDUSTRIAL:Industrial,NONRESIDENTIAL.INSTITUTIONAL:Institutional,RESIDENTIAL:ALL' source: pt isMandatory: false searchClause: and 1=1 From 8f95127f9c30d00cb9cf49236cb92e1e8fb265e7 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Thu, 25 Aug 2022 15:08:41 +0530 Subject: [PATCH 0902/1630] Updated the module name 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 6ce42518b..4df63bf6d 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 004e392e54f88eb83b18b719b2c2b518a9bb66f9 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Thu, 25 Aug 2022 15:47:21 +0530 Subject: [PATCH 0903/1630] Update "topic: update-tl-workflow" --- configs/egov-indexer/rainmaker-tl-indexer.yml | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/configs/egov-indexer/rainmaker-tl-indexer.yml b/configs/egov-indexer/rainmaker-tl-indexer.yml index 8a2ff6743..00bf726dc 100644 --- a/configs/egov-indexer/rainmaker-tl-indexer.yml +++ b/configs/egov-indexer/rainmaker-tl-indexer.yml @@ -121,3 +121,43 @@ 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 352eb2abf9c0cc035e3c5b6e6aa37597709dbdc8 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Thu, 25 Aug 2022 16:13:08 +0530 Subject: [PATCH 0904/1630] Update the code department in --- 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 4df63bf6d..493f4d876 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 @@ -122,7 +122,7 @@ ServiceMaps: 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 + 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 @@ -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 c3b8b746416f5e8df48bf774a7bbdeb8f3e9549f Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 26 Aug 2022 14:59:55 +0530 Subject: [PATCH 0905/1630] Added time Zone for DSS_PGR_CITIZEN --- .../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 867ef502e..0da1b35c5 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2972,7 +2972,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 be22773ee5c7d4cc945ac25778b2d0a6b2a4d116 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 26 Aug 2022 15:12:27 +0530 Subject: [PATCH 0906/1630] Edit the timezone --- .../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 0da1b35c5..7803946c6 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2972,7 +2972,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\",\"time_zone\":\"+05:30\"},\"aggs\":{\"count\":{\"cardinality\":{\"field\":\"Data.citizen.uuid.keyword\"}}}}}}}}" } ], "chartType": "line", From 6a00ba835a4b1e83a6d3fb2ea1001ce0bf6f5727 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 29 Aug 2022 11:28:58 +0530 Subject: [PATCH 0907/1630] Updated the audit details to prgr indexer --- configs/egov-indexer/rainmaker-pgr-indexer.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configs/egov-indexer/rainmaker-pgr-indexer.yml b/configs/egov-indexer/rainmaker-pgr-indexer.yml index 94ad3eae4..aa81c5019 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 @@ -113,7 +115,9 @@ ServiceMaps: - inJsonPath: $.phone outJsonPath: $.Data.phone - inJsonPath: $.auditDetails.createdTime - outJsonPath: $.Data.dateOfComplaint + outJsonPath: $.Data.dateOfComplaint + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails - inJsonPath: $.description outJsonPath: $.Data.description - inJsonPath: $.address @@ -227,6 +231,8 @@ ServiceMaps: outJsonPath: $.Data.phone - inJsonPath: $.auditDetails.createdTime outJsonPath: $.Data.dateOfComplaint + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails - inJsonPath: $.description outJsonPath: $.Data.description - inJsonPath: $.address From b219ac964bba98c7504de30403a5904343819096 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 Sep 2022 15:37:19 +0530 Subject: [PATCH 0908/1630] pt dump v2 --- configs/reports/configs/pt-reports.yml | 121 +++++-------------------- 1 file changed, 23 insertions(+), 98 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index b0d9ff5db..e111c8407 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3455,27 +3455,12 @@ ReportDefinitions: 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 + 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 + total: false - name: ownername label: reports.pt.ownername type: string @@ -3485,82 +3470,22 @@ ReportDefinitions: 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 + 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 + 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 + total: false - name: localityname label: reports.pt.localityname type: string @@ -3604,9 +3529,9 @@ 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 - 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 + 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 @@ -3615,28 +3540,28 @@ ReportDefinitions: 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", + --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, + --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", + --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", + --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", + --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", + --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 From 7d3f76a7848d490aceb9a0eaa0527518e4a3fd2d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 Sep 2022 16:14:48 +0530 Subject: [PATCH 0909/1630] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 44 +++++++++++++------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index e111c8407..5aa89dfe5 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6450,7 +6450,7 @@ ReportDefinitions: 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, + --split_part(string_agg(emailid,','),',',1) as emailid, propertyid from report_owners where status='ACTIVE' and tenantid=$tenantid group by propertyid @@ -6459,47 +6459,47 @@ ReportDefinitions: ( select propertyid, - sum(builtuparea) as builtuparea, - string_agg(occupancytype,',') as occupancytype + --sum(builtuparea) as builtuparea, + --string_agg(occupancytype,',') as occupancytype from report_units where active='true' and tenantid=$tenantid group by propertyid ) select - rp.billid, + --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, + --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, + --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, + --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.amoutpaid as paymentamount, --rp.transactiondate as transcationdate, - owners.emailid as emailid, + --owners.emailid as emailid, pt.address as address, - pt.surveyid, - pt.additionaldetails->>'remarks' as remarks, + --pt.surveyid, + --pt.additionaldetails->>'remarks' as remarks, pt.additionaldetails->>'businessName' as firmbusinessname, pt.firmbusinessname as businessname, - pt.localitycode as localitycode, + --pt.localitycode as localitycode, pt.localityname as localityname, - pt.zonename as zonename, - pt.blockname as blockname, - pt.propertyusagetype as usagetype + --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' From 346ec87f3f19a178572071dbb235a0b28359378d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 Sep 2022 16:30:58 +0530 Subject: [PATCH 0910/1630] PT_DATA_DUMP_REPORT_V2 changes --- configs/reports/configs/pt-reports.yml | 105 ++----------------------- 1 file changed, 5 insertions(+), 100 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 5aa89dfe5..d995e00db 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6280,27 +6280,12 @@ ReportDefinitions: label: reports.pt.propertytaxuniqueid type: string source: pt - total: false - - name: transactiondate - label: reports.pt.transactiondate - type: string - source: pt - total: false - - name: receiptnumber - label: reports.pt.receiptnumber - type: string - source: pt - total: false + 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 + total: false - name: ownername label: reports.pt.ownername type: string @@ -6311,81 +6296,16 @@ ReportDefinitions: 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: paymentmode - label: reports.pt.paymentmode - type: string - source: pt - total: false - - name: paymentdate - label: reports.pt.paymentdate - type: string - source: pt - total: false - - name: emailid - label: reports.pt.emailid - type: string - source: pt - total: false + total: false - name: address label: reports.pt.address type: string source: pt total: false - - name: surveyid - label: reports.pt.surveyid - 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 @@ -6395,27 +6315,12 @@ ReportDefinitions: label: reports.pt.propertyusagetype 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: zonename - label: reports.pt.zonename - type: string - source: pt - total: false - - name: blockname - label: reports.pt.blockname - type: string - source: pt - total: false searchParams: - name: fromDate label: reports.pt.fromDate @@ -6458,7 +6363,7 @@ ReportDefinitions: units as ( select - propertyid, + propertyid --sum(builtuparea) as builtuparea, --string_agg(occupancytype,',') as occupancytype from report_units @@ -6496,7 +6401,7 @@ ReportDefinitions: pt.additionaldetails->>'businessName' as firmbusinessname, pt.firmbusinessname as businessname, --pt.localitycode as localitycode, - pt.localityname as localityname, + pt.localityname as localityname --pt.zonename as zonename, --pt.blockname as blockname, --pt.propertyusagetype as usagetype From bf2894f40539261e570e0a85dd9b3059085375ce Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 12 Sep 2022 08:43:02 +0530 Subject: [PATCH 0911/1630] pt dump survey id --- configs/reports/configs/pt-reports.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index d995e00db..493d9ed88 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6290,7 +6290,12 @@ ReportDefinitions: label: reports.pt.ownername type: string source: pt - total: false + total: false + - name: surveyid + label: reports.pt.surveyid + type: string + source: pt + total: false - name: guardianname label: reports.pt.guardianname type: string @@ -6396,7 +6401,7 @@ ReportDefinitions: --rp.transactiondate as transcationdate, --owners.emailid as emailid, pt.address as address, - --pt.surveyid, + pt.surveyid, --pt.additionaldetails->>'remarks' as remarks, pt.additionaldetails->>'businessName' as firmbusinessname, pt.firmbusinessname as businessname, From f61d4ab86e6dd77abcf97aa656cca11cbc019c9c Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 13 Sep 2022 11:43:11 +0530 Subject: [PATCH 0912/1630] Updated PT Todays Collection --- .../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 7803946c6..acdd1b97c 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -142,14 +142,14 @@ "_comment": " " }, "todaysCollection": { - "chartName": "DSS_TOTAL_COLLECTION", + "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\":{\"Total Collection\":{\"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\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" }, { "module": "TL", @@ -165,7 +165,7 @@ "documentType": "_doc", "action": "", "aggregationPaths": [ - "Total Collection" + "Todays Collection" ], "insight": { }, From 7d4a1d8cac3edc6ad196037a7b2327ed2dd7ac24 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Thu, 15 Sep 2022 10:56:29 +0530 Subject: [PATCH 0913/1630] Updated the todays collection for the 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 acdd1b97c..119c0f1b0 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -156,7 +156,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\":[{\"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_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\"}}}}}}" } ], "chartType": "metric", From 9bf583c773d6e1c40a9c1a1aa647fa6d6f4a3d9d Mon Sep 17 00:00:00 2001 From: gurpreetkhanna <42681551+gurpreetkhanna@users.noreply.github.com> Date: Fri, 16 Sep 2022 11:53:01 +0530 Subject: [PATCH 0914/1630] usagetype in PT Dump Report --- 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 493d9ed88..0877b79ed 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6406,10 +6406,10 @@ ReportDefinitions: pt.additionaldetails->>'businessName' as firmbusinessname, pt.firmbusinessname as businessname, --pt.localitycode as localitycode, - pt.localityname as localityname + pt.localityname as localityname, --pt.zonename as zonename, --pt.blockname as blockname, - --pt.propertyusagetype as usagetype + 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' From 8246095803b5d98b7300eeb323f3896a6ce4a4c9 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 20 Sep 2022 16:37:58 +0530 Subject: [PATCH 0915/1630] removed target indicator for total collection --- .../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 119c0f1b0..59acf5e0e 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -67,13 +67,6 @@ "Total Collection" ], "insight": { - "chartResponseMap" : "totalCollection", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" }, "_comment": " " }, From b46237784d0030d514dc491421f5fe24fb13ac65 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Fri, 23 Sep 2022 11:46:52 +0530 Subject: [PATCH 0916/1630] World Bank Report --- configs/reports/configs/pgr-reports.yml | 322 ++++++++++++------------ 1 file changed, 155 insertions(+), 167 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 94b0481ee..2f8edbf97 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -1086,152 +1086,6 @@ ReportDefinitions: AND eg_pgr_service.status IN ('open','assigned','reassigrequested','rejected','closed','resolved') orderby: ORDER BY servicerequestid, epa."when" desc -- 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: StateSourceReport_v2 summary: Source of complaints across tenants version: 1.0.0 @@ -1384,7 +1238,7 @@ ReportDefinitions: 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(eg_pgr_service.createdtime::Integer / 1000)), 'DD/MM/YYYY') AS date, + 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, @@ -1798,8 +1652,9 @@ ReportDefinitions: groupby: GROUP BY assignee orderby: ORDER BY assignee NULLS FIRST + - reportName: UlbPgrSlaReport_v2 - summary: Fetches employee sla + summary: Fetches employee sla for state version: 1.0.0 moduleName: rainmaker-pgr sourceColumns: @@ -2049,8 +1904,10 @@ 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 @@ -2116,11 +1973,6 @@ ReportDefinitions: type: string source: eg_pgr_service total: false - - name: employeeid_lastassignedto - label: reports.rainmaker-pgr.employeeid_lastassignedto - type: string - source: eg_pgr_service - total: false - name: status label: reports.rainmaker-pgr.status type: string @@ -2147,14 +1999,6 @@ ReportDefinitions: 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 @@ -2171,7 +2015,6 @@ ReportDefinitions: SELECT DISTINCT ON (servicerequestid) (case when ua.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else ua.name end) as lastassignedto, --value for Unassigned - (case when ua.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_hrms_employee.code end) as employeeid_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, @@ -2192,13 +2035,12 @@ ReportDefinitions: 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) - left outer join eg_hrms_employee on eg_pgr_service.lastmodifiedby::bigint = eg_hrms_employee.id 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 @@ -2272,4 +2114,150 @@ ReportDefinitions: 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 + orderby: ORDER BY tenantid,eg_pgr_service.servicecode + +- 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 + - 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_service.servicecode in ('PipelineWorkTrafficJam','PipelineWorkTrenchpitNotBackfilled','PipelineWorkHouseConnectionDamaged','PipelineWorkRoadNotRestored','CivilWorksOverheadReservoirTank','CivilWorksWaterTreatmentPlant','EnvironmentalImpactHazardousMaterialAtSiteEtc','EnvironmentalImpactNoiseAndAirPollution','EnvironmentalImpactVehiclePollution','EnvironmentalImpactSoilContamination','EnvironmentalImpactSoilErosion','EnvironmentalImpactUnauthorisedTreeCutting','SocialImpactSexualHarrasmentAtWorkSiteEtc','SocialImpactResettlementOrRehabilitation','SocailImpactDamageOfProperty') + 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 \ No newline at end of file From a955b6f6db8e6093aa679e97537cd6a74f9b17e4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 28 Sep 2022 14:59:08 +0530 Subject: [PATCH 0917/1630] added PropertyDumpReport --- configs/reports/configs/pt-reports.yml | 90 ++++++++++++++++++++++++-- 1 file changed, 86 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 0877b79ed..8fba72229 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8412,7 +8412,89 @@ ReportDefinitions: 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 1=1 + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND 1=1 + 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' + + From dc8a75b87e9161201ab3ba2b290ff5e3dc465a28 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 29 Sep 2022 12:17:05 +0530 Subject: [PATCH 0918/1630] DescriptionReport_New_V2 restored --- configs/reports/configs/pgr-reports.yml | 147 +++++++++++++++++++++++- 1 file changed, 146 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 2f8edbf97..76040b21a 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2116,6 +2116,151 @@ ReportDefinitions: 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 @@ -2260,4 +2405,4 @@ ReportDefinitions: eg_pgr_service.servicecode in ('PipelineWorkTrafficJam','PipelineWorkTrenchpitNotBackfilled','PipelineWorkHouseConnectionDamaged','PipelineWorkRoadNotRestored','CivilWorksOverheadReservoirTank','CivilWorksWaterTreatmentPlant','EnvironmentalImpactHazardousMaterialAtSiteEtc','EnvironmentalImpactNoiseAndAirPollution','EnvironmentalImpactVehiclePollution','EnvironmentalImpactSoilContamination','EnvironmentalImpactSoilErosion','EnvironmentalImpactUnauthorisedTreeCutting','SocialImpactSexualHarrasmentAtWorkSiteEtc','SocialImpactResettlementOrRehabilitation','SocailImpactDamageOfProperty') 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 \ No newline at end of file + orderby: ORDER BY servicerequestid, epa."when" desc From fc3fe1bcfe05966fcf707d41c249bae95805f0b8 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 3 Oct 2022 10:41:42 +0530 Subject: [PATCH 0919/1630] applied date filters to PropertDumpReport --- 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 8fba72229..540dacbdf 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8472,13 +8472,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND 1=1 + searchClause: AND pt.createdtime>=$fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND 1=1 + searchClause: AND pt.createdtime<=$toDate query: | -- Use CTE to force query plan, compute & use CTE later with owners as From c50ff852928ef742ec6af4ae868896584c13d734 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Wed, 12 Oct 2022 11:48:20 +0530 Subject: [PATCH 0920/1630] changed the DSS_TL_LICENSE_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 59acf5e0e..c1e873033 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1734,7 +1734,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\":{\"License Issued\":{\"value_count\":{\"field\":\"Data.tradelicense.licenseNumber.keyword\"}}}}}}}}" } ], "chartType": "pie", From 1b1afac4f5a4db213d9eaf8bf0265d143f1d7e58 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Wed, 12 Oct 2022 13:01:41 +0530 Subject: [PATCH 0921/1630] Added must condition --- .../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 c1e873033..f565b218d 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1668,7 +1668,7 @@ { "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\"}}}}}}", + "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.issuedDate" } From d1a25257873f579cadb13d0a9dc2c3cec8756278 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Wed, 12 Oct 2022 13:06:22 +0530 Subject: [PATCH 0922/1630] updated the vis:cumulativeLicenseIssued --- .../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 f565b218d..5ec7ea9b6 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1698,7 +1698,7 @@ { "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\"}}}}}}}}", + "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.issuedDate" }, From fcde5b598d769de8871f2ae5ae3405c460cb10f3 Mon Sep 17 00:00:00 2001 From: kokila-eGov <97164202+kokila-eGov@users.noreply.github.com> Date: Wed, 12 Oct 2022 13:53:04 +0530 Subject: [PATCH 0923/1630] changed the date reference filed to issuedDate (#568) --- .../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 5ec7ea9b6..285a2f650 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1786,7 +1786,7 @@ { "module": "TL", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tradelicense.tenantId.keyword\" }", - "dateRefField": "Data.tradelicense.applicationDate", + "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\":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 aaca51c60a4de9d7448e24150860fb44ebfdece7 Mon Sep 17 00:00:00 2001 From: kokila-eGov <97164202+kokila-eGov@users.noreply.github.com> Date: Wed, 12 Oct 2022 16:28:43 +0530 Subject: [PATCH 0924/1630] Updated status by boundary in TL (#569) --- .../dashboard-analytics/ChartApiConfig.json | 38 ++++++++++++++++++- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 285a2f650..5388d6cf9 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1874,10 +1874,44 @@ "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": { }, From 2df23a8d678cf5c5c7ad98aa5bc52a41991b1391 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Wed, 12 Oct 2022 17:19:31 +0530 Subject: [PATCH 0925/1630] modified xtable to table --- .../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 5388d6cf9..40fcf1347 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1796,7 +1796,7 @@ "filterKeys": [ {"key": "tenantId", "column": "DDRs"} ], - "chartType": "xtable", + "chartType": "table", "valueType": "number", "drillChart": "tlStatusByTenant", "drillFields": [ @@ -1864,7 +1864,7 @@ "filterKeys": [ {"key": "tenantId", "column": "Boundary"} ], - "chartType": "xtable", + "chartType": "table", "valueType": "number", "drillChart": "tlStatusByTenantDrillDown", "drillFields": [ @@ -1931,7 +1931,7 @@ ], "filterKeys": [ ], - "chartType": "xtable", + "chartType": "table", "valueType": "number", "drillChart": "", "drillFields": [ From 87a56e6b376efa7d7f11ca0451a7e4ad4f6d7fd0 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Wed, 12 Oct 2022 17:24:32 +0530 Subject: [PATCH 0926/1630] Reverted back to xtable --- .../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 40fcf1347..5388d6cf9 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1796,7 +1796,7 @@ "filterKeys": [ {"key": "tenantId", "column": "DDRs"} ], - "chartType": "table", + "chartType": "xtable", "valueType": "number", "drillChart": "tlStatusByTenant", "drillFields": [ @@ -1864,7 +1864,7 @@ "filterKeys": [ {"key": "tenantId", "column": "Boundary"} ], - "chartType": "table", + "chartType": "xtable", "valueType": "number", "drillChart": "tlStatusByTenantDrillDown", "drillFields": [ @@ -1931,7 +1931,7 @@ ], "filterKeys": [ ], - "chartType": "table", + "chartType": "xtable", "valueType": "number", "drillChart": "", "drillFields": [ From 0657067811fa0fa7eca1e4dbde96fc4ec2c22a65 Mon Sep 17 00:00:00 2001 From: kokila-eGov <97164202+kokila-eGov@users.noreply.github.com> Date: Wed, 12 Oct 2022 17:59:56 +0530 Subject: [PATCH 0927/1630] Changed date field from issued date to application date (#570) --- .../dashboard-analytics/ChartApiConfig.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 5388d6cf9..b61c37b0b 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1670,7 +1670,7 @@ "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.issuedDate" + "dateRefField": "Data.tradelicense.applicationDate" } ], "chartType": "metric", @@ -1700,7 +1700,7 @@ "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.issuedDate" + "dateRefField": "Data.tradelicense.applicationDate" }, { "module": "TL", @@ -1731,7 +1731,7 @@ { "module": "TL", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantData.code\", \"district\" : \"Data.tenantData.cityDistrictCode\"}", - "dateRefField": "Data.tradelicense.issuedDate", + "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\"}}}}}}}}" @@ -1786,7 +1786,7 @@ { "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.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\"}}}}}}}}}" @@ -1855,7 +1855,7 @@ { "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\":{\"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\"}}}}}}}}}}}" @@ -1923,7 +1923,7 @@ { "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\":{\"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\"}}}}}}}}}}}" From 9331b2daaa585aa62b3775c015bb5b3ddb8257f9 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Fri, 14 Oct 2022 14:54:49 +0530 Subject: [PATCH 0928/1630] Changes for PWSSB ULB Grade --- configs/pdf-service/data-config/bill-amendment-note.json | 4 ++++ configs/pdf-service/data-config/bill-amendment.json | 4 ++++ .../pdf-service/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 +- .../pdf-service/data-config/ws-consolidatedacknowlegment.json | 4 ++++ .../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 +- configs/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, 51 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 cf1f04928..bb877f4da 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 154ffb865..bbaa44bee 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 7d4f6d78f..6123217b7 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 ce8d869ad..8b991a9a1 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 6d5b8c69e..b80149f9c 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 c68901354..e4a22eb3b 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 15da51c45..1325d2567 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 5c735c4b6..11439c334 100644 --- a/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json +++ b/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json @@ -664,6 +664,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-consolidatedsewerageconnection.json b/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json index ec4155892..090d96fd4 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 9d7a07428..5900f99cf 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 b2faafa5c..e16085b0e 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 69d6ade35..be75c69d2 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 f2d6e04fe..e6d16b503 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 e8cee60c4..700c7dd9c 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 5524b7b3f..2b0216490 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 493d4a3eb..63f1ffc1b 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 fa9c5f87c..dd94db75c 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 95477f2d1..5e2e9c5f1 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 12eb8c7b8..1eed2e44e 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 fe887276f..776d25a58 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 c3da67604..06c5ee848 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 ec20f133abf2608bb3f7ed57e209dd00a0d6a3fa Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 19 Oct 2022 12:14:52 +0530 Subject: [PATCH 0929/1630] top payer commercial fy --- 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 540dacbdf..d48d24cf2 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8203,7 +8203,7 @@ ReportDefinitions: 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' 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 + 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 From 0475fde3d21583428888af756f319db321777039 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 19 Oct 2022 12:38:19 +0530 Subject: [PATCH 0930/1630] top payer comm --- 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 d48d24cf2..d87645742 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8203,7 +8203,7 @@ ReportDefinitions: 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' 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 + 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'))=$finYear - name: usageCat label: Usage Category type: singlevaluelist From 83e39fa06a003216cdc5b2a8b94a7201157c48f1 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 19 Oct 2022 12:55:05 +0530 Subject: [PATCH 0931/1630] commcercl top payer 100 --- 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 d87645742..7a320b91b 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8224,7 +8224,7 @@ ReportDefinitions: 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 + orderby: order by p.totalamountpaid desc - reportName: TopPayersReportRESD_V2 decryptionPathId: ULBDEFAULTERPTREPORT_V2 From 347e0a59eba7a2c7708e018aacfa0756a019604e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 19 Oct 2022 13:14:59 +0530 Subject: [PATCH 0932/1630] 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 7a320b91b..d87645742 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8224,7 +8224,7 @@ ReportDefinitions: 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 + orderby: order by p.totalamountpaid desc limit 300 - reportName: TopPayersReportRESD_V2 decryptionPathId: ULBDEFAULTERPTREPORT_V2 From 88a8132ed180ea0cc7c60d55af199748b4c320dc Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 19 Oct 2022 14:22:30 +0530 Subject: [PATCH 0933/1630] 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 d87645742..acab7626c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8220,7 +8220,7 @@ ReportDefinitions: 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 concat('%',$usageCat,'%') + inner join eg_pt_property pt on bd.consumercode=pt.propertyid and pt.status='ACTIVE' and pt.usagecategory='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 From 0bb01d303a1c5178f14296f2c8c00959d702f660 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 19 Oct 2022 14:33:28 +0530 Subject: [PATCH 0934/1630] 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 acab7626c..df00e89d8 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8220,7 +8220,7 @@ ReportDefinitions: 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='NONRESIDENTIAL' + 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 From da648fbe69901d0bffedf8a445f794023ef20fbf Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 19 Oct 2022 14:43:08 +0530 Subject: [PATCH 0935/1630] 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 df00e89d8..792ea2aab 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8203,7 +8203,7 @@ ReportDefinitions: 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' source: pt isMandatory: true - 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'))=$finYear + 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 From ddd43525cac37ed36a78ae2c0aaf2ae872dcf310 Mon Sep 17 00:00:00 2001 From: kokila-eGov <97164202+kokila-eGov@users.noreply.github.com> Date: Thu, 3 Nov 2022 08:29:23 +0530 Subject: [PATCH 0936/1630] Update ChartApiConfig.json (#571) changed pgrCitizenOnDateRange KPI --- .../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 b61c37b0b..24faa2f8b 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2999,7 +2999,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\",\"time_zone\":\"+05:30\"},\"aggs\":{\"sum\":{\"cardinality\":{\"field\":\"Data.citizen.uuid.keyword\"}}}}}}}}" } ], "chartType": "line", From ae4eaf3fdab3b25868c1ff277cfa414f7468bc51 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 3 Nov 2022 11:06:40 +0530 Subject: [PATCH 0937/1630] WS mobile number 12376 --- configs/reports/configs/ws-reports.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index e9e9181cd..cd9b33983 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -58,6 +58,11 @@ ReportDefinitions: type: string source: ws total: false + - name: mobilenumber + label: reports.ws.mobilenumber + type: string + source: ws + total: false searchParams: - name: fromDate label: reports.pt.fromDate @@ -110,10 +115,12 @@ ReportDefinitions: amountpaid, paymentmode, paymentstatus, + usr.mobilenumber as mobilenumber, 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' + 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 orderby: order by pd.receiptdate desc From 2ad6c43b52522a48d8854ad0d0c44b06ccb3926a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 3 Nov 2022 11:36:05 +0530 Subject: [PATCH 0938/1630] ws consumer number --- configs/reports/configs/ws-reports.yml | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index cd9b33983..7d3d2ad67 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -13,6 +13,16 @@ ReportDefinitions: type: string source: ws total: false + - name: connectionno + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: mobilenumber + label: reports.ws.mobilenumber + type: string + source: ws + total: false - name: receiptdate1 label: reports.ws.receiptdate type: string @@ -57,11 +67,6 @@ ReportDefinitions: label: reports.ws.ownername type: string source: ws - total: false - - name: mobilenumber - label: reports.ws.mobilenumber - type: string - source: ws total: false searchParams: - name: fromDate @@ -107,6 +112,8 @@ ReportDefinitions: -- Use CTE to force query plan, compute & use CTE later select receiptnumber as receiptno, + wsconnection.connectionno as connectionno, + usr.mobilenumber as mobilenumber, to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as receiptdate1, bill.businessservice as service, billnumber, @@ -114,12 +121,12 @@ ReportDefinitions: paidby, amountpaid, paymentmode, - paymentstatus, - usr.mobilenumber as mobilenumber, + 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 + inner join egcl_payment as payment on payment.id=pd.paymentid + inner join eg_ws_connection wsconnection on wsconnection.connectionno=bill.consumercode inner join eg_user as usr on usr.id=payment.createdby::integer and payment.paymentstatus!='CANCELLED' where payment.tenantid=$tenantid orderby: order by pd.receiptdate desc From 60dc77892ba279c40b5acb8f1ef3805014499243 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 3 Nov 2022 11:53:37 +0530 Subject: [PATCH 0939/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 7d3d2ad67..34f7e42b5 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1,6 +1,7 @@ --- ReportDefinitions: - reportName: ReceiptRegisterSW + decryptionPathId: FieldCollectionSearchReportWS summary: Receipt Register version: 1.0.0 moduleName: rainmaker-ws From 761f60a91bb0046aab96d6c959e7542c19da3c35 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 3 Nov 2022 12:04:26 +0530 Subject: [PATCH 0940/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 34f7e42b5..c37f295fa 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1,7 +1,7 @@ --- ReportDefinitions: - reportName: ReceiptRegisterSW - decryptionPathId: FieldCollectionSearchReportWS + decryptionPathId: ULBPTDataDumpReport_V2 summary: Receipt Register version: 1.0.0 moduleName: rainmaker-ws @@ -19,8 +19,8 @@ ReportDefinitions: type: string source: ws total: false - - name: mobilenumber - label: reports.ws.mobilenumber + - name: mobileno + label: reports.pt.mobileno type: string source: ws total: false From 024f3997e7d8f3fdcabe76530f620f581c1bcb03 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 3 Nov 2022 12:16:19 +0530 Subject: [PATCH 0941/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index c37f295fa..38f2738b2 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -20,7 +20,7 @@ ReportDefinitions: source: ws total: false - name: mobileno - label: reports.pt.mobileno + label: reports.ws.mobileno type: string source: ws total: false @@ -114,7 +114,7 @@ ReportDefinitions: select receiptnumber as receiptno, wsconnection.connectionno as connectionno, - usr.mobilenumber as mobilenumber, + 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, From 006725b49b5fa5daa7a2f60180a7dd2c11d6ee2b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 3 Nov 2022 12:40:15 +0530 Subject: [PATCH 0942/1630] mobile number water --- configs/reports/configs/ws-reports.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 38f2738b2..f99653420 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -64,8 +64,8 @@ ReportDefinitions: type: string source: ws total: false - - name: ownername - label: reports.ws.ownername + - name: ownername1 + label: reports.ws.ownername1 type: string source: ws total: false @@ -123,7 +123,7 @@ ReportDefinitions: amountpaid, paymentmode, paymentstatus, - payername as ownername + 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 From b241ecac080dd50cb1a6e6d9022546440157062c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 4 Nov 2022 17:01:45 +0530 Subject: [PATCH 0943/1630] Update pgr-reports.yml --- 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 76040b21a..c260166c1 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2402,7 +2402,7 @@ ReportDefinitions: 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_service.servicecode in ('PipelineWorkTrafficJam','PipelineWorkTrenchpitNotBackfilled','PipelineWorkHouseConnectionDamaged','PipelineWorkRoadNotRestored','CivilWorksOverheadReservoirTank','CivilWorksWaterTreatmentPlant','EnvironmentalImpactHazardousMaterialAtSiteEtc','EnvironmentalImpactNoiseAndAirPollution','EnvironmentalImpactVehiclePollution','EnvironmentalImpactSoilContamination','EnvironmentalImpactSoilErosion','EnvironmentalImpactUnauthorisedTreeCutting','SocialImpactSexualHarrasmentAtWorkSiteEtc','SocialImpactResettlementOrRehabilitation','SocailImpactDamageOfProperty') + eg_pgr_service.servicecode in ('PipelineWorkTrafficJam','PipelineWorkTrenchpitNotBackfilled','PipelineWorkHouseConnectionDamaged','PipelineWorkRoadNotRestored','CivilWorksOverheadReservoirTank','CivilWorksWaterTreatmentPlant','EnvironmentalImpactHazardousMaterialAtSiteEtc','EnvironmentalImpactNoiseAndAirPollution','EnvironmentalImpactVehiclePollution','EnvironmentalImpactSoilContamination','EnvironmentalImpactSoilErosion','EnvironmentalImpactUnauthorisedTreeCutting','SocialImpactSexualHarrasmentAtWorkSiteEtc','SocialImpactResettlementOrRehabilitation','SocailImpactDamageOfProperty','SocialImpactLossOfLivelihood') 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 5127c461fb83e18d11aec6f0f01b1eebc0bcb4ac Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 7 Nov 2022 08:32:30 +0530 Subject: [PATCH 0944/1630] Updated tradeType --- configs/egov-indexer/rainmaker-tl-indexer.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configs/egov-indexer/rainmaker-tl-indexer.yml b/configs/egov-indexer/rainmaker-tl-indexer.yml index 00bf726dc..db1121e3b 100644 --- a/configs/egov-indexer/rainmaker-tl-indexer.yml +++ b/configs/egov-indexer/rainmaker-tl-indexer.yml @@ -16,6 +16,8 @@ ServiceMaps: 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 @@ -96,6 +98,9 @@ ServiceMaps: 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 From f2970c6e9993a94ba943a3d11c7a9b4bfd5512c7 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 7 Nov 2022 11:04:36 +0530 Subject: [PATCH 0945/1630] WB report State --- configs/reports/configs/pgr-reports.yml | 148 ++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index c260166c1..643c4f1de 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2406,3 +2406,151 @@ ReportDefinitions: 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: 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 + - 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!='pb.testing' AND + eg_pgr_service.servicecode in ('PipelineWorkTrafficJam','PipelineWorkTrenchpitNotBackfilled','PipelineWorkHouseConnectionDamaged','PipelineWorkRoadNotRestored','CivilWorksOverheadReservoirTank','CivilWorksWaterTreatmentPlant','EnvironmentalImpactHazardousMaterialAtSiteEtc','EnvironmentalImpactNoiseAndAirPollution','EnvironmentalImpactVehiclePollution','EnvironmentalImpactSoilContamination','EnvironmentalImpactSoilErosion','EnvironmentalImpactUnauthorisedTreeCutting','SocialImpactSexualHarrasmentAtWorkSiteEtc','SocialImpactResettlementOrRehabilitation','SocailImpactDamageOfProperty','SocialImpactLossOfLivelihood') + 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 fa90bae835cbc532b7e23a352b39f7efe849ef32 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 7 Nov 2022 12:31:39 +0530 Subject: [PATCH 0946/1630] Update pgr-reports.yml --- configs/reports/configs/pgr-reports.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 643c4f1de..5766ba072 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2011,6 +2011,15 @@ ReportDefinitions: 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: pt + wrapper: true + isMandatory: false + searchClause: AND tenantid = $ulb + query: | SELECT DISTINCT ON (servicerequestid) From 61adb8bd1265ffb16c8e9e993b061a6eb7941f65 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 7 Nov 2022 14:18:46 +0530 Subject: [PATCH 0947/1630] Update pgr-reports.yml --- 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 5766ba072..ed535eaad 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2018,7 +2018,7 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND tenantid = $ulb + searchClause: AND eg_pgr_service.tenantid = $ulb query: | SELECT From 965b6e373271e9136e6f567538a5d28fa87dcd8c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 7 Nov 2022 14:34:15 +0530 Subject: [PATCH 0948/1630] Update pgr-reports.yml --- 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 ed535eaad..4b49a7f95 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2528,7 +2528,7 @@ ReportDefinitions: ( select businesskey,max(eg_pgr_action.when) as actiontime from eg_pgr_action - where tenantid!=$tenantid + where tenantid!='pb.testing' group by businesskey ) SELECT From 3705feed7c3ed95466d4f2cb04a579c951dce182 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 7 Nov 2022 14:46:17 +0530 Subject: [PATCH 0949/1630] Update pgr-reports.yml --- 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 4b49a7f95..7d6a13e1b 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2528,7 +2528,7 @@ ReportDefinitions: ( select businesskey,max(eg_pgr_action.when) as actiontime from eg_pgr_action - where tenantid!='pb.testing' + where tenantid !='pb.testing' group by businesskey ) SELECT @@ -2556,7 +2556,7 @@ ReportDefinitions: --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!='pb.testing' AND + eg_pgr_service.tenantid !='pb.testing' AND eg_pgr_service.servicecode in ('PipelineWorkTrafficJam','PipelineWorkTrenchpitNotBackfilled','PipelineWorkHouseConnectionDamaged','PipelineWorkRoadNotRestored','CivilWorksOverheadReservoirTank','CivilWorksWaterTreatmentPlant','EnvironmentalImpactHazardousMaterialAtSiteEtc','EnvironmentalImpactNoiseAndAirPollution','EnvironmentalImpactVehiclePollution','EnvironmentalImpactSoilContamination','EnvironmentalImpactSoilErosion','EnvironmentalImpactUnauthorisedTreeCutting','SocialImpactSexualHarrasmentAtWorkSiteEtc','SocialImpactResettlementOrRehabilitation','SocailImpactDamageOfProperty','SocialImpactLossOfLivelihood') AND eg_pgr_address.uuid = eg_pgr_service.addressid AND eg_pgr_service.status IN ('open','assigned','reassigrequested','rejected','closed','resolved') From f6f2470a433f3f532c0bd79e191e23351931bccc Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 7 Nov 2022 14:55:49 +0530 Subject: [PATCH 0950/1630] Update pgr-reports.yml --- configs/reports/configs/pgr-reports.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 7d6a13e1b..d13139f68 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2423,17 +2423,13 @@ ReportDefinitions: 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 + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs 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 + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department 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 From e587c16ce16fd5357e547d76fad3012b27b5ff21 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 7 Nov 2022 15:01:32 +0530 Subject: [PATCH 0951/1630] Update pgr-reports.yml --- 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 d13139f68..b85894132 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2015,7 +2015,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: pt + source: eg_pgr_service wrapper: true isMandatory: false searchClause: AND eg_pgr_service.tenantid = $ulb From b83192fd093fe1db87723e5d50122594dc4a7282 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 7 Nov 2022 15:18:11 +0530 Subject: [PATCH 0952/1630] Update pgr-reports.yml --- 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 b85894132..ce4c223e0 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2423,11 +2423,11 @@ ReportDefinitions: 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 + 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 + 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: From d50dce1c4963ad8512ff4cb4ce4f2eba02933b6b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 7 Nov 2022 15:45:41 +0530 Subject: [PATCH 0953/1630] Update pgr-reports.yml --- 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 ce4c223e0..232c261f0 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2556,6 +2556,6 @@ ReportDefinitions: eg_pgr_service.servicecode in ('PipelineWorkTrafficJam','PipelineWorkTrenchpitNotBackfilled','PipelineWorkHouseConnectionDamaged','PipelineWorkRoadNotRestored','CivilWorksOverheadReservoirTank','CivilWorksWaterTreatmentPlant','EnvironmentalImpactHazardousMaterialAtSiteEtc','EnvironmentalImpactNoiseAndAirPollution','EnvironmentalImpactVehiclePollution','EnvironmentalImpactSoilContamination','EnvironmentalImpactSoilErosion','EnvironmentalImpactUnauthorisedTreeCutting','SocialImpactSexualHarrasmentAtWorkSiteEtc','SocialImpactResettlementOrRehabilitation','SocailImpactDamageOfProperty','SocialImpactLossOfLivelihood') 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 + orderby: ORDER BY servicerequestid, epa.when desc From a9863c6dab74ee25ea5f9115a906f73f34e9e4b0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 7 Nov 2022 16:32:44 +0530 Subject: [PATCH 0954/1630] Update pgr-reports.yml --- configs/reports/configs/pgr-reports.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 232c261f0..d17bd2324 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2532,7 +2532,8 @@ ReportDefinitions: (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, + --(SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, + 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 a513d50273d8cbf12ebac62b059adbb15f6fa178 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 11 Nov 2022 11:29:11 +0530 Subject: [PATCH 0955/1630] Update pgr-reports.yml --- configs/reports/configs/pgr-reports.yml | 60 ++++++++++++------------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index d17bd2324..96f84111f 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2506,6 +2506,11 @@ ReportDefinitions: 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 @@ -2520,43 +2525,34 @@ ReportDefinitions: 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 !='pb.testing' - 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, - 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 + 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') - 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 !='pb.testing' AND - eg_pgr_service.servicecode in ('PipelineWorkTrafficJam','PipelineWorkTrenchpitNotBackfilled','PipelineWorkHouseConnectionDamaged','PipelineWorkRoadNotRestored','CivilWorksOverheadReservoirTank','CivilWorksWaterTreatmentPlant','EnvironmentalImpactHazardousMaterialAtSiteEtc','EnvironmentalImpactNoiseAndAirPollution','EnvironmentalImpactVehiclePollution','EnvironmentalImpactSoilContamination','EnvironmentalImpactSoilErosion','EnvironmentalImpactUnauthorisedTreeCutting','SocialImpactSexualHarrasmentAtWorkSiteEtc','SocialImpactResettlementOrRehabilitation','SocailImpactDamageOfProperty','SocialImpactLossOfLivelihood') + 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','SocailImpactDamageOfProperty','SocialImpactLossOfLivelihood') AND eg_pgr_service.status IN ('open','assigned','reassigrequested','rejected','closed','resolved') - orderby: ORDER BY servicerequestid, epa.when desc + orderby: ORDER BY servicerequestid, epa."when" desc From 89299d882ea48ec211357bbcea18dee6e6d67fff Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 11 Nov 2022 11:36:03 +0530 Subject: [PATCH 0956/1630] Update pgr-reports.yml --- 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 96f84111f..13a8fb55e 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2551,7 +2551,7 @@ ReportDefinitions: 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','SocailImpactDamageOfProperty','SocialImpactLossOfLivelihood') + 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 From 95ced430a77967bc3938a09b083ecdeb5ecf9d46 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 11 Nov 2022 11:51:05 +0530 Subject: [PATCH 0957/1630] Update pgr-reports.yml --- configs/reports/configs/pgr-reports.yml | 52 +++++++++++-------------- 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 13a8fb55e..f6feb0881 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2378,41 +2378,33 @@ ReportDefinitions: 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 + 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') - 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_service.servicecode in ('PipelineWorkTrafficJam','PipelineWorkTrenchpitNotBackfilled','PipelineWorkHouseConnectionDamaged','PipelineWorkRoadNotRestored','CivilWorksOverheadReservoirTank','CivilWorksWaterTreatmentPlant','EnvironmentalImpactHazardousMaterialAtSiteEtc','EnvironmentalImpactNoiseAndAirPollution','EnvironmentalImpactVehiclePollution','EnvironmentalImpactSoilContamination','EnvironmentalImpactSoilErosion','EnvironmentalImpactUnauthorisedTreeCutting','SocialImpactSexualHarrasmentAtWorkSiteEtc','SocialImpactResettlementOrRehabilitation','SocailImpactDamageOfProperty','SocialImpactLossOfLivelihood') + 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 From 7b11cde430e6f2664468bf390f6072f20414769a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 11 Nov 2022 12:50:04 +0530 Subject: [PATCH 0958/1630] Update pgr-reports.yml --- 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 f6feb0881..b41cfe56a 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2391,8 +2391,7 @@ ReportDefinitions: eg_pgr_address.landmark, eg_pgr_address.housenoandstreetname as address, description, - source, - eg_pgr_service.tenantid, + 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 9aaae3b8b3d8d9245594f62339b3983ab115056a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 11 Nov 2022 13:04:58 +0530 Subject: [PATCH 0959/1630] Update pgr-reports.yml --- configs/reports/configs/pgr-reports.yml | 47 +++++++++++++++---------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index b41cfe56a..3a7ea37b3 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2378,29 +2378,38 @@ ReportDefinitions: 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 + 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') - left outer join eg_user as ua on (ua.id = epa.assignee::int or ua.id = split_part(epa.by,':',1)::INTEGER) - WHERE + 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.servicecode in ('PipelineWorkTrafficJam','PipelineWorkTrenchpitNotBackfilled','PipelineWorkHouseConnectionDamaged','PipelineWorkRoadNotRestored','CivilWorksOverheadReservoirTank','CivilWorksWaterTreatmentPlant','EnvironmentalImpactHazardousMaterialAtSiteEtc','EnvironmentalImpactNoiseAndAirPollution','EnvironmentalImpactVehiclePollution','EnvironmentalImpactSoilContamination','EnvironmentalImpactSoilErosion','EnvironmentalImpactUnauthorisedTreeCutting','SocialImpactSexualHarrasmentAtWorkSiteEtc','SocialImpactResettlementOrRehabilitation','SocialImpactDamageOfProperty','SocialImpactLossOfLivelihood') From d8e15516cfef8002ab51731f38f2b6be44f2d641 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 11 Nov 2022 13:16:06 +0530 Subject: [PATCH 0960/1630] Update pgr-reports.yml --- configs/reports/configs/pgr-reports.yml | 47 ++++++++++--------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 3a7ea37b3..b41cfe56a 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2378,38 +2378,29 @@ ReportDefinitions: 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 + 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') - 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 + 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') From d129ef60fd99735bdaf327e2ffddfe0e22b342b3 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 11 Nov 2022 13:32:37 +0530 Subject: [PATCH 0961/1630] Update pgr-reports.yml --- 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 b41cfe56a..3a281f59c 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2405,7 +2405,7 @@ ReportDefinitions: 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 + orderby: ORDER BY servicerequestid, epa.when desc - reportName: StateWBDescriptionReport_NEW_v2 decryptionPathId: DescriptionReport_v2 From ccce48ff3fbc5ca477717b2b4d729147b56e3f2f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 11 Nov 2022 13:35:06 +0530 Subject: [PATCH 0962/1630] Update pgr-reports.yml --- configs/reports/configs/pgr-reports.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 3a281f59c..be5d2b022 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2284,10 +2284,6 @@ 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: - name: department label: reports.rainmaker-pgr.department From 29f931624fbc7c50867db67c652214f8cbb5fb51 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 11 Nov 2022 16:32:37 +0530 Subject: [PATCH 0963/1630] Msevaapp report --- configs/reports/configs/pgr-reports.yml | 140 +++++++++++++++++++++++- 1 file changed, 139 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index be5d2b022..f718c9fad 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2541,5 +2541,143 @@ ReportDefinitions: 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','rejected','closed','resolved') + orderby: ORDER BY servicerequestid, epa."when" desc From 32a125b97a1bddefe2a585792337d6acc2f1d400 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Tue, 15 Nov 2022 18:21:24 +0530 Subject: [PATCH 0964/1630] chnage the logo --- 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 776d25a58..fe887276f 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}} {{Municipal_Corporation}}", "style": "receipt-logo-header" }, { From 905af35038544c7c5fb4e6abf0fd200fb15de7e4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 16 Nov 2022 10:06:34 +0530 Subject: [PATCH 0965/1630] mseva app report --- 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 f718c9fad..2193f6184 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2678,6 +2678,6 @@ ReportDefinitions: 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','rejected','closed','resolved') + AND eg_pgr_service.status IN ('open','assigned','reassigrequested') orderby: ORDER BY servicerequestid, epa."when" desc From 6948cb749ea54dfb03e326fe519ec62c0022e3a6 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Wed, 16 Nov 2022 17:47:31 +0530 Subject: [PATCH 0966/1630] Reverted mcGrade the logo change --- 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 fe887276f..776d25a58 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" }, { From 79b467e1640893bd26421e63150a8d17e7ef9b66 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Wed, 16 Nov 2022 17:55:15 +0530 Subject: [PATCH 0967/1630] changed to generated_by changed to generated_by from Printec by an it is not configured in the format file --- 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 e16085b0e..3fbff9ced 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -402,7 +402,7 @@ } }, { - "variable": "Printed By", + "variable": "generated_by", "value": { "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" }, From fc1cb1eb8369741f51abc15638d6f318c895c397 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Wed, 16 Nov 2022 18:51:36 +0530 Subject: [PATCH 0968/1630] removed the mcGrade for 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 776d25a58..dd07fecd4 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" }, { From 9deeabe64fd7ed0ae365f3386e15576aa59f7d3a Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Wed, 16 Nov 2022 20:46:03 +0530 Subject: [PATCH 0969/1630] corrected the table schema Add the 8 columns instead the 4 columns which are defined. --- configs/pdf-service/format-config/ws-onetime-receipt.json | 4 +++- 1 file changed, 3 insertions(+), 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 dd07fecd4..be8ef08b1 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -573,7 +573,9 @@ false ], "style": "receipt-table-value" - }, + } + ], + [ { "text": "{{propertyID}}", "border": [ From 0c8e28c57b1f8b8dfcac836b0b64cb7dd07864ac Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Thu, 17 Nov 2022 09:06:02 +0530 Subject: [PATCH 0970/1630] revered the changes added {{mcGrade}} --- 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 be8ef08b1..8d78f6728 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}}", + "text": "{{logo-header}{{mcGrade}}}", "style": "receipt-logo-header" }, { From 058647cdc834f521dfcad900d315a9edbe9d432d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 18 Nov 2022 12:26:19 +0530 Subject: [PATCH 0971/1630] STATEDUMPDEPARTMENT_REPORT_V2 --- configs/reports/configs/pt-reports.yml | 155 +++++++++++++++++++++++++ 1 file changed, 155 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 792ea2aab..2a899ee09 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8497,4 +8497,159 @@ ReportDefinitions: 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: receiptnumber + label: reports.pt.receiptnumber + 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: true + searchClause: AND rp.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rp.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 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 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 + ) + 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 + where pt.tenantid=$tenantid and (propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL' + + + + From 5cc4ae6fa4bca9ee7b56b88f52ff598055e56092 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 21 Nov 2022 10:15:24 +0530 Subject: [PATCH 0972/1630] 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 2a899ee09..5baed3854 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8583,7 +8583,7 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND 1=1 + searchClause: AND bd.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 From b748f69badf405e34ff45519aca8a45dfff7e719 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 21 Nov 2022 10:34:56 +0530 Subject: [PATCH 0973/1630] Update pt-reports.yml --- 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 5baed3854..66845930a 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8594,7 +8594,7 @@ ReportDefinitions: 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 + from report_owners where status='ACTIVE' and tenantid !='pb.testing' group by propertyid ), units as @@ -8604,7 +8604,7 @@ ReportDefinitions: --sum(builtuparea) as builtuparea, --string_agg(occupancytype,',') as occupancytype from report_units - where active='true' and tenantid=$tenantid + where active='true' and tenantid !='pb.testing' group by propertyid ) select @@ -8647,7 +8647,7 @@ ReportDefinitions: 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 - where pt.tenantid=$tenantid and (propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL' + where pt.tenantid !='pb.testing' and (propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL' From 760f04d8589531a47de30478902034423356171a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 21 Nov 2022 10:54:14 +0530 Subject: [PATCH 0974/1630] 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 66845930a..61c6cd784 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8583,7 +8583,7 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND bd.tenantid = $ulb + 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 From 8bf79e05c03c34b185dbfbce0cfc519e3e811a49 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 21 Nov 2022 11:17:32 +0530 Subject: [PATCH 0975/1630] department report --- configs/reports/configs/pt-reports.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 61c6cd784..92fe694be 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8582,7 +8582,7 @@ ReportDefinitions: 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 + isMandatory: true 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 @@ -8594,18 +8594,8 @@ ReportDefinitions: 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 !='pb.testing' + from report_owners where status='ACTIVE' and tenantid !='pb.testing' and tenantid = $ulb group by propertyid - ), - units as - ( - select - propertyid - --sum(builtuparea) as builtuparea, - --string_agg(occupancytype,',') as occupancytype - from report_units - where active='true' and tenantid !='pb.testing' - group by propertyid ) select --rp.billid, @@ -8643,7 +8633,6 @@ ReportDefinitions: --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 From e60f7c580b68f226240bd8e78a31ac2b719088ed Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 30 Nov 2022 09:55:23 +0530 Subject: [PATCH 0976/1630] State department report --- configs/reports/configs/pt-reports.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 92fe694be..aab854ee2 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8513,11 +8513,6 @@ ReportDefinitions: type: string source: pt total: false - - name: receiptnumber - label: reports.pt.receiptnumber - type: string - source: pt - total: false - name: totalarea label: reports.pt.totalarea type: string @@ -8569,13 +8564,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND rp.receiptdate >= $fromDate + searchClause: AND pt.createdtime >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND rp.receiptdate <= $toDate + searchClause: AND pt.createdtime <= $toDate - name: ulb label: ULB type: singlevaluelist @@ -8603,7 +8598,7 @@ ReportDefinitions: 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, + --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, @@ -8633,10 +8628,10 @@ ReportDefinitions: --pt.blockname as blockname, pt.propertyusagetype as usagetype from report_properties pt - inner join report_payments as rp on rp.propertyid=pt.propertyid and rp.paymentstatus!='CANCELLED' + --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 - where pt.tenantid !='pb.testing' and (propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL' + where pt.tenantid !='pb.testing' and (propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL' and propertystatus ='ACTIVE' From 3cdf515a2a6bc30d9a20e8c3b7e25ebfca443747 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 2 Dec 2022 10:08:50 +0530 Subject: [PATCH 0977/1630] update report pt --- 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 aab854ee2..5edf3f25d 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8563,13 +8563,13 @@ ReportDefinitions: label: reports.pt.fromDate type: epoch source: pt - isMandatory: true + isMandatory: false searchClause: AND pt.createdtime >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt - isMandatory: true + isMandatory: false searchClause: AND pt.createdtime <= $toDate - name: ulb label: ULB @@ -8631,7 +8631,7 @@ ReportDefinitions: --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 - where pt.tenantid !='pb.testing' and (propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL' and propertystatus ='ACTIVE' + where pt.tenantid !='pb.testing' and (propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL' and propertystatus ='ACTIVE' and pt.createdtime >= 1668420262000 and pt.createdtime <= 1636884262000 From a3eb5e89ca32602046578544d6277278ec418b95 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 5 Dec 2022 11:43:54 +0530 Subject: [PATCH 0978/1630] district amritsar --- 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 5edf3f25d..1deb507d4 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8571,14 +8571,6 @@ ReportDefinitions: 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: true - 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 @@ -8589,7 +8581,7 @@ ReportDefinitions: 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 !='pb.testing' and tenantid = $ulb + from report_owners where status='ACTIVE' and tenantid in ('pb.ajnala','pb.jandialaguru','pb.majitha','pb.rajasansi','pb.ramdass','pb.rayya') group by propertyid ) select @@ -8631,7 +8623,7 @@ ReportDefinitions: --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 - where pt.tenantid !='pb.testing' and (propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL' and propertystatus ='ACTIVE' and pt.createdtime >= 1668420262000 and pt.createdtime <= 1636884262000 + where pt.tenantid in ('pb.ajnala','pb.jandialaguru','pb.majitha','pb.rajasansi','pb.ramdass','pb.rayya') and (propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL' and propertystatus ='ACTIVE' From 05a7c6ef827a943c764163237d73af5dcb7b42ad Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 5 Dec 2022 12:48:59 +0530 Subject: [PATCH 0979/1630] barnala district --- 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 1deb507d4..4a11d7480 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.ajnala','pb.jandialaguru','pb.majitha','pb.rajasansi','pb.ramdass','pb.rayya') + from report_owners where status='ACTIVE' and tenantid in ('pb.barnala','pb.bhadaur','pb.dhanaula','pb.handiaya','pb.tapa') group by propertyid ) select @@ -8623,7 +8623,7 @@ ReportDefinitions: --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 - where pt.tenantid in ('pb.ajnala','pb.jandialaguru','pb.majitha','pb.rajasansi','pb.ramdass','pb.rayya') and (propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL' and propertystatus ='ACTIVE' + where pt.tenantid in ('pb.barnala','pb.bhadaur','pb.dhanaula','pb.handiaya','pb.tapa') and (propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL' and propertystatus ='ACTIVE' From 0bdb9ed1da4608ea868445928a83cda5af8b3d2f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 5 Dec 2022 13:08:37 +0530 Subject: [PATCH 0980/1630] district barnala --- 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 4a11d7480..a1205894e 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.barnala','pb.bhadaur','pb.dhanaula','pb.handiaya','pb.tapa') + from report_owners where status='ACTIVE' and tenantid in ('pb.balianwali','pb.bhagtabhai','pb.bhairoopa','pb.bhuchomandi','pb.chaunke','pb.goniana','pb.kotfatta','pb.kothaguru','pb.kotshamir','pb.lehramohabbat','pb.maluka','pb.mandikalan','pb.maur','pb.mehraj','pb.nathana','pb.raman','pb.rampura','pb.rampuraphul','pb.sangatmandi','pb.talwandisabo') group by propertyid ) select @@ -8623,7 +8623,7 @@ ReportDefinitions: --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 - where pt.tenantid in ('pb.barnala','pb.bhadaur','pb.dhanaula','pb.handiaya','pb.tapa') and (propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL' and propertystatus ='ACTIVE' + where pt.tenantid in ('pb.balianwali','pb.bhagtabhai','pb.bhairoopa','pb.bhuchomandi','pb.chaunke','pb.goniana','pb.kotfatta','pb.kothaguru','pb.kotshamir','pb.lehramohabbat','pb.maluka','pb.mandikalan','pb.maur','pb.mehraj','pb.nathana','pb.raman','pb.rampura','pb.rampuraphul','pb.sangatmandi','pb.talwandisabo') and (propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL' and propertystatus ='ACTIVE' From 74bb22f69f2a6b15465a0343911545c0d71b1bbd Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 5 Dec 2022 16:19:04 +0530 Subject: [PATCH 0981/1630] district amritsar --- configs/reports/configs/pt-reports.yml | 29 +++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index a1205894e..f3d979c3b 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8579,10 +8579,27 @@ ReportDefinitions: 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, + split_part(string_agg(emailid,','),',',1) as emailid, propertyid - from report_owners where status='ACTIVE' and tenantid in ('pb.balianwali','pb.bhagtabhai','pb.bhairoopa','pb.bhuchomandi','pb.chaunke','pb.goniana','pb.kotfatta','pb.kothaguru','pb.kotshamir','pb.lehramohabbat','pb.maluka','pb.mandikalan','pb.maur','pb.mehraj','pb.nathana','pb.raman','pb.rampura','pb.rampuraphul','pb.sangatmandi','pb.talwandisabo') + from report_owners where status='ACTIVE' and tenantid in ('pb.ajnala','pb.majitha','pb.rajasansi','pb.ramdass','pb.rayya') group by propertyid + ), + properties as + ( + select + propertyid, + split_part(string_agg(tenantid,'___'),'___',1) as tenantid, + split_part(string_agg(address,'___'),'___',1) as address, + split_part(string_agg(localityname,'___'),'___',1) as localityname, + split_part(string_agg(plotsize::text,'___'),'___',1) as plotsize, + split_part(string_agg(propertyusagetype,'___'),'___',1) as usagetype + from report_properties + where propertystatus='ACTIVE' + and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') + or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') + or propertyusagetype!='RESIDENTIAL') + and tenantid in ('pb.ajnala','pb.majitha','pb.rajasansi','pb.ramdass','pb.rayya') + group by propertyid ) select --rp.billid, @@ -8618,13 +8635,11 @@ ReportDefinitions: pt.localityname as localityname, --pt.zonename as zonename, --pt.blockname as blockname, - pt.propertyusagetype as usagetype - from report_properties pt + pt.usagetype as usagetype + from properties pt --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 - where pt.tenantid in ('pb.balianwali','pb.bhagtabhai','pb.bhairoopa','pb.bhuchomandi','pb.chaunke','pb.goniana','pb.kotfatta','pb.kothaguru','pb.kotshamir','pb.lehramohabbat','pb.maluka','pb.mandikalan','pb.maur','pb.mehraj','pb.nathana','pb.raman','pb.rampura','pb.rampuraphul','pb.sangatmandi','pb.talwandisabo') and (propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL' and propertystatus ='ACTIVE' - + inner join owners on owners.propertyid=pt.propertyid From 5c58e613f98f2200a579c70197fcbb67286b3059 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 5 Dec 2022 16:29:09 +0530 Subject: [PATCH 0982/1630] barnala district --- 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 f3d979c3b..ca7dfae07 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.ajnala','pb.majitha','pb.rajasansi','pb.ramdass','pb.rayya') + from report_owners where status='ACTIVE' and tenantid in ('pb.barnala','pb.bhadaur','pb.dhanaula','pb.handiaya','pb.tapa') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.ajnala','pb.majitha','pb.rajasansi','pb.ramdass','pb.rayya') + and tenantid in ('pb.barnala','pb.bhadaur','pb.dhanaula','pb.handiaya','pb.tapa') group by propertyid ) select From a2f11f40d0b3f3f856ba0b94ebe6c574a6654553 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 5 Dec 2022 16:38:20 +0530 Subject: [PATCH 0983/1630] bathinda district --- 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 ca7dfae07..6f00f50c3 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.barnala','pb.bhadaur','pb.dhanaula','pb.handiaya','pb.tapa') + from report_owners where status='ACTIVE' and tenantid in ('pb.balianwali','pb.bhagtabhai','pb.bhairoopa','pb.bhuchomandi','pb.chaunke','pb.goniana','pb.kotfatta','pb.kothaguru','pb.kotshamir','pb.lehramohabbat','pb.maluka','pb.mandikalan','pb.maur','pb.mehraj','pb.nathana','pb.raman','pb.rampura','pb.rampuraphul','pb.sangatmandi','pb.talwandisabo') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.barnala','pb.bhadaur','pb.dhanaula','pb.handiaya','pb.tapa') + and tenantid in ('pb.balianwali','pb.bhagtabhai','pb.bhairoopa','pb.bhuchomandi','pb.chaunke','pb.goniana','pb.kotfatta','pb.kothaguru','pb.kotshamir','pb.lehramohabbat','pb.maluka','pb.mandikalan','pb.maur','pb.mehraj','pb.nathana','pb.raman','pb.rampura','pb.rampuraphul','pb.sangatmandi','pb.talwandisabo') group by propertyid ) select From 3520793d68aadcdd2dea10a8c8dfce30343a9a8f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 5 Dec 2022 16:49:12 +0530 Subject: [PATCH 0984/1630] district faridkot --- 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 6f00f50c3..b8249bca3 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.balianwali','pb.bhagtabhai','pb.bhairoopa','pb.bhuchomandi','pb.chaunke','pb.goniana','pb.kotfatta','pb.kothaguru','pb.kotshamir','pb.lehramohabbat','pb.maluka','pb.mandikalan','pb.maur','pb.mehraj','pb.nathana','pb.raman','pb.rampura','pb.rampuraphul','pb.sangatmandi','pb.talwandisabo') + from report_owners where status='ACTIVE' and tenantid in ('pb.faridkot','pb.jaitu','pb.kotkapura') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.balianwali','pb.bhagtabhai','pb.bhairoopa','pb.bhuchomandi','pb.chaunke','pb.goniana','pb.kotfatta','pb.kothaguru','pb.kotshamir','pb.lehramohabbat','pb.maluka','pb.mandikalan','pb.maur','pb.mehraj','pb.nathana','pb.raman','pb.rampura','pb.rampuraphul','pb.sangatmandi','pb.talwandisabo') + and tenantid in ('pb.faridkot','pb.jaitu','pb.kotkapura') group by propertyid ) select From 11ff973484f28881003dfb005aa5b3618d057ecb Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 5 Dec 2022 17:19:16 +0530 Subject: [PATCH 0985/1630] district fatehgarh sahib --- 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 b8249bca3..65487286a 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.faridkot','pb.jaitu','pb.kotkapura') + from report_owners where status='ACTIVE' and tenantid in ('pb.amloh','pb.bassipathana','pb.khamano','pb.mandigobindgarh','pb.sirhind') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.faridkot','pb.jaitu','pb.kotkapura') + and tenantid in ('pb.amloh','pb.bassipathana','pb.khamano','pb.mandigobindgarh','pb.sirhind') group by propertyid ) select From e88e331955d4de8fdccb075852be72aa26c8ba35 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 Dec 2022 09:39:05 +0530 Subject: [PATCH 0986/1630] district fazilka --- 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 65487286a..4f240e481 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.amloh','pb.bassipathana','pb.khamano','pb.mandigobindgarh','pb.sirhind') + from report_owners where status='ACTIVE' and tenantid in ('pb.abohar','pb.arniwala','pb.fazilka','pb.jalalabad') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.amloh','pb.bassipathana','pb.khamano','pb.mandigobindgarh','pb.sirhind') + and tenantid in ('pb.abohar','pb.arniwala','pb.fazilka','pb.jalalabad') group by propertyid ) select From db667907a7ce3277c83bc7c7cb1251c2696b860d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 Dec 2022 10:03:35 +0530 Subject: [PATCH 0987/1630] district ferozepur --- 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 4f240e481..14f78f377 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.abohar','pb.arniwala','pb.fazilka','pb.jalalabad') + from report_owners where status='ACTIVE' and tenantid in ('pb.ferozepur','pb.guruharsahai','pb.makhu','pb.mallanwala','pb.mamdot','pb.mudki','pb.talwandibhai','pb.zira') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.abohar','pb.arniwala','pb.fazilka','pb.jalalabad') + and tenantid in ('pb.ferozepur','pb.guruharsahai','pb.makhu','pb.mallanwala','pb.mamdot','pb.mudki','pb.talwandibhai','pb.zira') group by propertyid ) select From 9b09875fb2590c8aea0c0ab6be4e77fde0fb682b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 Dec 2022 10:29:34 +0530 Subject: [PATCH 0988/1630] district gurdaspur --- 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 14f78f377..1a7718a09 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.ferozepur','pb.guruharsahai','pb.makhu','pb.mallanwala','pb.mamdot','pb.mudki','pb.talwandibhai','pb.zira') + from report_owners where status='ACTIVE' and tenantid in ('pb.batala','pb.derababananak','pb.dhariwal','pb.dinanagar','pb.fatehgarhchurian','pb.gurdaspur','pb.quadian','pb.srihargobindpur') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.ferozepur','pb.guruharsahai','pb.makhu','pb.mallanwala','pb.mamdot','pb.mudki','pb.talwandibhai','pb.zira') + and tenantid in ('pb.batala','pb.derababananak','pb.dhariwal','pb.dinanagar','pb.fatehgarhchurian','pb.gurdaspur','pb.quadian','pb.srihargobindpur') group by propertyid ) select From 8012f4bf60f10e31df807c78d0566e950f0d47c7 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 Dec 2022 10:50:02 +0530 Subject: [PATCH 0989/1630] district hoshiarpur --- 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 1a7718a09..ff53b77f7 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.batala','pb.derababananak','pb.dhariwal','pb.dinanagar','pb.fatehgarhchurian','pb.gurdaspur','pb.quadian','pb.srihargobindpur') + from report_owners where status='ACTIVE' and tenantid in ('pb.dasuya','pb.garhdiwala','pb.garhshankar','pb.hariana','pb.hoshiarpur','pb.mahilpur','pb.mukerian','pb.shamchurasi','pb.talwara','pb.urmartanda') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.batala','pb.derababananak','pb.dhariwal','pb.dinanagar','pb.fatehgarhchurian','pb.gurdaspur','pb.quadian','pb.srihargobindpur') + and tenantid in ('pb.dasuya','pb.garhdiwala','pb.garhshankar','pb.hariana','pb.hoshiarpur','pb.mahilpur','pb.mukerian','pb.shamchurasi','pb.talwara','pb.urmartanda') group by propertyid ) select From 4b555623a2c1011d27979ee31561eac78462fd2b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 Dec 2022 11:35:48 +0530 Subject: [PATCH 0990/1630] jalandhar district --- 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 ff53b77f7..4f4e0347c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.dasuya','pb.garhdiwala','pb.garhshankar','pb.hariana','pb.hoshiarpur','pb.mahilpur','pb.mukerian','pb.shamchurasi','pb.talwara','pb.urmartanda') + from report_owners where status='ACTIVE' and tenantid in ('pb.adampur','pb.alawalpur','pb.bhogpur','pb.bilga','pb.goraya','pb.kartarpur','pb.lohiankhas','pb.mehatpur','pb.nakodar','pb.nurmahal','pb.phagwara','pb.phillaur','pb.shahkot') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.dasuya','pb.garhdiwala','pb.garhshankar','pb.hariana','pb.hoshiarpur','pb.mahilpur','pb.mukerian','pb.shamchurasi','pb.talwara','pb.urmartanda') + and tenantid in ('pb.adampur','pb.alawalpur','pb.bhogpur','pb.bilga','pb.goraya','pb.kartarpur','pb.lohiankhas','pb.mehatpur','pb.nakodar','pb.nurmahal','pb.phagwara','pb.phillaur','pb.shahkot') group by propertyid ) select From 9495ae1479413d851019d357170e60b9ad1df0d4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 Dec 2022 12:22:33 +0530 Subject: [PATCH 0991/1630] kapurthala district --- 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 4f4e0347c..d8e9f4db1 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.adampur','pb.alawalpur','pb.bhogpur','pb.bilga','pb.goraya','pb.kartarpur','pb.lohiankhas','pb.mehatpur','pb.nakodar','pb.nurmahal','pb.phagwara','pb.phillaur','pb.shahkot') + from report_owners where status='ACTIVE' and tenantid in ('pb.begowal','pb.bhulath','pb.dhilwan','pb.kapurthala','pb.nadala','pb.sultanpurlodhi') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.adampur','pb.alawalpur','pb.bhogpur','pb.bilga','pb.goraya','pb.kartarpur','pb.lohiankhas','pb.mehatpur','pb.nakodar','pb.nurmahal','pb.phagwara','pb.phillaur','pb.shahkot') + and tenantid in ('pb.begowal','pb.bhulath','pb.dhilwan','pb.kapurthala','pb.nadala','pb.sultanpurlodhi') group by propertyid ) select From af1aabaa52dc174c81538a1e8e09e7698c124508 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 Dec 2022 12:42:52 +0530 Subject: [PATCH 0992/1630] district ludhiana --- 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 d8e9f4db1..6413d1de9 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.begowal','pb.bhulath','pb.dhilwan','pb.kapurthala','pb.nadala','pb.sultanpurlodhi') + from report_owners where status='ACTIVE' and tenantid in ('pb.doraha','pb.jagraon','pb.khanna','pb.machhiwara','pb.maloud','pb.mullanpur','pb.payal','pb.raikot','pb.sahnewal','pb.samrala') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.begowal','pb.bhulath','pb.dhilwan','pb.kapurthala','pb.nadala','pb.sultanpurlodhi') + and tenantid in ('pb.doraha','pb.jagraon','pb.khanna','pb.machhiwara','pb.maloud','pb.mullanpur','pb.payal','pb.raikot','pb.sahnewal','pb.samrala') group by propertyid ) select From 7bf869d2bd94a631787a1d09a41dd2094b39dd93 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 Dec 2022 12:58:18 +0530 Subject: [PATCH 0993/1630] district mansa --- 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 6413d1de9..12d772ec5 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.doraha','pb.jagraon','pb.khanna','pb.machhiwara','pb.maloud','pb.mullanpur','pb.payal','pb.raikot','pb.sahnewal','pb.samrala') + from report_owners where status='ACTIVE' and tenantid in ('pb.bareta','pb.bhikhi','pb.boha','pb.budhlada','pb.joga','pb.mansa','pb.sardulgarh') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.doraha','pb.jagraon','pb.khanna','pb.machhiwara','pb.maloud','pb.mullanpur','pb.payal','pb.raikot','pb.sahnewal','pb.samrala') + and tenantid in ('pb.bareta','pb.bhikhi','pb.boha','pb.budhlada','pb.joga','pb.mansa','pb.sardulgarh') group by propertyid ) select From 9b16f9c0165a87dcf898035a5f5138eb7f0603f4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 Dec 2022 13:01:08 +0530 Subject: [PATCH 0994/1630] district ludh --- 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 12d772ec5..6413d1de9 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.bareta','pb.bhikhi','pb.boha','pb.budhlada','pb.joga','pb.mansa','pb.sardulgarh') + from report_owners where status='ACTIVE' and tenantid in ('pb.doraha','pb.jagraon','pb.khanna','pb.machhiwara','pb.maloud','pb.mullanpur','pb.payal','pb.raikot','pb.sahnewal','pb.samrala') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.bareta','pb.bhikhi','pb.boha','pb.budhlada','pb.joga','pb.mansa','pb.sardulgarh') + and tenantid in ('pb.doraha','pb.jagraon','pb.khanna','pb.machhiwara','pb.maloud','pb.mullanpur','pb.payal','pb.raikot','pb.sahnewal','pb.samrala') group by propertyid ) select From 85e3a1395c3e67761417f7c23fae080577a7ba3f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 Dec 2022 13:08:22 +0530 Subject: [PATCH 0995/1630] district mansa --- 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 6413d1de9..12d772ec5 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.doraha','pb.jagraon','pb.khanna','pb.machhiwara','pb.maloud','pb.mullanpur','pb.payal','pb.raikot','pb.sahnewal','pb.samrala') + from report_owners where status='ACTIVE' and tenantid in ('pb.bareta','pb.bhikhi','pb.boha','pb.budhlada','pb.joga','pb.mansa','pb.sardulgarh') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.doraha','pb.jagraon','pb.khanna','pb.machhiwara','pb.maloud','pb.mullanpur','pb.payal','pb.raikot','pb.sahnewal','pb.samrala') + and tenantid in ('pb.bareta','pb.bhikhi','pb.boha','pb.budhlada','pb.joga','pb.mansa','pb.sardulgarh') group by propertyid ) select From 0dee869c0ba4dd62c0db27e12553dabc0cfb8201 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 Dec 2022 14:48:08 +0530 Subject: [PATCH 0996/1630] district moga --- 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 12d772ec5..013c11397 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.bareta','pb.bhikhi','pb.boha','pb.budhlada','pb.joga','pb.mansa','pb.sardulgarh') + from report_owners where status='ACTIVE' and tenantid in ('pb.badhnikalan','pb.baghapurana','pb.dharamkot','pb.fatehgarhpanjtoor','pb.kotissekhan','pbmoga','pb.nihalsinghwala') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.bareta','pb.bhikhi','pb.boha','pb.budhlada','pb.joga','pb.mansa','pb.sardulgarh') + and tenantid in ('pb.badhnikalan','pb.baghapurana','pb.dharamkot','pb.fatehgarhpanjtoor','pb.kotissekhan','pbmoga','pb.nihalsinghwala') group by propertyid ) select From 1f4c900457d90d9c2ae5c555de17deaf73bddda9 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 Dec 2022 14:49:25 +0530 Subject: [PATCH 0997/1630] district moga --- 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 013c11397..2fb55207e 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.badhnikalan','pb.baghapurana','pb.dharamkot','pb.fatehgarhpanjtoor','pb.kotissekhan','pbmoga','pb.nihalsinghwala') + from report_owners where status='ACTIVE' and tenantid in ('pb.badhnikalan','pb.baghapurana','pb.dharamkot','pb.fatehgarhpanjtoor','pb.kotissekhan','pb.moga','pb.nihalsinghwala') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.badhnikalan','pb.baghapurana','pb.dharamkot','pb.fatehgarhpanjtoor','pb.kotissekhan','pbmoga','pb.nihalsinghwala') + and tenantid in ('pb.badhnikalan','pb.baghapurana','pb.dharamkot','pb.fatehgarhpanjtoor','pb.kotissekhan','pb.moga','pb.nihalsinghwala') group by propertyid ) select From 2dae60f71c69955da75d8b475b560dc7f0a27d2c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 Dec 2022 15:40:40 +0530 Subject: [PATCH 0998/1630] district mohali --- 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 2fb55207e..070e75103 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.badhnikalan','pb.baghapurana','pb.dharamkot','pb.fatehgarhpanjtoor','pb.kotissekhan','pb.moga','pb.nihalsinghwala') + from report_owners where status='ACTIVE' and tenantid in ('pb.banur','pb.derabassi','pb.kharar','pb.kurali','pb.lalru','pb.nayagaon','pb.zirakpur','pb.gharuan') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.badhnikalan','pb.baghapurana','pb.dharamkot','pb.fatehgarhpanjtoor','pb.kotissekhan','pb.moga','pb.nihalsinghwala') + and tenantid in ('pb.banur','pb.derabassi','pb.kharar','pb.kurali','pb.lalru','pb.nayagaon','pb.zirakpur','pb.gharuan') group by propertyid ) select From 36f18f409d7c17a8ba8166d1da8200777b990e13 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 Dec 2022 16:54:02 +0530 Subject: [PATCH 0999/1630] district mohali --- 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 070e75103..0bb7ca80b 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.banur','pb.derabassi','pb.kharar','pb.kurali','pb.lalru','pb.nayagaon','pb.zirakpur','pb.gharuan') + from report_owners where status='ACTIVE' and tenantid in ('pb.banur','pb.derabassi','pb.kharar','pb.kurali') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.banur','pb.derabassi','pb.kharar','pb.kurali','pb.lalru','pb.nayagaon','pb.zirakpur','pb.gharuan') + and tenantid in ('pb.banur','pb.derabassi','pb.kharar','pb.kurali') group by propertyid ) select From cfa442d70e684cfc5631e4414f7e0ca865b4d970 Mon Sep 17 00:00:00 2001 From: kokila-eGov <97164202+kokila-eGov@users.noreply.github.com> Date: Tue, 6 Dec 2022 18:30:02 +0530 Subject: [PATCH 1000/1630] Update ChartApiConfig.json (#573) Added resolved and reopened complaints KPI for PGR --- .../dashboard-analytics/ChartApiConfig.json | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 24faa2f8b..9a01062f1 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2422,6 +2422,66 @@ }, "_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.status.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 " + }, "cumulativeClosedComplaints": { "chartName": "DSS_TOTAL_CUMULATIVE_CLOSED_COMPLAINTS", "queries": [ From f25ee99e9b9bb2c7d105f2cfebe29b57af220a74 Mon Sep 17 00:00:00 2001 From: kokila-eGov <97164202+kokila-eGov@users.noreply.github.com> Date: Tue, 6 Dec 2022 18:32:06 +0530 Subject: [PATCH 1001/1630] Update MasterDashboardConfig.json (#574) added master dashboard config for resolved and reopend complaints --- .../MasterDashboardConfig.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index d29525d1c..b4d7b0111 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -1137,6 +1137,14 @@ "filter": "", "headers": [] }, + { + "id": "resolvedComplaints", + "name": "DSS_PGR_RESOLVED_COMPLAINTS", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, { "id": "closedComplaints", "name": "DSS_PGR_CLOSED_COMPLAINTS", @@ -1145,6 +1153,14 @@ "filter": "", "headers": [] }, + { + "id": "reopenedComplaints", + "name": "DSS_PGR_REOPENED_COMPLAINTS", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, { "id": "slaAchieved", "name": "DSS_SLA_ACHIEVED", From bb7bdb3709b9ba27d0046be0146577317afc645a Mon Sep 17 00:00:00 2001 From: kokila-eGov <97164202+kokila-eGov@users.noreply.github.com> Date: Wed, 7 Dec 2022 09:22:24 +0530 Subject: [PATCH 1002/1630] Update ChartApiConfig.json (#575) UM-5279 changed cumulative complaint, closed complaint and overview card KPIs --- .../dashboard-analytics/ChartApiConfig.json | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 9a01062f1..8fea9080c 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1,3 +1,4 @@ + { "_comment": "dss-collectionindex new queries ", @@ -2331,15 +2332,15 @@ }, "_comment": "PGR NON-COLLECTION CHARTS", - "completionRate": { - "chartName": "DSS_PGR_COMPLETION_RATE", + "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\":{\"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\":{\"resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}}}}}}}}}" } ], "chartType": "metric", @@ -2400,7 +2401,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\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}}}}}}}}}\n" } ], "chartType": "metric", @@ -2430,7 +2431,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\":{\"Reopened Complaints\":{\"filters\":{\"filters\":{\"reopen\":{\"match\":{\"Data.status.keyword\":\"reopen\"}}}}}}}}}" + "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", @@ -2482,7 +2483,7 @@ }, "_comment": " Total Number of Resolved Complaints " }, - "cumulativeClosedComplaints": { + "cumulativeComplaints": { "chartName": "DSS_TOTAL_CUMULATIVE_CLOSED_COMPLAINTS", "queries": [ { @@ -2490,7 +2491,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\":{\"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", @@ -2501,7 +2502,9 @@ "aggregationPaths": [ "Closed Complaints", "Reopened Complaints", - "Total Complaints" + "Total Complaints", + "Resolved Complaints", + "Rejected Complaints" ], "isCumulative": true, From dec0ce43acfa9f89c3205bc74804381b9181caf4 Mon Sep 17 00:00:00 2001 From: kokila-eGov <97164202+kokila-eGov@users.noreply.github.com> Date: Wed, 7 Dec 2022 09:30:46 +0530 Subject: [PATCH 1003/1630] Update MasterDashboardConfig.json (#577) UM-5279 added config for closed, cumulative complaints and overview card KPIs --- .../dashboard-analytics/MasterDashboardConfig.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index b4d7b0111..04b135ce4 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -1107,7 +1107,7 @@ } ] }, - { + { "name": "DSS_PGR_DASHBOARD", "id": "pgr", "isActive": "", @@ -1170,8 +1170,8 @@ "headers": [] }, { - "id": "completionRate", - "name": "DSS_PGR_COMPLETION_RATE", + "id": "complaintsResolvingRate", + "name": "DSS_PGR_COMPLAINTS_RESOLVING_RATE", "code": "", "chartType": "metric", "filter": "", @@ -1181,7 +1181,7 @@ }, { "id": 412, - "name": "DSS_TOTAL_CUMULATIVE_CLOSED_COMPLAINTS", + "name": "DSS_TOTAL_CUMULATIVE_COMPLAINTS", "dimensions": { "height": 350, "width": 7 @@ -1191,7 +1191,7 @@ "label": "", "charts": [ { - "id": "cumulativeClosedComplaints", + "id": "cumulativeComplaints", "name": "Monthly", "code": "", "chartType": "line", From 4f5cc664ad89343984b6d4bfeb623f75812876ff Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 7 Dec 2022 10:22:19 +0530 Subject: [PATCH 1004/1630] district mohali --- 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 0bb7ca80b..4835f3c86 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.banur','pb.derabassi','pb.kharar','pb.kurali') + from report_owners where status='ACTIVE' and tenantid in ('pb.banur','pb.derabassi') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.banur','pb.derabassi','pb.kharar','pb.kurali') + and tenantid in ('pb.banur','pb.derabassi') group by propertyid ) select From 6bc14b50a4116ff4f70501cee108079db991ac43 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 7 Dec 2022 10:42:26 +0530 Subject: [PATCH 1005/1630] district mohali --- 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 4835f3c86..89201f4a3 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.banur','pb.derabassi') + from report_owners where status='ACTIVE' and tenantid in ('pb.kharar','pb.kurali','pb.lalru','pb.nayagaon') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.banur','pb.derabassi') + and tenantid in ('pb.kharar','pb.kurali','pb.lalru','pb.nayagaon') group by propertyid ) select From b4494db78ddff24844dff67e74652695cf8ab8b3 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 7 Dec 2022 11:01:50 +0530 Subject: [PATCH 1006/1630] district mohali --- 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 89201f4a3..8a440ade4 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.kharar','pb.kurali','pb.lalru','pb.nayagaon') + from report_owners where status='ACTIVE' and tenantid in ('pb.zirakpur','pb.gharuan') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.kharar','pb.kurali','pb.lalru','pb.nayagaon') + and tenantid in ('pb.zirakpur','pb.gharuan') group by propertyid ) select From f6f2fe44581d8a51258226391337410627978517 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 7 Dec 2022 11:19:44 +0530 Subject: [PATCH 1007/1630] district mukatsar --- 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 8a440ade4..2418a68ec 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.zirakpur','pb.gharuan') + from report_owners where status='ACTIVE' and tenantid in ('pb.bariwala','pb.gidderbaha','pb.malout','pb.muktsar') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.zirakpur','pb.gharuan') + and tenantid in ('pb.bariwala','pb.gidderbaha','pb.malout','pb.muktsar') group by propertyid ) select From 9f440ea3d478b165dd7d7b734e0ef9d99f616a44 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 7 Dec 2022 12:44:22 +0530 Subject: [PATCH 1008/1630] district nawashr --- 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 2418a68ec..162e73bf6 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.bariwala','pb.gidderbaha','pb.malout','pb.muktsar') + from report_owners where status='ACTIVE' and tenantid in ('pb.balachaur,'pb.banga','pb.nawanshahr','pb.rahon') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.bariwala','pb.gidderbaha','pb.malout','pb.muktsar') + and tenantid in ('pb.balachaur,'pb.banga','pb.nawanshahr','pb.rahon') group by propertyid ) select From e9a41027b0ad399789d46204d76bd7f475555c90 Mon Sep 17 00:00:00 2001 From: kokila-eGov <97164202+kokila-eGov@users.noreply.github.com> Date: Wed, 7 Dec 2022 12:49:29 +0530 Subject: [PATCH 1009/1630] Update ChartApiConfig.json (#578) UM-5279 update complaint by status and status by tenant cards KPIs --- .../dashboard-analytics/ChartApiConfig.json | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 8fea9080c..dc658ce42 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1,4 +1,3 @@ - { "_comment": "dss-collectionindex new queries ", @@ -2133,7 +2132,7 @@ "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\"}}}}}}}}" + "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, @@ -2173,7 +2172,8 @@ "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\"}}}}}}}}}}" + "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": [ @@ -2212,7 +2212,8 @@ "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\"}}}}}}}}}}" + "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": [ @@ -2254,7 +2255,7 @@ "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\"}}}}}}}}}}" + "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": [ @@ -2296,7 +2297,7 @@ "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\"}}}}}}}}}}" + "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": [ @@ -2575,7 +2576,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\":{\"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\"}}}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}" } ], "chartType": "pie", From 56bf2fd7c50f9741f0b16a8caae648693d64a0b2 Mon Sep 17 00:00:00 2001 From: kokila-eGov <97164202+kokila-eGov@users.noreply.github.com> Date: Wed, 7 Dec 2022 13:57:41 +0530 Subject: [PATCH 1010/1630] Update ChartApiConfig.json (#580) UM-5279 updated query for complaint by status 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 dc658ce42..7d2b8e0d9 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2576,7 +2576,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\":{\"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\"}}}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}" + "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", From 4bea6950a0ee83f3623aea015f101455f3520a86 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 7 Dec 2022 14:37:25 +0530 Subject: [PATCH 1011/1630] district nawashr --- 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 162e73bf6..739b2761a 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.balachaur,'pb.banga','pb.nawanshahr','pb.rahon') + from report_owners where status='ACTIVE' and tenantid in ('pb.balachaur','pb.banga','pb.nawanshahr','pb.rahon') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.balachaur,'pb.banga','pb.nawanshahr','pb.rahon') + and tenantid in ('pb.balachaur','pb.banga','pb.nawanshahr','pb.rahon') group by propertyid ) select From 0a0203fe41ea25a181452415c6378464dfd34edf Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 7 Dec 2022 15:02:20 +0530 Subject: [PATCH 1012/1630] district pathankot --- 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 739b2761a..9be5c5ef7 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.balachaur','pb.banga','pb.nawanshahr','pb.rahon') + from report_owners where status='ACTIVE' and tenantid in ('pb.pathankot','pb.sujanpur') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.balachaur','pb.banga','pb.nawanshahr','pb.rahon') + and tenantid in ('pb.pathankot','pb.sujanpur') group by propertyid ) select From cb4844ab544f0460d3aa642a80811d3e9e082cab Mon Sep 17 00:00:00 2001 From: kokila-eGov <97164202+kokila-eGov@users.noreply.github.com> Date: Wed, 7 Dec 2022 15:13:30 +0530 Subject: [PATCH 1013/1630] Update ChartApiConfig.json (#581) updated aggregation for Complaint by Status --- .../dashboard-analytics/ChartApiConfig.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 7d2b8e0d9..484fdc2fc 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2585,7 +2585,12 @@ "documentType": "_doc", "drillChart": "none", "aggregationPaths": [ - "Complaints By Status" + "Open", + "Reopen", + "Assigned", + "Closed", + "Resolved", + "Rejected" ], "insight": { }, From 37445a55d256e80d05ba5172874daddb2f49453f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 7 Dec 2022 15:39:02 +0530 Subject: [PATCH 1014/1630] district patiala --- 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 9be5c5ef7..da300db43 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.pathankot','pb.sujanpur') + from report_owners where status='ACTIVE' and tenantid in ('pb.bhadson','pb.ghagga','pb.ghanaur','pb.nabha','pb.patran','pb.rajpura','pb.samana','pb.sanaur','pb.devigarh') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.pathankot','pb.sujanpur') + and tenantid in ('pb.bhadson','pb.ghagga','pb.ghanaur','pb.nabha','pb.patran','pb.rajpura','pb.samana','pb.sanaur','pb.devigarh') group by propertyid ) select From 26265b2d74113cda22c1e0583e71d8770e0465c5 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 7 Dec 2022 15:53:14 +0530 Subject: [PATCH 1015/1630] district ropar --- 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 da300db43..990d78bf0 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.bhadson','pb.ghagga','pb.ghanaur','pb.nabha','pb.patran','pb.rajpura','pb.samana','pb.sanaur','pb.devigarh') + from report_owners where status='ACTIVE' and tenantid in ('pb.chamkaursahib','pb.kiratpur','pb.morinda','pb.nangal','pb.ropar','pb.anandpursahib') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.bhadson','pb.ghagga','pb.ghanaur','pb.nabha','pb.patran','pb.rajpura','pb.samana','pb.sanaur','pb.devigarh') + and tenantid in ('pb.chamkaursahib','pb.kiratpur','pb.morinda','pb.nangal','pb.ropar','pb.anandpursahib') group by propertyid ) select From e4565aed7ead8fa912c317fd3a343189fafa5a0d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 7 Dec 2022 16:17:44 +0530 Subject: [PATCH 1016/1630] district sangrur --- 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 990d78bf0..ab7e485b3 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.chamkaursahib','pb.kiratpur','pb.morinda','pb.nangal','pb.ropar','pb.anandpursahib') + from report_owners where status='ACTIVE' and tenantid in ('pb.ahmedgarh','pb.amargarh','pb.bhawanigarh','pb.cheema','pb.dhuri','pb.dirba','pb.khanauri','pb.lehragaga','pb.longowal','pb.malerkotla','pb.moonak','pb.sangrur','pb.sunam') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.chamkaursahib','pb.kiratpur','pb.morinda','pb.nangal','pb.ropar','pb.anandpursahib') + and tenantid in ('pb.ahmedgarh','pb.amargarh','pb.bhawanigarh','pb.cheema','pb.dhuri','pb.dirba','pb.khanauri','pb.lehragaga','pb.longowal','pb.malerkotla','pb.moonak','pb.sangrur','pb.sunam') group by propertyid ) select From 33bed9236d098a007b289957f4f6fb6bce0d1f7a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 7 Dec 2022 17:04:24 +0530 Subject: [PATCH 1017/1630] district tarantaran --- 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 ab7e485b3..ab9a954d9 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.ahmedgarh','pb.amargarh','pb.bhawanigarh','pb.cheema','pb.dhuri','pb.dirba','pb.khanauri','pb.lehragaga','pb.longowal','pb.malerkotla','pb.moonak','pb.sangrur','pb.sunam') + from report_owners where status='ACTIVE' and tenantid in ('pb.bhikhiwind','pb.khemkaran','pb.patti','pb.tarntaran') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.ahmedgarh','pb.amargarh','pb.bhawanigarh','pb.cheema','pb.dhuri','pb.dirba','pb.khanauri','pb.lehragaga','pb.longowal','pb.malerkotla','pb.moonak','pb.sangrur','pb.sunam') + and tenantid in ('pb.bhikhiwind','pb.khemkaran','pb.patti','pb.tarntaran') group by propertyid ) select From 5b2742454b7146454e50e34ab4b097fe91c6b9f2 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 8 Dec 2022 09:44:44 +0530 Subject: [PATCH 1018/1630] asr copor --- 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 ab9a954d9..69950e3c3 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.bhikhiwind','pb.khemkaran','pb.patti','pb.tarntaran') + from report_owners where status='ACTIVE' and tenantid in ('pb.amritsar') group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.bhikhiwind','pb.khemkaran','pb.patti','pb.tarntaran') + and tenantid in ('pb.amritsar') group by propertyid ) select From dd7310760a8d9957965efc49745d9973682b91f9 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 8 Dec 2022 10:30:09 +0530 Subject: [PATCH 1019/1630] district coporation --- 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 69950e3c3..60c674c90 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 in ('pb.amritsar') + from report_owners where status='ACTIVE' and tenantid ='pb.amritsar' group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid in ('pb.amritsar') + and tenantid ='pb.amritsar' group by propertyid ) select From cd8d21f2b100c866e88e79c2f484a42d2deaa8a8 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 8 Dec 2022 10:54:17 +0530 Subject: [PATCH 1020/1630] hspr coporation --- 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 60c674c90..5d61d7926 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 ='pb.amritsar' + from report_owners where status='ACTIVE' and tenantid ='pb.hoshiarpur' group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid ='pb.amritsar' + and tenantid ='pb.hoshiarpur' group by propertyid ) select From a17960b32cf2ac88646386bdfbbd36a6cac142f9 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 8 Dec 2022 11:07:12 +0530 Subject: [PATCH 1021/1630] coporation patiala --- 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 5d61d7926..4427b299a 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 ='pb.hoshiarpur' + from report_owners where status='ACTIVE' and tenantid ='pb.patiala' group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid ='pb.hoshiarpur' + and tenantid ='pb.patiala' group by propertyid ) select From 95a92ac23fd0d7ade57267a5d3f881f2bfaeabcd Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 8 Dec 2022 11:59:43 +0530 Subject: [PATCH 1022/1630] patiala coporation --- 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 4427b299a..8b3ee21b1 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid ='pb.patiala' + and tenantid ='pb.patiala' and createdtime >=1546315411000 and createdtime <=1640932032000 group by propertyid ) select From bf474336969fa1ce7fb9ecd6fa52d2782cf4f1b0 Mon Sep 17 00:00:00 2001 From: kokila-eGov <97164202+kokila-eGov@users.noreply.github.com> Date: Thu, 8 Dec 2022 12:12:02 +0530 Subject: [PATCH 1023/1630] Update ChartApiConfig.json (#582) Added rejected complaints KPI in overview card, corrected KPI for total complaint by status KPI --- .../dashboard-analytics/ChartApiConfig.json | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 484fdc2fc..59f5f3959 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1,3 +1,4 @@ + { "_comment": "dss-collectionindex new queries ", @@ -2484,6 +2485,36 @@ }, "_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": [ @@ -2550,7 +2581,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\":{\"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\"}}}}}}}}}}" + "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", @@ -2591,6 +2622,7 @@ "Closed", "Resolved", "Rejected" + ], "insight": { }, From d6c8c75b5e9fec95aab3ecf90603a82af351e56c Mon Sep 17 00:00:00 2001 From: kokila-eGov <97164202+kokila-eGov@users.noreply.github.com> Date: Thu, 8 Dec 2022 12:12:16 +0530 Subject: [PATCH 1024/1630] Update MasterDashboardConfig.json (#583) added config for rejectedComplaints KPI --- .../dashboard-analytics/MasterDashboardConfig.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 04b135ce4..4eea76b74 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -1145,6 +1145,14 @@ "filter": "", "headers": [] }, + { + "id": "rejectedComplaints", + "name": "DSS_PGR_REJECTED_COMPLAINTS", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, { "id": "closedComplaints", "name": "DSS_PGR_CLOSED_COMPLAINTS", From 39a976edd53cc5732931fa670c44cbd5f90c7664 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 8 Dec 2022 13:25:23 +0530 Subject: [PATCH 1025/1630] coporation patiala dump --- 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 8b3ee21b1..a66f6096f 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid ='pb.patiala' and createdtime >=1546315411000 and createdtime <=1640932032000 + and tenantid ='pb.patiala' and createdtime >=1641018432000 and createdtime <=1669789632000 group by propertyid ) select From 8fdbf14ab04c19a621986a82bf7effb1d5fee595 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 8 Dec 2022 14:38:45 +0530 Subject: [PATCH 1026/1630] patiala coporation --- 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 a66f6096f..f3af01fdd 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid ='pb.patiala' and createdtime >=1641018432000 and createdtime <=1669789632000 + and tenantid ='pb.patiala' and createdtime >=1641018432000 and createdtime <=1656570432000 group by propertyid ) select From e68c6a7d8bdc06b1aa36967426a1bdd6831d04dc Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 8 Dec 2022 14:51:15 +0530 Subject: [PATCH 1027/1630] ptl coporation --- 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 f3af01fdd..23fb02a03 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid ='pb.patiala' and createdtime >=1641018432000 and createdtime <=1656570432000 + and tenantid ='pb.patiala' and createdtime >=1656656832000 and createdtime <=1659335232000 group by propertyid ) select From 31d96e64d7c6e4eb921fe79a354137eea8d4ee63 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 8 Dec 2022 15:08:34 +0530 Subject: [PATCH 1028/1630] ptl coporation --- 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 23fb02a03..739c5691e 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid ='pb.patiala' and createdtime >=1656656832000 and createdtime <=1659335232000 + and tenantid ='pb.patiala' and createdtime >=1659421632000 and createdtime <=1662013632000 group by propertyid ) select From 272e69ac4386cf067894f2df290a3dcf7d9d9d61 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 8 Dec 2022 15:50:26 +0530 Subject: [PATCH 1029/1630] ptl coporation --- 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 739c5691e..556ebd839 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid ='pb.patiala' and createdtime >=1659421632000 and createdtime <=1662013632000 + and tenantid ='pb.patiala' and createdtime >=1662080449000 and createdtime <=1669942849000 group by propertyid ) select From fb044ab6a39654904d41ce038a14bbf4bd963373 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 8 Dec 2022 16:51:40 +0530 Subject: [PATCH 1030/1630] jalandhar coporation --- 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 556ebd839..f63b287f5 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 ='pb.patiala' + from report_owners where status='ACTIVE' and tenantid ='pb.jalandhar' group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid ='pb.patiala' and createdtime >=1662080449000 and createdtime <=1669942849000 + and tenantid ='pb.jalandhar' and createdtime >=1514768449000 and createdtime <=1577840449000 group by propertyid ) select From 4ed6d87a5ba461b2fdbde2af22b3bde017929f84 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 9 Dec 2022 09:52:59 +0530 Subject: [PATCH 1031/1630] jal coporation --- 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 f63b287f5..1f6865db2 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid ='pb.jalandhar' and createdtime >=1514768449000 and createdtime <=1577840449000 + and tenantid ='pb.jalandhar' and createdtime >=1514768449000 and createdtime <=1567299649000 group by propertyid ) select From 579cd2d32949e307e2a6104c577aa4fd9c4a9fb0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 9 Dec 2022 10:22:54 +0530 Subject: [PATCH 1032/1630] jal coporation --- 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 1f6865db2..54b311fa1 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid ='pb.jalandhar' and createdtime >=1514768449000 and createdtime <=1567299649000 + and tenantid ='pb.jalandhar' and createdtime >=1514768449000 and createdtime <=1564189249000 group by propertyid ) select From a2fe055d00de2b4f625bae5a5dfc63e055687e66 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 9 Dec 2022 10:41:27 +0530 Subject: [PATCH 1033/1630] Asr coporation --- 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 54b311fa1..ed215cfcc 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 ='pb.jalandhar' + from report_owners where status='ACTIVE' and tenantid ='pb.amritsar' group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid ='pb.jalandhar' and createdtime >=1514768449000 and createdtime <=1564189249000 + and tenantid ='pb.amritsar' and createdtime >=1546315249000 and createdtime <=1609473649000 group by propertyid ) select From ff4fdf5f68eb41c9717b9af27e2d1385c21bfc00 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 9 Dec 2022 10:54:10 +0530 Subject: [PATCH 1034/1630] Asr coporation --- 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 ed215cfcc..16e5dd270 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid ='pb.amritsar' and createdtime >=1546315249000 and createdtime <=1609473649000 + and tenantid ='pb.amritsar' and createdtime >=1609560049000 and createdtime <=1641096049000 group by propertyid ) select From aa670dcd6121c7ffbfa6144b0fd9440795d56e45 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 9 Dec 2022 11:40:20 +0530 Subject: [PATCH 1035/1630] asr coporation --- 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 16e5dd270..5491d8188 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid ='pb.amritsar' and createdtime >=1609560049000 and createdtime <=1641096049000 + and tenantid ='pb.amritsar' and createdtime >=1641182449000 and createdtime <=1670040049000 group by propertyid ) select From dd8000f0c7335f03d5ecf74ecb0dfdd130d788ba Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 9 Dec 2022 14:28:31 +0530 Subject: [PATCH 1036/1630] mohali coporation --- 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 5491d8188..73d7ee8dc 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 ='pb.amritsar' + from report_owners where status='ACTIVE' and tenantid ='pb.mohali' group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid ='pb.amritsar' and createdtime >=1641182449000 and createdtime <=1670040049000 + and tenantid ='pb.mohali' and createdtime >=1514779249000 and createdtime <=1641009649000 group by propertyid ) select From 604de05264e1a7a9cdb574e5fcccf09441b4d563 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 9 Dec 2022 15:11:39 +0530 Subject: [PATCH 1037/1630] jalandhar coproration --- 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 73d7ee8dc..7a969b233 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8581,7 +8581,7 @@ ReportDefinitions: 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 ='pb.mohali' + from report_owners where status='ACTIVE' and tenantid ='pb.jalandhar' group by propertyid ), properties as @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid ='pb.mohali' and createdtime >=1514779249000 and createdtime <=1641009649000 + and tenantid ='pb.jalandhar' and createdtime >=1577851249000 and createdtime <=1670040049000 group by propertyid ) select From bec1e1731ed5a1e203f1c15f9a1c5c267c54349b Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Fri, 9 Dec 2022 15:20:08 +0530 Subject: [PATCH 1038/1630] Updated the code for the pt tax head by usage --- .../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 59f5f3959..8a5d30765 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1559,7 +1559,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 \":{\"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\"}}}}}}}}}}}}" + "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\":{"\sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"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 d8528a3d9184d4d7dc95284f9726fe1363041dfa Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Fri, 9 Dec 2022 15:39:46 +0530 Subject: [PATCH 1039/1630] reverted code changes --- .../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 8a5d30765..98b03c1a3 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1559,7 +1559,8 @@ "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\":{"\sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"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": [ From 9f88896fe3e704f485ba876ed03ccb14c8be5aca Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Fri, 9 Dec 2022 15:47:51 +0530 Subject: [PATCH 1040/1630] Updated PT usage tax head --- .../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 98b03c1a3..ba01c7683 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1559,7 +1559,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 \":{\"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\"}}}}}}}}}}}}" + "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\":{\"sum\":{\"field\": \"dataObject.paymentDetails.totalAmountPaid\"}},\"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 233aa297f1d496c2ad81ea03d30f5ac31e6f0016 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 9 Dec 2022 16:08:38 +0530 Subject: [PATCH 1041/1630] asr coporation --- 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 7a969b233..bddd8177a 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid ='pb.jalandhar' and createdtime >=1577851249000 and createdtime <=1670040049000 + and tenantid ='pb.jalandhar' and createdtime >=1564200049000 and createdtime <=1564315189000 group by propertyid ) select From ed78f12727cd58e8b6a4e9c1643e68e68fc6a5f0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 9 Dec 2022 16:33:07 +0530 Subject: [PATCH 1042/1630] asr cop --- 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 bddd8177a..22efd9e00 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid ='pb.jalandhar' and createdtime >=1564200049000 and createdtime <=1564315189000 + and tenantid ='pb.jalandhar' and createdtime >=1564200049000 and createdtime <=1564313449000 group by propertyid ) select From 45010c955a5d2a5190a50a693a5783fbf94f153d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 9 Dec 2022 16:41:44 +0530 Subject: [PATCH 1043/1630] jal coporatn --- 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 22efd9e00..206475137 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid ='pb.jalandhar' and createdtime >=1564200049000 and createdtime <=1564313449000 + and tenantid ='pb.jalandhar' and createdtime >=1564315190000 and createdtime <=1564317650000 group by propertyid ) select From 66388c35ed4624547cecba6b85a20fe602f6d22d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 9 Dec 2022 17:00:21 +0530 Subject: [PATCH 1044/1630] jal cop --- 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 206475137..3fae2a108 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8598,7 +8598,7 @@ ReportDefinitions: and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') or propertyusagetype!='RESIDENTIAL') - and tenantid ='pb.jalandhar' and createdtime >=1564315190000 and createdtime <=1564317650000 + and tenantid ='pb.jalandhar' and createdtime >=1564317651000 and createdtime <=1577923191000 group by propertyid ) select From 6226b4f2ee84065280fffcb267a87aedd1609959 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Fri, 9 Dec 2022 18:34:56 +0530 Subject: [PATCH 1045/1630] updated all texes --- .../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 ba01c7683..3ceac5562 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1559,7 +1559,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 \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"sum\":{\"field\": \"dataObject.paymentDetails.totalAmountPaid\"}},\"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\",\"PT_ROUNDOFF\", \"PT_TIME_INTEREST\"]}},\"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\",\"PT_ADHOC_REBATE\",\"PT_ADVANCE_CARRYFORWARD\",\"PT_UNIT_USAGE_EXEMPTION\",\"PT_OWNER_EXEMPTION\"]}},\"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\",\"PT_ADHOC_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" } ], From dc9c11e3effe922fb9d881c7e2e33931897c32be Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Fri, 9 Dec 2022 22:11:28 +0530 Subject: [PATCH 1046/1630] Updated total collection for PT --- .../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 3ceac5562..6140ebf83 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -49,7 +49,8 @@ "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\"}}}}}}" + "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.amount\"}} + }}}}}}" }, { "module": "TL", From c0dd7ea5deb1da4cedc9270b2e05c9ba49a704ca Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Fri, 9 Dec 2022 22:16:28 +0530 Subject: [PATCH 1047/1630] reverted changes --- .../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 6140ebf83..3ceac5562 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -49,8 +49,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\":[{\"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.amount\"}} - }}}}}}" + "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", From a8ce921226f3c1bb6eb49b4e57e529a219cbd0c1 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Fri, 9 Dec 2022 22:25:03 +0530 Subject: [PATCH 1048/1630] Updated PT total 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 3ceac5562..a5a4c1ce4 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -49,7 +49,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\":[{\"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\"}}}}}}" + "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.amount\"}}}}}}}}" }, { "module": "TL", From 6241de898a40f8ff1eb0cb9deb349abf68a18a0c Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Sat, 10 Dec 2022 00:23:25 +0530 Subject: [PATCH 1049/1630] Updated the query for Collection By usageType --- .../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 a5a4c1ce4..db2d7fcec 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -595,7 +595,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},\"aggs\":{\"Usage Type\":{\"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\":{\"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.amount\"}}}}}}}}}}" } ], "chartType": "pie", From 71e9115807feadd83ac76f7a34a6d42677963432 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Sat, 10 Dec 2022 00:26:26 +0530 Subject: [PATCH 1050/1630] Updated Query for PT collection by payment mode --- .../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 db2d7fcec..84fb56e9e 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -618,7 +618,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},\"aggs\":{\"Payment Mode\":{\"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\":[{\"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.amount\"}}}}}}}}}}" } ], "chartType": "pie", From b9faaff146bd41a21512fcf3153057c0a4b89b39 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Sat, 10 Dec 2022 14:11:05 +0530 Subject: [PATCH 1051/1630] Updated the query for the TL Tax Head --- .../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 84fb56e9e..6b563cb06 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1518,7 +1518,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.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\"}}}}}}}}}}" + "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\",\"TL_RENEWAL_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\",\"TL_RENEWAL_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\",\"ADVANCE_ADJUSTMENT\",\"TL_RENEWAL_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}" } ], "isMdmsEnabled": true, From 5e503a73bdbbcbd4d4eff85722b36e88f0d353fb Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Sat, 10 Dec 2022 14:16:50 +0530 Subject: [PATCH 1052/1630] Updated TL total 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 6b563cb06..0fc7d2977 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -56,7 +56,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\":[{\"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_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"Total Collection\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"amount\": {\"sum\": {\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}" } ], "chartType": "metric", From 59fe1008d9d20f1de3025ee3e5567fb8fe222999 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Sat, 10 Dec 2022 19:27:19 +0530 Subject: [PATCH 1053/1630] reverted tl qyery --- .../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 0fc7d2977..1112847d7 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -56,7 +56,8 @@ "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\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"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\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + } ], "chartType": "metric", From c60e404308d3cbb3ef747b63eaad5b7d56b67039 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 12 Dec 2022 15:27:26 +0530 Subject: [PATCH 1054/1630] reverted PT changes --- .../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 1112847d7..c97ee9d4a 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -49,7 +49,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\":[{\"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.amount\"}}}}}}}}" + "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", From ea9f9beead6a4eb1cca0c50421a01ded491610aa Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 12 Dec 2022 15:38:01 +0530 Subject: [PATCH 1055/1630] Updated the code for the collection by usage type --- .../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 c97ee9d4a..cd773d994 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -596,7 +596,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},\"aggs\":{\"Usage Type\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"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 Type\":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Usage Type\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "pie", From a88624179bfef009e45f96b0fed337e6116dc7b5 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 12 Dec 2022 15:41:23 +0530 Subject: [PATCH 1056/1630] Updated the code for usage --- .../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 cd773d994..379643fde 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -619,7 +619,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},\"aggs\":{\"Payment Mode\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"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\"]}}],\"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 bf47b9c1957a0f1ee70be6cf9e27c21a9807a1a3 Mon Sep 17 00:00:00 2001 From: kokila-eGov <97164202+kokila-eGov@users.noreply.github.com> Date: Thu, 15 Dec 2022 16:20:21 +0530 Subject: [PATCH 1057/1630] Update rainmaker-pgr-indexer.yml (#586) added complaintWard as NA for missing ward data --- 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 aa81c5019..e13e7c66d 100644 --- a/configs/egov-indexer/rainmaker-pgr-indexer.yml +++ b/configs/egov-indexer/rainmaker-pgr-indexer.yml @@ -221,7 +221,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":"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 From d01cf46d8d300ccc61397791b4d21a7b0656f2a2 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 19 Dec 2022 13:46:50 +0530 Subject: [PATCH 1058/1630] Updated the billDetails logic --- .../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 14d2f7f61..1bad7b8a4 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_collection_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_collection_v1.json @@ -17,7 +17,7 @@ "receiptDate": "paymentDetails.receiptDate", "bill": { "billDetails": { - "$j": { + "*": { "boundary": "paymentDetails.bill.billDetails.boundary", "amount": "paymentDetails.bill.billDetails.amount", "fromPeriod": "paymentDetails.bill.billDetails.fromPeriod", From 95545489ccc280255375f5c7fb48ff08dbae8974 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 19 Dec 2022 14:08:14 +0530 Subject: [PATCH 1059/1630] Reverted the billDetails logic --- .../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 1bad7b8a4..14d2f7f61 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_collection_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_collection_v1.json @@ -17,7 +17,7 @@ "receiptDate": "paymentDetails.receiptDate", "bill": { "billDetails": { - "*": { + "$j": { "boundary": "paymentDetails.bill.billDetails.boundary", "amount": "paymentDetails.bill.billDetails.amount", "fromPeriod": "paymentDetails.bill.billDetails.fromPeriod", From d50b9a56cc1594e78cd5c8077f09a8dc26db2041 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Tue, 20 Dec 2022 12:43:28 +0530 Subject: [PATCH 1060/1630] Updated the TL tax head for DDR --- .../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 379643fde..48fea73c8 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1613,7 +1613,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 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\"}}}}}}}}}}}}" + "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.amount\"}}}}}},\"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.amount\"}}}}}},\"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.amount\"}}}}}}}}}}}}" } ], "filterKeys": [ From 608c1825e1e6ad37ea4cf8e7adcd13a9421c957b Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Thu, 22 Dec 2022 11:37:42 +0530 Subject: [PATCH 1061/1630] Updated the Bill Logic --- .../transform_collection_v1.json | 66 +------------------ 1 file changed, 1 insertion(+), 65 deletions(-) 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 14d2f7f61..11a21f780 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_collection_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_collection_v1.json @@ -15,71 +15,7 @@ "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" - }, + "bill": "paymentDetails.bill", "totalAmountPaid": "paymentDetails.totalAmountPaid", "additionalDetails": "paymentDetails.additionalDetails", "manualReceiptDate": "paymentDetails.manualReceiptDate", From 7d30a19a5ced657686c0dcf4150fa25ea395ee90 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Fri, 23 Dec 2022 11:31:00 +0530 Subject: [PATCH 1062/1630] Updated collection by usage type --- .../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 48fea73c8..d2053883b 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -596,7 +596,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},\"aggs\":{\"Usage Type\":{\"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\":{\"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.amount\"}}}}}}}}}}" } ], "chartType": "pie", From cf27ad7fcef7a9e106ad38a086b9ac90881a4129 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Fri, 23 Dec 2022 15:32:06 +0530 Subject: [PATCH 1063/1630] Updated the PT taxHeadsBreakupDDRRevenue --- .../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 d2053883b..ffa948eff 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1013,7 +1013,7 @@ "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\"}}}}}}}}}}" + "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\",\"PT_ADVANCE_CARRYFORWARD\",\"FIRENOC_FEES\"]}},\"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\",\"PT_UNIT_USAGE_EXEMPTION\",\"PT_OWNER_EXEMPTION\",\"PT_ADHOC_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\",\"PT_ADHOC_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\",\"PT_DECIMAL_CEILING_DEBIT\",\"PT_DECIMAL_CEILING_CREDIT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}" } ], "isMdmsEnabled": true, From 4f97069ee5e4b5e9a1684d568d91d578003616de Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Sat, 24 Dec 2022 12:51:44 +0530 Subject: [PATCH 1064/1630] Updated the total collection for PT --- .../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 ffa948eff..de470e65b 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -49,8 +49,8 @@ "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\"}}}}}}" - }, + "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.amount\"}}}}}}}}" + }, { "module": "TL", "dateRefField": "dataObject.paymentDetails.receiptDate", From cc7552312b983d3e5d6c2955fafeca9f1112cd73 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Sat, 24 Dec 2022 13:39:07 +0530 Subject: [PATCH 1065/1630] Updated queries for demandCollectionIndexUsageRevenue --- .../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 de470e65b..66d83b31f 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1236,8 +1236,8 @@ "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\"}}}}}}}}}}" + "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.amount\"}}}},\"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.amount\"}}}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}" } ], "filterKeys": [ From aa1b379fd006fbdbfd34bcd91d39204d98292b19 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Sat, 24 Dec 2022 19:02:30 +0530 Subject: [PATCH 1066/1630] Updated collection by payment mode --- .../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 66d83b31f..fd03197f0 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -619,7 +619,8 @@ "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\"}}}}}}}}" + "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.amount\"}}}}}}}}}}" + } ], "chartType": "pie", From 75b21f6897b9cc3dc91bfe3a9ab6c6c31a1762dc Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Sat, 24 Dec 2022 19:26:39 +0530 Subject: [PATCH 1067/1630] Updated cumulative collection --- .../dashboard-analytics/ChartApiConfig.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index fd03197f0..ac4380598 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -174,8 +174,16 @@ "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\":[\"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.amount\"}}}}}}}}}}" } + ], "chartType": "pie", "valueType": "Amount", From 5092f4821e61324047af26b528f445f2f9ef8682 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Sat, 24 Dec 2022 19:46:29 +0530 Subject: [PATCH 1068/1630] updated the cumulative collection for PT --- .../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 ac4380598..e4be658d8 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -80,7 +80,14 @@ "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\"}}}}}}}}" + "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.amount\"}}}}}}}}}}" } ], "chartType": "line", From 7132480746e0b6656ff73a1e8204b3f63c934d9a Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 26 Dec 2022 12:10:52 +0530 Subject: [PATCH 1069/1630] Updated demandCollectionIndexUsageRevenue from amount to adjusted 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 e4be658d8..0deaa4dbb 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1252,8 +1252,8 @@ "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.amount\"}}}},\"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.amount\"}}}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.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\":{\"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": [ From e080991c1c6e096dd8405e1ad6803ac4d3cf15cf Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 26 Dec 2022 12:13:19 +0530 Subject: [PATCH 1070/1630] updated total collection query --- .../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 0deaa4dbb..91f2ea674 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -49,7 +49,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\":[{\"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.amount\"}}}}}}}}" + "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", From ed922312515db83ad461db50abc17544372f15c5 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 26 Dec 2022 12:15:03 +0530 Subject: [PATCH 1071/1630] Updated cumullative collection for PT --- .../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 91f2ea674..f20c35220 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -87,7 +87,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\":[{\"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.amount\"}}}}}}}}}}" + "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", From 2541cf5e15876c3c7f15c4bf1a3e344303a31bc1 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 26 Dec 2022 12:21:09 +0530 Subject: [PATCH 1072/1630] Updated PT tax head --- .../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 f20c35220..3cbb32462 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1029,7 +1029,7 @@ "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\",\"PT_ADVANCE_CARRYFORWARD\",\"FIRENOC_FEES\"]}},\"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\",\"PT_UNIT_USAGE_EXEMPTION\",\"PT_OWNER_EXEMPTION\",\"PT_ADHOC_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\",\"PT_ADHOC_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\",\"PT_DECIMAL_CEILING_DEBIT\",\"PT_DECIMAL_CEILING_CREDIT\"]}},\"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\":{\"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\",\"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.amount\"}}}}}},\"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, From 9f63df54a784484e846529995530427ae38a7060 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 26 Dec 2022 12:26:24 +0530 Subject: [PATCH 1073/1630] Updated total Amount in PT TAx head --- .../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 3cbb32462..8f4bce482 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1029,7 +1029,7 @@ "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\",\"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.amount\"}}}}}},\"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\"}}}}}}}}}}" + "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.amount\"}}}}}},\"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, From 86e825e1a70b1d3e77b87b5d23238c57e5428d8e Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 26 Dec 2022 12:27:54 +0530 Subject: [PATCH 1074/1630] Updated code PT commulative collection dept waise --- .../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 8f4bce482..2a35cdff7 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -188,7 +188,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\"]}}]}},\"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.amount\"}}}}}}}}}}" + "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\"}}}}}}}}}}" } ], From 066ffbfc594cf1b4fabddd5ed61c004ddcf58b70 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 26 Dec 2022 12:29:00 +0530 Subject: [PATCH 1075/1630] Updated collection by usage --- .../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 2a35cdff7..9156064c2 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -611,7 +611,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},\"aggs\":{\"Usage Type\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"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 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", From 0debcf41d2829884dc9542bd79ce656245959882 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 26 Dec 2022 12:34:43 +0530 Subject: [PATCH 1076/1630] Updated TAx head revanue for PT --- .../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 9156064c2..ae79591d0 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1576,7 +1576,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 \":{\"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\",\"PT_ROUNDOFF\", \"PT_TIME_INTEREST\"]}},\"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\",\"PT_ADHOC_REBATE\",\"PT_ADVANCE_CARRYFORWARD\",\"PT_UNIT_USAGE_EXEMPTION\",\"PT_OWNER_EXEMPTION\"]}},\"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\",\"PT_ADHOC_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.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\"}}}}}}}}}}}}" } ], From 90975658c73012cb4e5d57be61d9834f8784fb08 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 26 Dec 2022 12:39:04 +0530 Subject: [PATCH 1077/1630] Updated query for collection by payment mode --- .../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 ae79591d0..3ae653b83 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -634,7 +634,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},\"aggs\":{\"Payment Mode\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"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\"]}}],\"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\"}}}}}}}}}}" } ], From 1bca3e9d49487bc4fa7aff3d6280dc4ce1b0bf6d Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 26 Dec 2022 12:49:45 +0530 Subject: [PATCH 1078/1630] Updated PT cancer cess --- .../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 3ae653b83..bde190880 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1029,7 +1029,7 @@ "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.amount\"}}}}}},\"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\"}}}}}}}}}}" + "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, From a42afe854d127e7655cec7962c914f295259371b Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 26 Dec 2022 12:53:39 +0530 Subject: [PATCH 1079/1630] Updated PT tax head break up revenue --- .../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 bde190880..29e508a67 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1073,7 +1073,7 @@ "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\"}}}}}}}}}}}}" + "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": [ From 6f43d5feb4c3c3af671592f9baeda1c0f0194c9f Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 26 Dec 2022 12:58:17 +0530 Subject: [PATCH 1080/1630] Updated PT boundry drill --- .../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 29e508a67..37b35e65e 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1111,7 +1111,7 @@ "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\"}}}}}}}}}}}}" + "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": [ From d49b84a133073458ff892c76a62ba89e41ab845e Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 26 Dec 2022 13:03:24 +0530 Subject: [PATCH 1081/1630] Updated TL Tax head --- .../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 37b35e65e..f48b6c043 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1658,7 +1658,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.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\"}}}}}}}}}}}}" + "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": [ From c9de4daf7aef78ac28cb650fd9811dec448974af Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 26 Dec 2022 13:10:56 +0530 Subject: [PATCH 1082/1630] Updated TL tax head --- .../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 f48b6c043..bb3600baf 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1629,7 +1629,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 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.amount\"}}}}}},\"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.amount\"}}}}}},\"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.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\",\"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": [ From 79f8d08c927bd4f53941ca87e0f7f795c453e5a7 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 26 Dec 2022 15:01:58 +0530 Subject: [PATCH 1083/1630] Updated TL TAX head --- .../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 bb3600baf..3c2f4bad0 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1535,7 +1535,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.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\",\"TL_RENEWAL_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\",\"TL_RENEWAL_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\",\"ADVANCE_ADJUSTMENT\",\"TL_RENEWAL_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.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, From 40e4dec20538a44107ca4b534478ead5d45d2245 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 26 Dec 2022 15:11:41 +0530 Subject: [PATCH 1084/1630] Updated code for Adjust Amount --- .../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 3c2f4bad0..5fc269fa7 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1200,7 +1200,7 @@ "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\"}}}}}}}}}}}}" + "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": [ From 27073565413c7fdb1bc297ebee9729a3015bb586 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 26 Dec 2022 15:19:59 +0530 Subject: [PATCH 1085/1630] Updated code for The PT adjust amount --- .../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 5fc269fa7..316757b15 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1148,7 +1148,7 @@ "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\"}}}}}}}}}}}}" + "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": [ From af3661d0773d4f0d2a35f5b8b01248f61d5b7599 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 26 Dec 2022 17:53:20 +0530 Subject: [PATCH 1086/1630] Updated code for total 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 316757b15..174e46d61 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -17,7 +17,7 @@ "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\"}}}}}}" + "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\",\"CANCELLED\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } ], @@ -49,7 +49,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\":[{\"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\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\",\"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", From 11ecc236dfb7661866be7b708cdb8d49639e2a0d Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 26 Dec 2022 18:10:25 +0530 Subject: [PATCH 1087/1630] Updated the code 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 174e46d61..d0fae2484 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -56,7 +56,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\":[{\"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_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\",\"CANCELLED\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } ], From 63d98ce409fdebb919e6579ff67b5f14fa322481 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Tue, 27 Dec 2022 23:21:49 +0530 Subject: [PATCH 1088/1630] Updated Bill STatus from Cancelled to CANCELLED --- .../dashboard-analytics/ChartApiConfig.json | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index d0fae2484..a93782dc6 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -17,7 +17,7 @@ "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\",\"CANCELLED\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + "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\"}}}}}}" } ], @@ -49,14 +49,14 @@ "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\",\"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\"}}}}}}}}" + "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\",\"CANCELLED\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"Total Collection\":{\"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\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } ], @@ -80,14 +80,14 @@ "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\"}}}}}}}}" + "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\"}}}}}}}}}}" + "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", @@ -119,7 +119,7 @@ "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\"}}}}}}" + "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\"}}}}}}" } ], @@ -151,14 +151,14 @@ "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\"}}}}}}" + "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\"}}}}}}" + "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\"}}}}}}" } ], "chartType": "metric", @@ -181,14 +181,14 @@ "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\"}}}}}}}}" + "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\"}}}}}}}}}}" + "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\"}}}}}}}}}}" } ], @@ -219,7 +219,7 @@ "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\"}}}}}}}}" + "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", @@ -252,7 +252,7 @@ "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\"}}}}}}}}" + "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", @@ -278,7 +278,7 @@ "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\"}}}}}}}}" + "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", @@ -611,7 +611,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},\"aggs\":{\"Usage Type\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}}}}}}" + "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", @@ -634,7 +634,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},\"aggs\":{\"Payment Mode\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"amount\": {\"sum\": {\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}}}}}}" + "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\"}}}}}}}}}}" } ], @@ -821,7 +821,7 @@ "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\"}}}}}}}}" + "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", @@ -874,7 +874,7 @@ "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\"}}}}}}}}}}" + "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", @@ -929,7 +929,7 @@ "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\"}}}}}}}}}}" + "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", @@ -985,7 +985,7 @@ "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\"}}}}}}}}}}" + "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", @@ -1029,7 +1029,7 @@ "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\"}}}}}}}}}}" + "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, @@ -1073,7 +1073,7 @@ "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\"}}}}}}}}}}}}" + "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": [ @@ -1111,7 +1111,7 @@ "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\"}}}}}}}}}}}}" + "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": [ @@ -1148,7 +1148,7 @@ "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\"}}}}}}}}}}}}" + "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": [ @@ -1200,7 +1200,7 @@ "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\"}}}}}}}}}}}}" + "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": [ @@ -1252,7 +1252,7 @@ "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\"}}}}}}}}}}", + "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\"}}}}}}}}}}" } ], @@ -1298,7 +1298,7 @@ "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\"}}}}}}}}}}", + "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\"}}}}}}}}}}" } ], @@ -1339,7 +1339,7 @@ "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\"}}}}}}}}}}", + "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\"}}}}}}}}" } ], @@ -1385,7 +1385,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.transactionNumber.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", @@ -1439,7 +1439,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.transactionNumber.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", @@ -1491,7 +1491,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.transactionNumber.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", @@ -1535,7 +1535,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.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\"}}}}}}}}}}" + "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, @@ -1576,7 +1576,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 \":{\"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\"}}}}}}}}}}}}" + "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\"}}}}}}}}}}}}" } ], @@ -1629,7 +1629,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 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\"}}}}}}}}}}}}" + "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": [ @@ -1658,7 +1658,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.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\"}}}}}}}}}}}}" + "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": [ @@ -2013,7 +2013,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.transactionNumber.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 684b3de0c1d4185ca074907d844cf7658df88824 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 10 Jan 2023 11:55:41 +0530 Subject: [PATCH 1089/1630] oldproperty id added ReceiptRegisterShort_WithoutLocality_V2 --- configs/reports/configs/pt-reports.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 3fae2a108..91801322d 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3342,6 +3342,11 @@ ReportDefinitions: 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 @@ -3417,6 +3422,7 @@ ReportDefinitions: -- 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, From cd5cb4b7636f5019030b88abb8364ec83712faac Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 11 Jan 2023 10:33:41 +0530 Subject: [PATCH 1090/1630] fy pt dump --- 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 91801322d..518e23b0a 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6327,6 +6327,11 @@ ReportDefinitions: type: string source: pt total: false + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false - name: localityname label: reports.pt.localityname type: string @@ -6392,7 +6397,7 @@ ReportDefinitions: --rp.paymentmode as paymentmode, pt.oldpropertyid as existingpropertyid, --ra.assessmentyears as financialyear, - --getfinancialyear(rp.billid) as financialyear, + getfinancialyear(rp.billid) as financialyear, owners.ownername as ownername, owners.guardianname as guardianname, owners.mobilenumber as mobileno, From f0642ae9e1846217ba8a7389666e467fa6b9b8c3 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 11 Jan 2023 12:28:43 +0530 Subject: [PATCH 1091/1630] amount paid pt dump --- configs/reports/configs/pt-reports.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 518e23b0a..7c2a81ae9 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6331,7 +6331,12 @@ ReportDefinitions: label: reports.pt.financialyear type: string source: pt - total: false + total: false + - name: paymentamount + label: reports.pt.paymentamount + type: string + source: pt + total: false - name: localityname label: reports.pt.localityname type: string @@ -6408,7 +6413,7 @@ ReportDefinitions: --pt.propertytype as propertytype, rp.payermobilenumber as mobilenumber, --ra.totalamount as paymentamount, - --rp.amoutpaid as paymentamount, + rp.amoutpaid as paymentamount, --rp.transactiondate as transcationdate, --owners.emailid as emailid, pt.address as address, From 325fb4378f63118b626e4d00f3e67853a14e98d2 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 18 Jan 2023 13:26:03 +0530 Subject: [PATCH 1092/1630] firenoc report receipt register --- 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 7c49499f1..e2f139457 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -660,7 +660,7 @@ ReportDefinitions: 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') + WHERE bill.tenantid!='pb.testing' AND businessservice='FIRENOC' GROUP BY billdetailid ) SELECT @@ -690,7 +690,7 @@ ReportDefinitions: 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 + 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 From 813a42d6be3f7304e157690c97b9f509b7c6e0c0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 24 Jan 2023 13:43:07 +0530 Subject: [PATCH 1093/1630] Patiala report hotel --- configs/reports/configs/pt-reports.yml | 130 ++++++++++++++++++++++++- 1 file changed, 129 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 7c2a81ae9..a34458133 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8655,7 +8655,135 @@ ReportDefinitions: from properties pt --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 + inner join owners on owners.propertyid=pt.propertyid + + +- 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: 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: additionaldetails + label: reports.pt.additionaldetails + type: string + source: pt + total: false + searchParams: + - name: category + label: reports.pt.usagecategory + type: string + 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('%',$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, + eg_user.name as ownername, + eg_user.mobilenumber as mobileno, + $category as unitcategory, + pt.additionaldetails as additionaldetails + 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' From 7451e8ec9c9aa996bc15599dde9aed187bab225f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 24 Jan 2023 21:30:49 +0530 Subject: [PATCH 1094/1630] 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 a34458133..2b7088a1f 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8775,8 +8775,8 @@ ReportDefinitions: bndry.localityname as locality, eg_user.name as ownername, eg_user.mobilenumber as mobileno, - $category as unitcategory, - pt.additionaldetails as additionaldetails + $category as unitcategory + --pt.additionaldetails as additionaldetails 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 From d6d02f32c00c1146fbe2ad0b494a4f0af8ec94f7 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 24 Jan 2023 21:31:18 +0530 Subject: [PATCH 1095/1630] 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 2b7088a1f..61bedbf97 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8734,11 +8734,6 @@ ReportDefinitions: type: string source: pt total: false - - name: additionaldetails - label: reports.pt.additionaldetails - type: string - source: pt - total: false searchParams: - name: category label: reports.pt.usagecategory From ed8038bac793a8b1f56c5dd294336cbea7c3336d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 24 Jan 2023 21:48:50 +0530 Subject: [PATCH 1096/1630] added businessname and survey address in category wise search --- configs/reports/configs/pt-reports.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 61bedbf97..5bf555107 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8734,6 +8734,16 @@ ReportDefinitions: 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 @@ -8770,8 +8780,9 @@ ReportDefinitions: bndry.localityname as locality, eg_user.name as ownername, eg_user.mobilenumber as mobileno, - $category as unitcategory - --pt.additionaldetails as additionaldetails + $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 From 1b85122625af11b1bcf2d0f1566e73803a165a11 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 24 Jan 2023 21:53:03 +0530 Subject: [PATCH 1097/1630] 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 5bf555107..ad4a0d52e 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8781,7 +8781,7 @@ ReportDefinitions: eg_user.name as ownername, eg_user.mobilenumber as mobileno, $category as unitcategory, - pt.(additionalDetails->'legacyInfo')->>'address' as addr_survey, + (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 From 259eb8058fa00ef6c75dd7673f5e29a73e261d8e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 24 Jan 2023 22:00:35 +0530 Subject: [PATCH 1098/1630] added PAID_PROPERTY_CATEGORY_REPORT_V2 --- configs/reports/configs/pt-reports.yml | 136 ++++++++++++++++++++++++- 1 file changed, 135 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index ad4a0d52e..5bb7655bc 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8790,7 +8790,141 @@ ReportDefinitions: 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: 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 + 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('%',$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, + 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 + inner join report_assessments on report_assessments.propertyid=pt.propertyid and report_assessments.assessmentyears like '%2022-23%' + where pt.status!='INACTIVE' From 14f740eb507455cea88581e4a322cadc3f0e1576 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 25 Jan 2023 12:10:25 +0530 Subject: [PATCH 1099/1630] enabled search by businessname in category wise property report --- configs/reports/configs/pt-reports.yml | 30 +++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 5bb7655bc..7d98c5877 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8751,11 +8751,23 @@ ReportDefinitions: source: pt isMandatory: true searchClause: AND 1=1 + - name: nameofbusiness + label: reports.pt.nameofbusinness + type: string + 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 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('%',$category,'%') --like '%EDUCATION%' + with props as + ( + select distinct propertyid as propertyid from eg_pt_unit where tenantid=$tenantid and usagecategory LIKE CONCAT('%',upper($category),'%') --like '%EDUCATION%' + union + select id as propertyid from eg_pt_property where tenantid=$tenantid and upper(additionalDetails->>'businessName') LIKE CONCAT('%',upper($nameofbusiness),'%') + ) + select distinct propertyid from props ), owners as ( @@ -8883,13 +8895,25 @@ ReportDefinitions: label: reports.pt.usagecategory type: string source: pt - isMandatory: true + isMandatory: false + searchClause: AND 1=1 + - name: nameofbusiness + label: reports.pt.nameofbusinness + type: string + 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 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('%',$category,'%') --like '%EDUCATION%' + with props as + ( + select distinct propertyid as propertyid from eg_pt_unit where tenantid=$tenantid and usagecategory LIKE CONCAT('%',upper($category),'%') --like '%EDUCATION%' + union + select id as propertyid from eg_pt_property where tenantid=$tenantid and upper(additionalDetails->>'businessName') LIKE CONCAT('%',upper($nameofbusiness),'%') + ) + select distinct propertyid from props ), owners as ( From fc6473980e5c958312329ebbac13d8164a0a7056 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 25 Jan 2023 12:31:32 +0530 Subject: [PATCH 1100/1630] corrected query for missing business name --- 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 7d98c5877..22fe092a3 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8749,7 +8749,7 @@ ReportDefinitions: label: reports.pt.usagecategory type: string source: pt - isMandatory: true + isMandatory: false searchClause: AND 1=1 - name: nameofbusiness label: reports.pt.nameofbusinness @@ -8765,7 +8765,7 @@ ReportDefinitions: ( select distinct propertyid as propertyid from eg_pt_unit where tenantid=$tenantid and usagecategory LIKE CONCAT('%',upper($category),'%') --like '%EDUCATION%' union - select id as propertyid from eg_pt_property where tenantid=$tenantid and upper(additionalDetails->>'businessName') LIKE CONCAT('%',upper($nameofbusiness),'%') + select id as propertyid from eg_pt_property where tenantid=$tenantid and upper(additionalDetails->>'businessName') LIKE CONCAT('%',upper(case when $nameofbusiness is null then '99999999' else $nameofbusiness end),'%') ) select distinct propertyid from props ), @@ -8911,7 +8911,7 @@ ReportDefinitions: ( select distinct propertyid as propertyid from eg_pt_unit where tenantid=$tenantid and usagecategory LIKE CONCAT('%',upper($category),'%') --like '%EDUCATION%' union - select id as propertyid from eg_pt_property where tenantid=$tenantid and upper(additionalDetails->>'businessName') LIKE CONCAT('%',upper($nameofbusiness),'%') + select id as propertyid from eg_pt_property where tenantid=$tenantid and upper(additionalDetails->>'businessName') LIKE CONCAT('%',upper(case when $nameofbusiness is null then '99999999' else $nameofbusiness end),'%') ) select distinct propertyid from props ), From 0d8b69066e87e44e56cdee450ae026596401714f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 25 Jan 2023 13:01:02 +0530 Subject: [PATCH 1101/1630] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 22fe092a3..29a97c8d4 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8756,18 +8756,12 @@ ReportDefinitions: type: string source: pt isMandatory: false - searchClause: AND 1=1 + 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 ( - with props as - ( - select distinct propertyid as propertyid from eg_pt_unit where tenantid=$tenantid and usagecategory LIKE CONCAT('%',upper($category),'%') --like '%EDUCATION%' - union - select id as propertyid from eg_pt_property where tenantid=$tenantid and upper(additionalDetails->>'businessName') LIKE CONCAT('%',upper(case when $nameofbusiness is null then '99999999' else $nameofbusiness end),'%') - ) - select distinct propertyid from props + select distinct propertyid as propertyid from eg_pt_unit where tenantid=$tenantid and usagecategory LIKE CONCAT('%',upper($category),'%') --like '%EDUCATION%' ), owners as ( @@ -8895,25 +8889,19 @@ ReportDefinitions: label: reports.pt.usagecategory type: string source: pt - isMandatory: false + isMandatory: true searchClause: AND 1=1 - name: nameofbusiness label: reports.pt.nameofbusinness type: string source: pt isMandatory: false - searchClause: AND 1=1 + 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 ( - with props as - ( select distinct propertyid as propertyid from eg_pt_unit where tenantid=$tenantid and usagecategory LIKE CONCAT('%',upper($category),'%') --like '%EDUCATION%' - union - select id as propertyid from eg_pt_property where tenantid=$tenantid and upper(additionalDetails->>'businessName') LIKE CONCAT('%',upper(case when $nameofbusiness is null then '99999999' else $nameofbusiness end),'%') - ) - select distinct propertyid from props ), owners as ( From 52f7f4c8fa7cdc4568e549b1ccdbc27849ab3290 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 25 Jan 2023 14:06:17 +0530 Subject: [PATCH 1102/1630] ADDED blockname in property category search --- configs/reports/configs/pt-reports.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 29a97c8d4..f3294419f 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8719,6 +8719,11 @@ ReportDefinitions: 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 @@ -8749,7 +8754,7 @@ ReportDefinitions: label: reports.pt.usagecategory type: string source: pt - isMandatory: false + isMandatory: true searchClause: AND 1=1 - name: nameofbusiness label: reports.pt.nameofbusinness @@ -8784,6 +8789,7 @@ ReportDefinitions: 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, @@ -8859,6 +8865,11 @@ ReportDefinitions: 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 @@ -8911,6 +8922,13 @@ ReportDefinitions: 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='pb.patiala' AND assessmentyears like '%2022-23%' ) select pt.propertyid as propertyid, @@ -8924,6 +8942,7 @@ ReportDefinitions: 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, @@ -8935,8 +8954,7 @@ ReportDefinitions: 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 report_assessments on report_assessments.propertyid=pt.propertyid and report_assessments.assessmentyears like '%2022-23%' + inner join assessments on assessments.propertyid=pt.propertyid where pt.status!='INACTIVE' - From 341a58707e9d6b56355a09c8e0b871663e81e366 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 25 Jan 2023 14:40:53 +0530 Subject: [PATCH 1103/1630] 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 f3294419f..c83f5bfaf 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8928,7 +8928,7 @@ ReportDefinitions: select distinct propertyid from report_assessments - where tenantid='pb.patiala' AND assessmentyears like '%2022-23%' + where tenantid=$tenantid AND assessmentyears like '%2022-23%' ) select pt.propertyid as propertyid, From e92f9242f2298a11a4bdd2329b5d01d12c231a95 Mon Sep 17 00:00:00 2001 From: gurpreetkhanna <42681551+gurpreetkhanna@users.noreply.github.com> Date: Wed, 25 Jan 2023 16:06:21 +0530 Subject: [PATCH 1104/1630] enabled to fetch paid properties for given fy catrgory wise --- configs/reports/configs/pt-reports.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index c83f5bfaf..5f043386b 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8895,6 +8895,11 @@ ReportDefinitions: type: string source: pt total: false + - name: assessmentyear + label: reports.pt.assessmentyear + type: string + source: pt + total: false searchParams: - name: category label: reports.pt.usagecategory @@ -8908,6 +8913,13 @@ ReportDefinitions: 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' + 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 @@ -8928,7 +8940,7 @@ ReportDefinitions: select distinct propertyid from report_assessments - where tenantid=$tenantid AND assessmentyears like '%2022-23%' + where tenantid=$tenantid AND assessmentyears=$finYear ) select pt.propertyid as propertyid, @@ -8947,7 +8959,8 @@ ReportDefinitions: eg_user.mobilenumber as mobileno, $category as unitcategory, (pt.additionalDetails->'legacyInfo')->>'address' as addr_survey, - pt.additionalDetails->>'businessName' as businessname + 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 From 955064f6623b43da30f43ce9132517652fd71eeb Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 27 Jan 2023 11:00:48 +0530 Subject: [PATCH 1105/1630] dump report --- 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 5f043386b..57fe7b3da 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6411,7 +6411,7 @@ ReportDefinitions: --pt.nooffloors as floors, --ru.occupancytype as occupancy, --pt.propertytype as propertytype, - rp.payermobilenumber as mobilenumber, + --rp.payermobilenumber as mobilenumber, --ra.totalamount as paymentamount, rp.amoutpaid as paymentamount, --rp.transactiondate as transcationdate, @@ -6428,7 +6428,7 @@ ReportDefinitions: 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_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 where pt.tenantid=$tenantid From faa41da9fb088daaec42685470f1b592ddf87cc4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 27 Jan 2023 11:15:37 +0530 Subject: [PATCH 1106/1630] PT Dump data v2 --- 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 57fe7b3da..b3abda1d4 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6402,18 +6402,18 @@ ReportDefinitions: --rp.paymentmode as paymentmode, pt.oldpropertyid as existingpropertyid, --ra.assessmentyears as financialyear, - getfinancialyear(rp.billid) as financialyear, + --getfinancialyear(rp.billid) as financialyear, owners.ownername as ownername, owners.guardianname as guardianname, owners.mobilenumber as mobileno, - --pt.plotsize as totalarea, + 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.amoutpaid as paymentamount, --rp.transactiondate as transcationdate, --owners.emailid as emailid, pt.address as address, From 032002e85b02302ae3269802327b967730336a2f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 27 Jan 2023 13:29:45 +0530 Subject: [PATCH 1107/1630] dump report PT --- configs/reports/configs/pt-reports.yml | 56 ++++++++++++++------------ 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index b3abda1d4..f38de89e1 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6326,12 +6326,7 @@ ReportDefinitions: label: reports.pt.propertyusagetype type: string source: pt - total: false - - name: financialyear - label: reports.pt.financialyear - type: string - source: pt - total: false + total: false - name: paymentamount label: reports.pt.paymentamount type: string @@ -6342,6 +6337,11 @@ ReportDefinitions: 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 @@ -6384,22 +6384,28 @@ ReportDefinitions: units as ( select - propertyid + 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, + --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, @@ -6407,30 +6413,30 @@ ReportDefinitions: 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, + --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.amoutpaid as paymentamount, --rp.transactiondate as transcationdate, - --owners.emailid as emailid, + --owners.emailid as emailid, pt.address as address, pt.surveyid, - --pt.additionaldetails->>'remarks' as remarks, - pt.additionaldetails->>'businessName' as firmbusinessname, + --pt.additionaldetails->>'remarks' as remarks, + --pt.additionaldetails->>'businessName' as firmbusinessname, pt.firmbusinessname as businessname, - --pt.localitycode as localitycode, + --pt.localitycode as localitycode, pt.localityname as localityname, - --pt.zonename as zonename, - --pt.blockname as blockname, + --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_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 + inner join owners on owners.propertyid=pt.propertyid and propertystatus!='INWORKFLOW' where pt.tenantid=$tenantid From e3f863036f4dcf3019807260e1078869224cb2df Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 27 Jan 2023 14:48:13 +0530 Subject: [PATCH 1108/1630] pt dump --- configs/reports/configs/pt-reports.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index f38de89e1..3b27d6f2c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6354,14 +6354,7 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - 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,',','_') + searchClause: AND rp.receiptdate <= $toDate - name: localityArray label: reports.pt.zoneList type: boundarylist From 0ac2d374b95a7bf45833eb6be06efc18e1ff1d22 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 27 Jan 2023 15:14:33 +0530 Subject: [PATCH 1109/1630] Defaulter unpaid true mandatory done --- 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 3b27d6f2c..e4a1f9521 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8083,7 +8083,7 @@ ReportDefinitions: type: singlevaluelist pattern: 'list://NONRESIDENTIAL.COMMERCIAL:Commercial,MIXED:Mixed,NONRESIDENTIAL.INDUSTRIAL:Industrial,NONRESIDENTIAL.INSTITUTIONAL:Institutional,RESIDENTIAL:ALL' source: pt - isMandatory: false + isMandatory: true searchClause: and 1=1 query: | -- Use CTE to force query plan, compute & use CTE later From fbb3b38e2fe675b59a30bace17ce30d46bece42a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 27 Jan 2023 16:25:32 +0530 Subject: [PATCH 1110/1630] Correction Defaulter report PI-12723 --- 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 e4a1f9521..646390d5b 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8081,7 +8081,7 @@ ReportDefinitions: - name: usageCat label: Usage Category type: singlevaluelist - pattern: 'list://NONRESIDENTIAL.COMMERCIAL:Commercial,MIXED:Mixed,NONRESIDENTIAL.INDUSTRIAL:Industrial,NONRESIDENTIAL.INSTITUTIONAL:Institutional,RESIDENTIAL:ALL' + pattern: 'list://NONRESIDENTIAL:NONRESIDENTIAL,MIXED:MIXED,RESIDENTIAL:RESIDENTIAL' source: pt isMandatory: true searchClause: and 1=1 @@ -8094,7 +8094,7 @@ ReportDefinitions: ), props as ( - select * from report_properties where tenantid=$tenantid and propertystatus='ACTIVE' and propertyusagetype like concat('%',$usageCat,'%') + select * from report_properties where tenantid=$tenantid and propertystatus='ACTIVE' and propertyusagetype like concat($usageCat,'%') ), owners as ( From f09ffa362bf0fe91ce1e0f3cba749b756cd4ac93 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 30 Jan 2023 09:59:46 +0530 Subject: [PATCH 1111/1630] dump data --- configs/reports/configs/pt-reports.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 646390d5b..704bb0df6 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8586,6 +8586,14 @@ ReportDefinitions: 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 @@ -8596,7 +8604,7 @@ ReportDefinitions: 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 ='pb.jalandhar' + from report_owners where status='ACTIVE' and tenantid =$ulb group by propertyid ), properties as @@ -8609,11 +8617,7 @@ ReportDefinitions: split_part(string_agg(plotsize::text,'___'),'___',1) as plotsize, split_part(string_agg(propertyusagetype,'___'),'___',1) as usagetype from report_properties - where propertystatus='ACTIVE' - and ((propertytype='BUILTUP.INDEPENDENTPROPERTY' and plotsize>=100 and propertyusagetype='RESIDENTIAL') - or ( propertytype='BUILTUP.SHAREDPROPERTY' and plotsize>=750 and propertyusagetype='RESIDENTIAL') - or propertyusagetype!='RESIDENTIAL') - and tenantid ='pb.jalandhar' and createdtime >=1564317651000 and createdtime <=1577923191000 + where propertystatus='ACTIVE' and tenantid =$ulb group by propertyid ) select @@ -8654,6 +8658,7 @@ ReportDefinitions: from properties pt --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 + where 1=1 inner join owners on owners.propertyid=pt.propertyid From 06b4c23e69b600384ddd41a36939258344c3c056 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 30 Jan 2023 10:22:47 +0530 Subject: [PATCH 1112/1630] pt dump data --- 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 704bb0df6..d72ae8373 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8658,8 +8658,8 @@ ReportDefinitions: from properties pt --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 where 1=1 - inner join owners on owners.propertyid=pt.propertyid - reportName: PROPERTY_CATEGORY_REPORT_V2 From 0a1385a7bcbb546ec5f88891b12a9e96a7919473 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 30 Jan 2023 10:49:13 +0530 Subject: [PATCH 1113/1630] dump report pt --- 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 d72ae8373..08a249327 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8615,7 +8615,8 @@ ReportDefinitions: split_part(string_agg(address,'___'),'___',1) as address, split_part(string_agg(localityname,'___'),'___',1) as localityname, split_part(string_agg(plotsize::text,'___'),'___',1) as plotsize, - split_part(string_agg(propertyusagetype,'___'),'___',1) as usagetype + split_part(string_agg(propertyusagetype,'___'),'___',1) as usagetype, + split_part(string_agg(createdtime::text,'___'),'___',1) as createdtime from report_properties where propertystatus='ACTIVE' and tenantid =$ulb group by propertyid From 860727287cb709886e60886941d22ecbcb881e58 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 30 Jan 2023 11:01:57 +0530 Subject: [PATCH 1114/1630] Block defaulter report --- configs/reports/configs/pt-reports.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 08a249327..5ed568709 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7953,6 +7953,12 @@ ReportDefinitions: source: pt isMandatory: true searchClause: and assessments.fy not like concat('%',$fy,'%') + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND props.localitycode IN ($localityArray) query: | -- Use CTE to force query plan, compute & use CTE later with assessments as @@ -8084,7 +8090,13 @@ ReportDefinitions: pattern: 'list://NONRESIDENTIAL:NONRESIDENTIAL,MIXED:MIXED,RESIDENTIAL:RESIDENTIAL' source: pt isMandatory: true - searchClause: and 1=1 + searchClause: and 1=1 + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND props.localitycode IN ($localityArray) query: | -- Use CTE to force query plan, compute & use CTE later with properties as From cafb3e5a43b8d66d4405f26dd2a05c5e62531370 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 30 Jan 2023 11:30:18 +0530 Subject: [PATCH 1115/1630] unpaid report --- 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 5ed568709..643ec4934 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8091,12 +8091,18 @@ ReportDefinitions: source: pt isMandatory: true searchClause: and 1=1 - - name: localityArray - label: reports.pt.zoneList - type: boundarylist + - name: blockname + label: reports.pt.blockname + type: string source: pt isMandatory: false - searchClause: AND props.localitycode IN ($localityArray) + 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 From 59e0f280e55342551cddced7b17df71e7ad1f870 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 30 Jan 2023 11:49:30 +0530 Subject: [PATCH 1116/1630] locality name defaulter --- 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 643ec4934..731a2ff44 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7953,12 +7953,18 @@ ReportDefinitions: source: pt isMandatory: true searchClause: and assessments.fy not like concat('%',$fy,'%') - - name: localityArray - label: reports.pt.zoneList - type: boundarylist + - name: blockname + label: reports.pt.blockname + type: string source: pt isMandatory: false - searchClause: AND props.localitycode IN ($localityArray) + 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 From c0211b3964ef0550c60fd6bb38ac8790286af436 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 30 Jan 2023 15:34:37 +0530 Subject: [PATCH 1117/1630] data dump report --- configs/reports/configs/pt-reports.yml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 731a2ff44..626e0108c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6326,11 +6326,6 @@ ReportDefinitions: label: reports.pt.propertyusagetype type: string source: pt - total: false - - name: paymentamount - label: reports.pt.paymentamount - type: string - source: pt total: false - name: localityname label: reports.pt.localityname @@ -6383,13 +6378,13 @@ ReportDefinitions: 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 - ) + --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, @@ -6412,7 +6407,7 @@ ReportDefinitions: --pt.propertytype as propertytype, --rp.payermobilenumber as mobilenumber, --ra.totalamount as paymentamount, - rp.amoutpaid as paymentamount, + --rp.amoutpaid as paymentamount, --rp.transactiondate as transcationdate, --owners.emailid as emailid, pt.address as address, @@ -6427,7 +6422,7 @@ ReportDefinitions: 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_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!='INWORKFLOW' where pt.tenantid=$tenantid From 6feb03c5a4c83c78163456941a6fa4bd4fd96107 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 30 Jan 2023 15:43:08 +0530 Subject: [PATCH 1118/1630] dump report removed amount paid --- 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 626e0108c..a2de016bc 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6424,7 +6424,7 @@ ReportDefinitions: 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!='INWORKFLOW' + inner join owners on owners.propertyid=pt.propertyid and propertystatus='ACTIVE' where pt.tenantid=$tenantid From 8702b4ddcf7b98596fd17bcae1ef5efa6f3a3758 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 30 Jan 2023 15:55:37 +0530 Subject: [PATCH 1119/1630] 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 a2de016bc..df0aafe7a 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6422,7 +6422,7 @@ ReportDefinitions: 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_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 From dad713472812a8e72eb3d834fb769ef1a46fc591 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 31 Jan 2023 12:06:04 +0530 Subject: [PATCH 1120/1630] unpaid amount fy amount added --- configs/reports/configs/pt-reports.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index df0aafe7a..a278343f7 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8077,6 +8077,16 @@ ReportDefinitions: 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 @@ -8115,6 +8125,17 @@ ReportDefinitions: ( 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 fy + 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 @@ -8129,6 +8150,8 @@ ReportDefinitions: props.propertyid, props.oldpropertyid, props.propertystatus, + demands.demand as tentativedemand, + demands.financialyears as financialyears, firmbusinessname, address, localityname, @@ -8141,6 +8164,7 @@ ReportDefinitions: 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 From 1c1240bb012053a142ccb8d562a140bf3c6e5f91 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 31 Jan 2023 12:16:16 +0530 Subject: [PATCH 1121/1630] updated col name --- 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 a278343f7..53f4ebd26 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8062,11 +8062,6 @@ ReportDefinitions: 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 @@ -8127,7 +8122,7 @@ ReportDefinitions: ), 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 fy + 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 From 420b8793c847b1fbe03a78dc1f659f1d4bfef94a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 31 Jan 2023 13:10:52 +0530 Subject: [PATCH 1122/1630] FY epoch values updated in defaulter upto 2020-21 as GMT and 2022-23 onwards as LocalTime --- 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 53f4ebd26..9daf39923 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7944,7 +7944,7 @@ ReportDefinitions: - name: fy 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' + 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' source: pt isMandatory: true searchClause: and assessments.fy not like concat('%',$fy,'%') @@ -8086,7 +8086,7 @@ ReportDefinitions: - name: fy label: Financial Year type: singlevaluelist - pattern: 'list://1427826600000:2015-16,1459449000000:2016-17,1490985000000:2017-18,1522521000000:2018-19,1554057000000:2019-20,1585679400000:2020-21,1617215400000:2021-22,1648751400000:2022-23' + 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' source: pt isMandatory: true searchClause: and 1=1 From 1ea599ecc243a0b9a027bfb5d638dabf46fdc8b8 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 31 Jan 2023 14:30:54 +0530 Subject: [PATCH 1123/1630] up --- 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 9daf39923..1144bb3e9 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8086,7 +8086,7 @@ ReportDefinitions: - 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' + pattern: 'list://1427846400000:2015-16,1459468800000:2016-17,1491004800000:2017-18,1522540800000:2018-19,1522540800000:2019-20,1554076800000:2020-21,1617215400000:2021-22,1648751400000:2022-23' source: pt isMandatory: true searchClause: and 1=1 From 658695ab418b62012e74f9476345a1d8c0d4844b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 31 Jan 2023 14:41:53 +0530 Subject: [PATCH 1124/1630] unpaid --- 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 1144bb3e9..b7e8474ab 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8086,7 +8086,7 @@ ReportDefinitions: - name: fy label: Financial Year type: singlevaluelist - pattern: 'list://1427846400000:2015-16,1459468800000:2016-17,1491004800000:2017-18,1522540800000:2018-19,1522540800000:2019-20,1554076800000:2020-21,1617215400000:2021-22,1648751400000:2022-23' + 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' source: pt isMandatory: true searchClause: and 1=1 From 2d0f51c1ce8e40f06f5a1e29ede259f1451137da Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 3 Feb 2023 15:44:48 +0530 Subject: [PATCH 1125/1630] defaulter unpaid demand report from demand table --- configs/reports/configs/pt-reports.yml | 103 ++++++++++++++++++++++++- 1 file changed, 100 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index b7e8474ab..71752b892 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8003,7 +8003,7 @@ ReportDefinitions: left outer join owners on owners.propertyid=props.propertyid where props.tenantid=$tenantid and propertystatus!='INACTIVE' -- reportName: DEFAULTER_REPORT_WITH_LOCALITY_UNPAID_DEMAND +- reportName: DEFAULTER_REPORT_WITH_LOCALITY_UNPAID_DEMAND_OLD decryptionPathId: ULBDEFAULTERPTREPORT_V2 summary: Occupancy Type Report version: 1.0.0 @@ -9012,5 +9012,102 @@ ReportDefinitions: 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 + 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 + searchParams: + - 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 + 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 + from report_unpaid_demand d + left join report_properties pt on pt.propertyid=d.propertyid + where d.tenantid=$tenantid From b9f13cbe5a581c9dcb37bf51aae771b1ba30eaea Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 3 Feb 2023 15:56:16 +0530 Subject: [PATCH 1126/1630] firmbusinessname --- 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 71752b892..c415410c5 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9091,7 +9091,7 @@ ReportDefinitions: type: string source: pt isMandatory: false - searchClause: AND upper(pt.additionalDetails->>'businessName') LIKE CONCAT('%',upper($nameofbusiness),'%') + searchClause: AND upper(pt.firmbusinessname) 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 select From b514e506121e9e72fe079e1fb8a6425cb0afacf3 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 3 Feb 2023 16:04:54 +0530 Subject: [PATCH 1127/1630] 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 c415410c5..cec0154d8 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9110,4 +9110,4 @@ ReportDefinitions: pt.localityname as localityname from report_unpaid_demand d left join report_properties pt on pt.propertyid=d.propertyid - where d.tenantid=$tenantid + where d.tenantid=$tenantid and pt.propertystatus!='INACTIVE' From 353cfab6682221e87eadd7a9afbd9dce4f08a40c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 6 Feb 2023 09:33:31 +0530 Subject: [PATCH 1128/1630] applied filters in pending demand defaulter report --- configs/reports/configs/pt-reports.yml | 30 ++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index cec0154d8..833364194 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8003,7 +8003,7 @@ ReportDefinitions: left outer join owners on owners.propertyid=props.propertyid where props.tenantid=$tenantid and propertystatus!='INACTIVE' -- reportName: DEFAULTER_REPORT_WITH_LOCALITY_UNPAID_DEMAND_OLD +- reportName: DEFAULTER_REPORT_WITH_LOCALITY_UNPAID_DEMAND decryptionPathId: ULBDEFAULTERPTREPORT_V2 summary: Occupancy Type Report version: 1.0.0 @@ -9014,7 +9014,7 @@ ReportDefinitions: where pt.status!='INACTIVE' -- reportName: DEFAULTER_REPORT_WITH_LOCALITY_UNPAID_DEMAND +- reportName: DEFAULTER_REPORT_WITH_LOCALITY_UNPAID_DEMAND_NEW decryptionPathId: ULBPTDataDumpReport_V2 summary: ULB level report version: 1.0.0 @@ -9092,6 +9092,32 @@ ReportDefinitions: 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' + 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 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: | --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 select From 274f97608c1a4b52717b3858f0f3863103e606dc Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 6 Feb 2023 11:40:22 +0530 Subject: [PATCH 1129/1630] unpiad demand report to fileter with usage categpry --- 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 833364194..9bcc3f263 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9105,7 +9105,7 @@ ReportDefinitions: pattern: 'list://NONRESIDENTIAL:NONRESIDENTIAL,MIXED:MIXED,RESIDENTIAL:RESIDENTIAL' source: pt isMandatory: false - searchClause: and 1=1 + searchClause: and pt.propertyusagetype like concat($usageCat,'%') - name: blockname label: reports.pt.blockname type: string From 30c57082d745e596d3e01d060b6445f0b6ae6f4b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 6 Feb 2023 12:15:42 +0530 Subject: [PATCH 1130/1630] 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 9bcc3f263..b95547dfc 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9135,5 +9135,5 @@ ReportDefinitions: pt.firmbusinessname as businessname, pt.localityname as localityname from report_unpaid_demand d - left join report_properties pt on pt.propertyid=d.propertyid - where d.tenantid=$tenantid and pt.propertystatus!='INACTIVE' + left join report_properties pt on pt.propertyid=d.propertyid and pt.propertystatus!='INACTIVE' + where d.tenantid=$tenantid and d.demand>0 From 0b4115ec896b680f0193802a8325b3f22f1be85e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 6 Feb 2023 15:29:49 +0530 Subject: [PATCH 1131/1630] added subcategory filter --- 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 b95547dfc..188668039 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9106,6 +9106,12 @@ ReportDefinitions: source: pt isMandatory: false searchClause: and pt.propertyusagetype like concat($usageCat,'%') + - name: usageSubCat + label: Usage Sub Category + type: string + source: pt + isMandatory: false + searchClause: and u.usagecategory like concat('%',$usageSubCat,'%') - name: blockname label: reports.pt.blockname type: string @@ -9136,4 +9142,5 @@ ReportDefinitions: pt.localityname as localityname from report_unpaid_demand d left join report_properties pt on pt.propertyid=d.propertyid and pt.propertystatus!='INACTIVE' + inner join report_units u on u.propertyid=pt.propertyid and u.tenantid=$tenantid where d.tenantid=$tenantid and d.demand>0 From d6df8f106452c9e437d21ccb227aef20fde459d8 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 6 Feb 2023 16:07:34 +0530 Subject: [PATCH 1132/1630] added owner info in pending demand report --- configs/reports/configs/pt-reports.yml | 27 ++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 188668039..123827afd 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9085,6 +9085,16 @@ ReportDefinitions: 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 @@ -9111,7 +9121,7 @@ ReportDefinitions: type: string source: pt isMandatory: false - searchClause: and u.usagecategory like concat('%',$usageSubCat,'%') + searchClause: and u.usagecategory like concat('%',upper($usageSubCat),'%') - name: blockname label: reports.pt.blockname type: string @@ -9126,6 +9136,16 @@ ReportDefinitions: 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 + ), select d.propertyid as propertyid, pt.oldpropertyid as oldpropertyid, @@ -9139,8 +9159,11 @@ ReportDefinitions: pt.ownershipcategory as ownership, pt.plotsize as plotsize, pt.firmbusinessname as businessname, - pt.localityname as localityname + 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 report_units u on u.propertyid=pt.propertyid and u.tenantid=$tenantid + inner join owners on owners.propertyid=pt.propertyid where d.tenantid=$tenantid and d.demand>0 From 02fe65b0f9826b21cb014a5073c367d197c9f346 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 6 Feb 2023 16:18:15 +0530 Subject: [PATCH 1133/1630] 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 123827afd..4a39d666c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9145,7 +9145,7 @@ ReportDefinitions: from report_owners where tenantid=$tenantid and status='ACTIVE' and propertyid in (select propertyid from report_unpaid_demand where tenantid=$tenantid) group by propertyid - ), + ) select d.propertyid as propertyid, pt.oldpropertyid as oldpropertyid, From becd91aac0fe637f1c35202002e3bdd5e311e04e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 7 Feb 2023 12:24:09 +0530 Subject: [PATCH 1134/1630] removed duplicacy because of units --- configs/reports/configs/pt-reports.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 4a39d666c..3119b506b 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9121,7 +9121,7 @@ ReportDefinitions: type: string source: pt isMandatory: false - searchClause: and u.usagecategory like concat('%',upper($usageSubCat),'%') + searchClause: u.unitusage like concat('%',upper($usageSubCat),'%') - name: blockname label: reports.pt.blockname type: string @@ -9145,6 +9145,10 @@ ReportDefinitions: 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, @@ -9164,6 +9168,6 @@ ReportDefinitions: 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 report_units u on u.propertyid=pt.propertyid and u.tenantid=$tenantid + 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 From e63390fb71880f326be23a7d65f86978b8cad640 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Wed, 8 Feb 2023 14:33:16 +0530 Subject: [PATCH 1135/1630] Updated size and query --- .../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 a93782dc6..80bd1ffc6 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4049,7 +4049,7 @@ "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\"}]}}}}}}" + "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, @@ -4092,7 +4092,7 @@ "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\"}]}}}}}}}}" + "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, @@ -4136,7 +4136,7 @@ "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\"}]}}}}}}}}" + "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, From 817ff882dcf671472242cc8d69f55447e759de64 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Wed, 8 Feb 2023 17:19:51 +0530 Subject: [PATCH 1136/1630] Changed content error --- 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 fb3170b5e..2756e4701 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 e1883272cd11aacdf231b09c2a24a3aedbd3f7f4 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 13 Feb 2023 17:21:13 +0530 Subject: [PATCH 1137/1630] Updated query map for DDR connection agaging --- .../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 80bd1ffc6..aa16b12a3 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4046,7 +4046,6 @@ "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\"}]}}}}}}}}" From 0a3a2573504c0930e4c15a63b4287871e644ad5b Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Tue, 14 Feb 2023 17:28:59 +0530 Subject: [PATCH 1138/1630] Updated query map --- .../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 aa16b12a3..58aa960f6 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4047,6 +4047,7 @@ { "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\"}]}}}}}}}}" } From 5a4fa2bd3971b1c14fadbb853218e550b373367c Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Thu, 16 Feb 2023 10:25:37 +0530 Subject: [PATCH 1139/1630] Bussiness service NA Fixed --- configs/pdf-service/data-config/ws-onetime-receipt.json | 2 +- configs/pdf-service/format-config/ws-onetime-receipt.json | 2 +- 2 files 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 3fbff9ced..7f3f0a02d 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" }, diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 8d78f6728..e1590e099 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}}{{mcGrade}}", "style": "receipt-logo-header" }, { From 9a001a0416d052b1314dd82422fddb56140f92fc Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Thu, 16 Feb 2023 17:04:04 +0530 Subject: [PATCH 1140/1630] Fixed issues approved by system --- 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 2756e4701..cdfea59c3 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" + "value":"$.ProcessInstances[?(@.action == 'APPROVE')].assigner.name==null?'SYSTEM': $.ProcessInstances[?(@.action == 'APPROVE')].assigner.name" } ] From 9af123cf8f79e35b97ddb86005f5d2e9183a17cc Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Tue, 21 Feb 2023 12:33:43 +0530 Subject: [PATCH 1141/1630] Removed watermark mccollect bill and collect challan --- configs/pdf-service/format-config/mcollect-bill.json | 7 ------- configs/pdf-service/format-config/mcollect-challan.json | 7 ------- 2 files changed, 14 deletions(-) diff --git a/configs/pdf-service/format-config/mcollect-bill.json b/configs/pdf-service/format-config/mcollect-bill.json index dccd278d3..081e437cd 100644 --- a/configs/pdf-service/format-config/mcollect-bill.json +++ b/configs/pdf-service/format-config/mcollect-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", diff --git a/configs/pdf-service/format-config/mcollect-challan.json b/configs/pdf-service/format-config/mcollect-challan.json index 0326c09a6..4ed93c202 100644 --- a/configs/pdf-service/format-config/mcollect-challan.json +++ b/configs/pdf-service/format-config/mcollect-challan.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 fe2260cb6a0e249f54ea05e71058f9520ee366bb Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 22 Feb 2023 09:56:59 +0530 Subject: [PATCH 1142/1630] PT cancel receipt register reason for cancel added --- 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 3119b506b..1f00d7fbe 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2719,7 +2719,8 @@ ReportDefinitions: (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 + 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 From 1b2d935cd10ea2afe5a55b1016289946d62e35c1 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Thu, 23 Feb 2023 12:28:36 +0530 Subject: [PATCH 1143/1630] Revart 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 cdfea59c3..2756e4701 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" } ] From 62e3afc2af95f4e1db9e34d8516d382c3987e485 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 27 Feb 2023 12:11:15 +0530 Subject: [PATCH 1144/1630] added searchTLApplicationEODB for Invest Punjab TL integration --- .../egov-searcher/rainmaker-pt-gissearch.yml | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index 40aa4b9c5..0be448407 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -52,3 +52,28 @@ 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, + 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 From 244c7f0a6e3b884873d3723880a1cd8afeee1b7c Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Thu, 2 Mar 2023 11:36:11 +0530 Subject: [PATCH 1145/1630] Updated the property-assessment by financial --- .../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 58aa960f6..272ac0776 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2122,14 +2122,14 @@ "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}}}}}}}}" + "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.name.keyword\"},\"aggs\":{\"Total\":{\"value_count\":{\"field\":\"Data.assessmentNumber.keyword\"}}}}}}}}" + "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": [ From 461eb74bc6f455ab886d744326fcf38e1a30eaf7 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Thu, 2 Mar 2023 15:27:22 +0530 Subject: [PATCH 1146/1630] Updated missing ulb mapping --- .../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 8db7aa0c9..a5ce480c2 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 c35a652bf5a684440c2e57395dc794062b9c3c5f Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Thu, 2 Mar 2023 17:55:02 +0530 Subject: [PATCH 1147/1630] Updated assessed properties issue in keyfinancial indicator --- .../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 272ac0776..b0a6fef32 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -821,7 +821,14 @@ "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\"}}}}}}}}" + "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", From 68306ba1d3f37f2e0278f53d3054a24232fc9653 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Wed, 15 Mar 2023 12:11:35 +0530 Subject: [PATCH 1148/1630] Replaced text TL certificate and receipt --- configs/pdf-service/format-config/tlcertificate.json | 3 ++- configs/pdf-service/format-config/tradelicense-receipt.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index ebc70a71a..56be9e4d0 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -524,7 +524,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 d7d737fe3..53676af7d 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -862,7 +862,7 @@ }, { "style": "no-signature", - "text": "{{no_signature}}" + "text": "This is a computer generted recepit hence requires no signature." }, { "style": "pt-disclaimer", From 5bf40109a017a61be5754407c68be465879458c3 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 17 Mar 2023 15:20:45 +0530 Subject: [PATCH 1149/1630] state defaulter report --- configs/reports/configs/pt-reports.yml | 169 +++++++++++++++++++++++++ 1 file changed, 169 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 1f00d7fbe..a7e21a0de 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9172,3 +9172,172 @@ ReportDefinitions: 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' + 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=$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!='pb.testing' and d.demand>0 + + + From d622573ecff0c83003e54e14781c595ef657b877 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 17 Mar 2023 15:43:10 +0530 Subject: [PATCH 1150/1630] defaulter report for state --- 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 a7e21a0de..cc1285453 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9310,12 +9310,12 @@ ReportDefinitions: 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) + 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=$tenantid) and active=true group by propertyid + 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, From be018d42de31274f20e75a00aaa1ac7da3be9908 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 24 Mar 2023 17:37:29 +0530 Subject: [PATCH 1151/1630] state name user report --- configs/reports/configs/pt-reports.yml | 47 ++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index cc1285453..a4dbafb29 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9173,6 +9173,7 @@ ReportDefinitions: 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 @@ -9338,6 +9339,52 @@ ReportDefinitions: 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: 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 + 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 + + SELECT + name as ownername, + guardian, + mobilenumber as mobileno from eg_user where lower(name) like '%gurp%' + From 78ee6cf1a0225bed8c15b98349deb454c91947a4 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Fri, 31 Mar 2023 18:25:37 +0530 Subject: [PATCH 1152/1630] udated TL Total Licence Issued --- .../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 b0a6fef32..6385ceaec 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1392,7 +1392,14 @@ "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\"}}}}}}" + "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", From daaae9fd898296d9b9013dd2909c8fafe0ad0571 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 3 Apr 2023 09:43:58 +0530 Subject: [PATCH 1153/1630] Update pt-reports.yml --- 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 a4dbafb29..90a3ec338 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9370,20 +9370,21 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND pt.createdtime>=$fromDate + searchClause: AND 1=1 - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND pt.createdtime<=$toDate + searchClause: AND 1=1 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%' + mobilenumber as mobileno + from eg_user + where lower(name) like '%gurp%' From bfe63e743f92edf311167b34c295846e2585cc56 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 3 Apr 2023 10:05:51 +0530 Subject: [PATCH 1154/1630] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 90a3ec338..f03c4933d 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9354,8 +9354,13 @@ ReportDefinitions: type: string source: pt total: false - - name: guardian - label: reports.pt.guardian + - name: oname + label: reports.pt.ownernameenc + type: string + source: pt + total: false + - name: guardianname + label: reports.pt.guardianname type: string source: pt total: false @@ -9381,7 +9386,8 @@ ReportDefinitions: -- Use CTE to force query plan, compute & use CTE later SELECT name as ownername, - guardian, + name as oname, + guardian as guardianname, mobilenumber as mobileno from eg_user where lower(name) like '%gurp%' From a1af4b619f7209bd6bb003e02174218d17d22d24 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 3 Apr 2023 10:16:53 +0530 Subject: [PATCH 1155/1630] search PT by name --- configs/reports/configs/pt-reports.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index f03c4933d..7a159c9d0 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9374,14 +9374,20 @@ ReportDefinitions: label: reports.pt.fromDate type: epoch source: pt - isMandatory: true + isMandatory: false searchClause: AND 1=1 - name: toDate label: reports.pt.toDate type: epoch source: pt - isMandatory: true + isMandatory: false searchClause: AND 1=1 + - name: nameOfOnwer + label: reports.pt.name + type: epoch + source: pt + isMandatory: true + searchClause: lower(name) like concat('%',$nameOfOwner,'%') query: | -- Use CTE to force query plan, compute & use CTE later SELECT @@ -9390,8 +9396,5 @@ ReportDefinitions: guardian as guardianname, mobilenumber as mobileno from eg_user - where lower(name) like '%gurp%' - - - - + where 1=1 + From ead051d4eb6a4399c7d4a8dd90243f8b5eb9a53f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 3 Apr 2023 10:21:07 +0530 Subject: [PATCH 1156/1630] 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 7a159c9d0..b4eabdca8 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9384,7 +9384,7 @@ ReportDefinitions: searchClause: AND 1=1 - name: nameOfOnwer label: reports.pt.name - type: epoch + type: string source: pt isMandatory: true searchClause: lower(name) like concat('%',$nameOfOwner,'%') From 98882ad6898bea7d62399973f592008fec2fe561 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 3 Apr 2023 10:32:19 +0530 Subject: [PATCH 1157/1630] 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 b4eabdca8..69b3c95da 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9387,7 +9387,7 @@ ReportDefinitions: type: string source: pt isMandatory: true - searchClause: lower(name) like concat('%',$nameOfOwner,'%') + searchClause: AND lower(name) like concat('%',$nameOfOwner,'%') query: | -- Use CTE to force query plan, compute & use CTE later SELECT From 1ad91b955e2efe0d73640653f80df8c7d5bd20f8 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 3 Apr 2023 11:02:59 +0530 Subject: [PATCH 1158/1630] 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 69b3c95da..9ba1deee7 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9382,7 +9382,7 @@ ReportDefinitions: source: pt isMandatory: false searchClause: AND 1=1 - - name: nameOfOnwer + - name: nameOfOwner label: reports.pt.name type: string source: pt From f7890886faaa526bd7a470cf688802399e76ab55 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 3 Apr 2023 15:08:44 +0530 Subject: [PATCH 1159/1630] added api for IFMS integration (Finance integration) --- .../egov-searcher/rainmaker-pt-gissearch.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index 0be448407..811ea3c6c 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -77,3 +77,22 @@ SearchDefinitions: jsonFormat: {"ResponseInfo": {}} outJsonPath: $.data responseInfoPath: $.ResponseInfo + + + - name: IFMSintegration + query: + baseQuery: | + select receiptnumber,name,mobilenumber,amountpaid,consumer_code,businessservice,pd.tenantid + from egcl_paymentdetail pd + inner join egcl_payment p on (p.id=pd.paymentid and pd.receiptdate>= 1680028200000 and pd.receiptdate< 1680114600000) + left outer join eg_pg_transactions t on t.bill_id=pd.billid ) data + groupBy: + orderBy: + searchParams: + condition: AND + params: + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo From 61bf08d33c99f2eaf9bafc328e0a54fa958795c8 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 5 Apr 2023 11:49:24 +0530 Subject: [PATCH 1160/1630] updated query IFMS --- configs/egov-searcher/rainmaker-pt-gissearch.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index 811ea3c6c..02569bc1c 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -82,10 +82,11 @@ SearchDefinitions: - name: IFMSintegration query: baseQuery: | - select receiptnumber,name,mobilenumber,amountpaid,consumer_code,businessservice,pd.tenantid - from egcl_paymentdetail pd - inner join egcl_payment p on (p.id=pd.paymentid and pd.receiptdate>= 1680028200000 and pd.receiptdate< 1680114600000) - left outer join eg_pg_transactions t on t.bill_id=pd.billid ) data + select array_to_json(array_agg(row_to_json(data))) from ( + select receiptnumber,name,mobilenumber,amountpaid,consumer_code,businessservice,pd.tenantid + from egcl_paymentdetail pd + inner join egcl_payment p on (p.id=pd.paymentid and pd.receiptdate>= 1680028200000 and pd.receiptdate< 1680114600000) + left outer join eg_pg_transactions t on t.bill_id=pd.billid ) data groupBy: orderBy: searchParams: From b980595efb1e5b4a231d221882499606b7facefa Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 5 Apr 2023 11:58:40 +0530 Subject: [PATCH 1161/1630] exclude testing ulb from integrated finance --- configs/egov-searcher/rainmaker-pt-gissearch.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index 02569bc1c..534f45b38 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -86,7 +86,8 @@ SearchDefinitions: select receiptnumber,name,mobilenumber,amountpaid,consumer_code,businessservice,pd.tenantid from egcl_paymentdetail pd inner join egcl_payment p on (p.id=pd.paymentid and pd.receiptdate>= 1680028200000 and pd.receiptdate< 1680114600000) - left outer join eg_pg_transactions t on t.bill_id=pd.billid ) data + left outer join eg_pg_transactions t on t.bill_id=pd.billid + where tenantid!='pb.testing') data groupBy: orderBy: searchParams: From 116f01f2e1007a47c214ed0153c95d2735e4bb41 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 7 Apr 2023 19:41:35 +0530 Subject: [PATCH 1162/1630] extract decrypted property owners --- configs/reports/configs/pt-reports.yml | 36 +++++++++----------------- 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 9ba1deee7..dfffe3c39 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9349,13 +9349,18 @@ ReportDefinitions: print: pdfPageSize: "Legal" sourceColumns: - - name: ownername - label: reports.pt.ownername + - name: tenantid + label: reports.pt.tenantid type: string source: pt total: false - - name: oname - label: reports.pt.ownernameenc + - name: propertyid + label: reports.pt.propertyid + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername type: string source: pt total: false @@ -9370,31 +9375,14 @@ ReportDefinitions: source: pt total: false searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND 1=1 - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND 1=1 - - name: nameOfOwner - label: reports.pt.name - type: string - source: pt - isMandatory: true - searchClause: AND lower(name) like concat('%',$nameOfOwner,'%') query: | -- Use CTE to force query plan, compute & use CTE later SELECT + tenantid, + propertyid, name as ownername, - name as oname, guardian as guardianname, mobilenumber as mobileno - from eg_user + from report_owners where 1=1 From b694fffbe57d24a2424856a209709b9d8f17f4cb Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 7 Apr 2023 19:55:10 +0530 Subject: [PATCH 1163/1630] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index dfffe3c39..a94bd5045 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9375,6 +9375,12 @@ ReportDefinitions: source: pt total: false searchParams: + - name: $oname + label: reports.pt.name + type: string + source: pt + isMandatory: false + searchClause: AND 1=1 query: | -- Use CTE to force query plan, compute & use CTE later SELECT From 8742606b7fda7c910e8ede3c1c3ff04612c3e9bd Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 7 Apr 2023 20:11:04 +0530 Subject: [PATCH 1164/1630] Update pt-reports.yml --- 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 a94bd5045..b8b508e2a 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9376,7 +9376,7 @@ ReportDefinitions: total: false searchParams: - name: $oname - label: reports.pt.name + label: reports.pt.oname type: string source: pt isMandatory: false @@ -9386,8 +9386,8 @@ ReportDefinitions: SELECT tenantid, propertyid, - name as ownername, - guardian as guardianname, + ownername as ownername, + guardianname as guardianname, mobilenumber as mobileno from report_owners where 1=1 From 3176d6e9280b03bbca9a22089588299170e1c307 Mon Sep 17 00:00:00 2001 From: vinothrallapalli-eGov Date: Mon, 10 Apr 2023 13:02:52 +0530 Subject: [PATCH 1165/1630] Corrected syntax issue --- .../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 6385ceaec..04fe10335 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1397,7 +1397,7 @@ { "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" + "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\"}}}}}}" }, From 60e7fea52811f917d0136266d4d4cd76174ea4e1 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 24 Apr 2023 12:36:23 +0530 Subject: [PATCH 1166/1630] ulb property owners decrypted --- 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 b8b508e2a..d86677b5e 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9375,12 +9375,14 @@ ReportDefinitions: source: pt total: false searchParams: - - name: $oname - label: reports.pt.oname - type: string + - 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 + searchClause: AND report_owners.tenantid = $ulb query: | -- Use CTE to force query plan, compute & use CTE later SELECT From 40fc7838b5b2576817efb7dc530ef9aea133ab07 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 24 Apr 2023 15:40:47 +0530 Subject: [PATCH 1167/1630] username dump pt --- configs/reports/configs/pt-reports.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index d86677b5e..66cdc0e4c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9386,11 +9386,13 @@ ReportDefinitions: 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 + d.tenantid, + d.propertyid, + d.ownername as ownername, + d.guardianname as guardianname, + d.mobilenumber as mobileno, + pt.landarea + from report_owners d + inner join eg_pt_property pt on (pt.propertyid=d.propertyid and d.tenantid='pb.itpatiala') where 1=1 From 5c59f2a7d5332f20536194af8061c46af6d931b4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 24 Apr 2023 15:46:54 +0530 Subject: [PATCH 1168/1630] added api GetTenantConfig fetching tenants localities for mandatory surveyid --- .../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 534f45b38..58e990564 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -98,3 +98,27 @@ SearchDefinitions: jsonFormat: {"ResponseInfo": {}} outJsonPath: $.data responseInfoPath: $.ResponseInfo + + + - name: GetTenantConfig + query: + baseQuery: | + select array_to_json(array_agg(row_to_json(data))) from ( + select * + from eg_tenant_config + where 1=1 $where + ) data + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: tenantid + isMandatory: false + jsonPath: $.searchCriteria.tenantId + operator: = + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo From 06debdd3be8f3a2dbd5981a3344e850274c8e6b5 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 24 Apr 2023 16:04:30 +0530 Subject: [PATCH 1169/1630] land area added in username pt --- 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 66cdc0e4c..e1fcbda9d 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9374,6 +9374,11 @@ ReportDefinitions: type: string source: pt total: false + - name: landarea + label: reports.pt.landarea + type: string + source: pt + total: false searchParams: - name: ulb label: ULB From f74fe918122178fc43a03db3d4d09be3bcddd6de Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 24 Apr 2023 16:30:28 +0530 Subject: [PATCH 1170/1630] 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 e1fcbda9d..dce33a46c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9398,6 +9398,6 @@ ReportDefinitions: d.mobilenumber as mobileno, pt.landarea from report_owners d - inner join eg_pt_property pt on (pt.propertyid=d.propertyid and d.tenantid='pb.itpatiala') + inner join eg_pt_property pt on (pt.propertyid=d.propertyid and d.tenantid!='pb.testing') where 1=1 From 66f38465d29b5dc61451ad055749a2092e5895e1 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 24 Apr 2023 16:31:12 +0530 Subject: [PATCH 1171/1630] 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 58e990564..498e6ba36 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -104,9 +104,9 @@ SearchDefinitions: query: baseQuery: | select array_to_json(array_agg(row_to_json(data))) from ( - select * + select id,tenantid,locality,issurveyidmandatory from eg_tenant_config - where 1=1 $where + $where ) data groupBy: orderBy: From e3e7928996dd443baaaf25fc58e4121d55ac9d0a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 24 Apr 2023 16:37:30 +0530 Subject: [PATCH 1172/1630] tenantid mandatory for GetTenantConfig --- 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 498e6ba36..77ee25db7 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -114,7 +114,7 @@ SearchDefinitions: condition: AND params: - name: tenantid - isMandatory: false + isMandatory: true jsonPath: $.searchCriteria.tenantId operator: = From 094e99580b008a60a87ab3f80d65bcdafbb26e6d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 25 Apr 2023 15:44:28 +0530 Subject: [PATCH 1173/1630] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index dce33a46c..0b33ff67f 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3467,7 +3467,17 @@ ReportDefinitions: label: reports.pt.existingpropertyid type: string source: pt - total: false + 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 @@ -3548,7 +3558,7 @@ ReportDefinitions: 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", + 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, @@ -3559,7 +3569,7 @@ ReportDefinitions: --pt.nooffloors as "floors", eu.mobilenumber as "mobileno", --paymentmode as "transcationmode", - --payment.totalamountpaid as "paymentamount", + 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", From d9b7ce6a9e1e3c08c483820f71cd5d01ec102844 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 26 Apr 2023 12:27:25 +0530 Subject: [PATCH 1174/1630] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 0b33ff67f..5e00e1d1d 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9383,12 +9383,7 @@ ReportDefinitions: label: reports.pt.mobileno type: string source: pt - total: false - - name: landarea - label: reports.pt.landarea - type: string - source: pt - total: false + total: false searchParams: - name: ulb label: ULB @@ -9405,9 +9400,7 @@ ReportDefinitions: d.propertyid, d.ownername as ownername, d.guardianname as guardianname, - d.mobilenumber as mobileno, - pt.landarea - from report_owners d - inner join eg_pt_property pt on (pt.propertyid=d.propertyid and d.tenantid!='pb.testing') - where 1=1 + d.mobilenumber as mobileno + from report_owners d where d.tenantid!='pb.testing' + From 66708ccc4e4fe99479071ced3b6948edbc46a4da Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 26 Apr 2023 12:57:10 +0530 Subject: [PATCH 1175/1630] Update pt-reports.yml --- 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 5e00e1d1d..e3581bbac 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9395,12 +9395,13 @@ ReportDefinitions: searchClause: AND report_owners.tenantid = $ulb query: | -- Use CTE to force query plan, compute & use CTE later - SELECT - d.tenantid, - d.propertyid, - d.ownername as ownername, - d.guardianname as guardianname, - d.mobilenumber as mobileno - from report_owners d where d.tenantid!='pb.testing' + SELECT + tenantid, + propertyid, + ownername as ownername, + guardianname as guardianname, + mobilenumber as mobileno + from report_owners + where 1=1 From 77f0999e49ee3fc814ef3fa3a04283f89b726fc7 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Sun, 30 Apr 2023 23:01:56 +0530 Subject: [PATCH 1176/1630] Updated fire-noc and mcollect today's collection --- .../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 04fe10335..9fc2e7221 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -159,6 +159,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\":{\"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", From a7f7a0adc32e50a02dc3797148f94b624bd8c39b Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Sun, 30 Apr 2023 23:03:23 +0530 Subject: [PATCH 1177/1630] added the mcTotalCollection kpi chart --- .../dashboard-analytics/ChartApiConfig.json | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 9fc2e7221..9a1786ca4 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4199,6 +4199,36 @@ "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": " " } } From 9a9976855189dfea6f8f2c2ec0676b7b3f8a2777 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Sun, 30 Apr 2023 23:04:58 +0530 Subject: [PATCH 1178/1630] added mcollect total reciept --- .../dashboard-analytics/ChartApiConfig.json | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 9a1786ca4..4de795373 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4229,6 +4229,36 @@ "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": " " } } From 3abfabd908f1fe983ba9e2306ef8af0e7669feb8 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Sun, 30 Apr 2023 23:06:32 +0530 Subject: [PATCH 1179/1630] added noctotal collection kpi --- .../dashboard-analytics/ChartApiConfig.json | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 4de795373..f48457e1d 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4259,6 +4259,35 @@ "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 " } } From 5752aaa7ff79ec62f2c635f7567c93e18d89ebb8 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Sun, 30 Apr 2023 23:11:00 +0530 Subject: [PATCH 1180/1630] Added nocTotalNocsIssued config --- .../dashboard-analytics/ChartApiConfig.json | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index f48457e1d..861396910 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4288,6 +4288,35 @@ "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 " } } From 71e5c75a3aec8a085b08c9b65695886e578b8667 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Sun, 30 Apr 2023 23:14:58 +0530 Subject: [PATCH 1181/1630] added mcTodaysCollection config --- .../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 861396910..545766a3c 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4317,6 +4317,28 @@ "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": " " } } From b63d75571eead1fc98f3239858318d4063763e86 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Sun, 30 Apr 2023 23:17:47 +0530 Subject: [PATCH 1182/1630] added mcTotalCategories and mcTotalChallans config --- .../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 545766a3c..d286dd5dc 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4339,6 +4339,58 @@ ], "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": " " } } From 106364f5949991ef5c26f3bc1fea69503d6e8574 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Sun, 30 Apr 2023 23:23:12 +0530 Subject: [PATCH 1183/1630] added mcollect and fire-noc configs --- .../dashboard-analytics/ChartApiConfig.json | 836 ++++++++++++++++++ 1 file changed, 836 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index d286dd5dc..778a3eb2c 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4391,6 +4391,842 @@ ], "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 Date: Sun, 30 Apr 2023 23:24:57 +0530 Subject: [PATCH 1184/1630] Added the finance module configs --- .../dashboard-analytics/ChartApiConfig.json | 302 +++++++++++++++++- 1 file changed, 301 insertions(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 778a3eb2c..0c16ed54f 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -5227,6 +5227,306 @@ ], "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": " " + }, + "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": "" + }, + "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, + "chartType": "metric", + "valueType": "amount", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Total Collection" + ], + "insight": { + "chartResponseMap": "financeTotalCollection", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "month" + }, + "_comment": " " + }, + "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\":{\"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": false, + "translateTenantCode": true, + "filterKeys": [ + { + "key": "tenantId", + "column": "ULBs" + } + ], + "chartType": "table", + "valueType": "number", + "action": "", + "plotLabel": "ULBs", + "isPostResponseHandler": true, + "postAggregationTheory": "repsonseToDifferenceOfDates", + "documentType": "_doc", + "drillChart": "none", + "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 ba0db4edd5b6506694f8bb12c6e796990cbd1bb7 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 1 May 2023 00:31:42 +0530 Subject: [PATCH 1185/1630] added mcollect and firenoc --- .../MasterDashboardConfig.json | 889 +++++++++++++++++- 1 file changed, 845 insertions(+), 44 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 4eea76b74..be798b005 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": [] }, { @@ -147,20 +149,20 @@ }, { "row": 3, - "name": "DSS_REVENUE", - "vizArray": [ - { - "id": 131, - "name": "PT ,TL TOTAL COLLECTION ", - "dimensions": { + "name": "DSS_REVENUE", + "vizArray": [ + { + "id": 131, + "name": "PT ,TL TOTAL COLLECTION ", + "dimensions": { "height": 350, "width": 12 - }, + }, "vizType": "chart", "noUnit": false, "isCollapsible": false, - "charts": [ - { + "charts": [ + { "id": "collectionByModule", "name": "COLLECTION_BY_MODULE", "code": "", @@ -168,38 +170,38 @@ "filter": "", "headers": [] } - ] - } - ] + ] + } + ] }, - { + { "row": 4, - "name": "DSS_REVENUE", - "vizArray": [ - { - "id": 141, - "name": "W&S ERP TOTAL COLLECTION", - "dimensions": { + "name": "DSS_REVENUE", + "vizArray": [ + { + "id": 141, + "name": "W&S ERP TOTAL COLLECTION", + "dimensions": { "height": 350, "width": 12 - }, + }, "vizType": "chart", "noUnit": false, "isCollapsible": false, - "charts": [ - { - "id": "wsTaxHeadDDROverview", + "charts": [ + { + "id": "wsTaxHeadDDROverview", "name": "DSS_W&S_TAX_HEAD_BOUNDARY", "code": "", "chartType": "table", "filter": "", "headers": [] } - ] - } - ] + ] + } + ] }, - { + { "row": 5, "name": "DSS_SERVICE", "vizArray": [ @@ -361,13 +363,14 @@ "isCollapsible": false, "label": "DSS_OVERVIEW", "charts": [ - { "id": "todaysCollection", "name": "DSS_TOTAL_COLLECTION_TODAY", "code": "", "chartType": "metric", - "filter": {"title": "TODAY"}, + "filter": { + "title": "TODAY" + }, "headers": [] }, { @@ -579,7 +582,7 @@ "isCollapsible": false, "label": "DSS_OVERVIEW", "charts": [ - { + { "id": "totalProperties", "name": "DSS_PT_TOTAL_PROPERTIES", "code": "", @@ -760,7 +763,9 @@ "name": "DSS_TOTAL_COLLECTION_TODAY", "code": "", "chartType": "metric", - "filter": {"title": "TODAY"}, + "filter": { + "title": "TODAY" + }, "headers": [] }, { @@ -1099,7 +1104,6 @@ "filter": "", "headers": [], "tabName": "Boundary" - } ] } @@ -1107,7 +1111,7 @@ } ] }, - { + { "name": "DSS_PGR_DASHBOARD", "id": "pgr", "isActive": "", @@ -1323,7 +1327,6 @@ } ] } - ] }, { @@ -1598,12 +1601,107 @@ "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": [] + } + ] + } + ] + }, + { + "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": [] + } + ] } ] } ] }, - + { "name": "DSS_PGR_DASHBOARD", "id": "ulb-pgr", @@ -1796,7 +1894,6 @@ } ] } - ] }, { @@ -1913,7 +2010,9 @@ "name": "DSS_TOTAL_COLLECTION_TODAY", "code": "", "chartType": "metric", - "filter": {"title": "TODAY"}, + "filter": { + "title": "TODAY" + }, "headers": [] }, { @@ -2298,7 +2397,9 @@ "name": "DSS_TOTAL_COLLECTION_TODAY", "code": "", "chartType": "metric", - "filter": {"title": "TODAY"}, + "filter": { + "title": "TODAY" + }, "headers": [] }, { @@ -2637,7 +2738,6 @@ "filter": "", "headers": [], "tabName": "Boundary" - } ] } @@ -2666,7 +2766,9 @@ "name": "DSS_TOTAL_COLLECTION_TODAY", "code": "", "chartType": "", - "filter": {"title": "TODAY"}, + "filter": { + "title": "TODAY" + }, "headers": [] }, { @@ -3089,7 +3191,6 @@ } ] }, - { "name": "DSS_W&S_DASHBOARD", "id": "ws", @@ -3494,7 +3595,6 @@ } ] } - ] } ] @@ -3903,7 +4003,708 @@ } ] } - + ] + } + ] + }, + { + "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": 150, + "width": 4 + }, + "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_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" + } + ] + } ] } ] From 636a75c1dd9875f369d39823878bbc72c9650374 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 9 May 2023 08:10:37 +0530 Subject: [PATCH 1186/1630] added fields in State PT Dump Report --- configs/reports/configs/pt-reports.yml | 65 ++++++++++++-------------- 1 file changed, 30 insertions(+), 35 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index e3581bbac..045a7690e 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8577,6 +8577,21 @@ ReportDefinitions: 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 @@ -8660,54 +8675,34 @@ ReportDefinitions: ( select propertyid, - split_part(string_agg(tenantid,'___'),'___',1) as tenantid, - split_part(string_agg(address,'___'),'___',1) as address, - split_part(string_agg(localityname,'___'),'___',1) as localityname, - split_part(string_agg(plotsize::text,'___'),'___',1) as plotsize, - split_part(string_agg(propertyusagetype,'___'),'___',1) as usagetype, - split_part(string_agg(createdtime::text,'___'),'___',1) as createdtime + 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 + --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.usagetype as usagetype + 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 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 where 1=1 From 6ec3ce3c1eddb2f7ac165ed812b09751f682cc8d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 29 May 2023 12:07:30 +0530 Subject: [PATCH 1187/1630] added capability for FY 2023-24 --- configs/reports/configs/pt-reports.yml | 92 +++++++++++++++++++++----- 1 file changed, 76 insertions(+), 16 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 045a7690e..b17ac4c2d 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4732,7 +4732,7 @@ ReportDefinitions: - 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' + 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 @@ -5220,6 +5220,22 @@ ReportDefinitions: 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 @@ -5247,8 +5263,10 @@ ReportDefinitions: coalesce(fy2021.amount,0) as "2021_22Collection", 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) 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) as "totalcollection" + 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 @@ -5260,6 +5278,7 @@ ReportDefinitions: 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 @@ -5560,6 +5579,22 @@ ReportDefinitions: 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 @@ -5587,8 +5622,8 @@ ReportDefinitions: 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) 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) as "totalcollection" + 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 @@ -5600,6 +5635,7 @@ ReportDefinitions: 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 @@ -6044,7 +6080,7 @@ ReportDefinitions: - 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' + 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 @@ -6548,7 +6584,17 @@ ReportDefinitions: label: reports.pt.2022_23Collection type: string source: pt - total: true + 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 @@ -6611,6 +6657,8 @@ ReportDefinitions: 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 @@ -6728,6 +6776,16 @@ ReportDefinitions: 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 @@ -6789,7 +6847,9 @@ ReportDefinitions: 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='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 @@ -7124,7 +7184,7 @@ ReportDefinitions: - name: finYear label: Financial Year type: singlevaluelist - pattern: 'list://1554057000000:2019-20,1585679400000:2020-21,1617215400000:2021-22,1648751400000:2022-23' + 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 @@ -7955,7 +8015,7 @@ ReportDefinitions: - 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' + 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,'%') @@ -8097,7 +8157,7 @@ ReportDefinitions: - 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' + 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 @@ -8264,7 +8324,7 @@ ReportDefinitions: - 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' + 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 @@ -8348,7 +8408,7 @@ ReportDefinitions: - 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' + 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 @@ -8965,7 +9025,7 @@ ReportDefinitions: - 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' + 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 @@ -9111,7 +9171,7 @@ ReportDefinitions: - 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' + 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,'%') @@ -9270,7 +9330,7 @@ ReportDefinitions: - 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' + 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,'%') From 216e81cec946d53fae11d67ad718fce04cae5ca6 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 5 Jun 2023 08:27:06 +0530 Subject: [PATCH 1188/1630] updated IFMSintegration --- 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 77ee25db7..020aac58f 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -87,7 +87,7 @@ SearchDefinitions: from egcl_paymentdetail pd inner join egcl_payment p on (p.id=pd.paymentid and pd.receiptdate>= 1680028200000 and pd.receiptdate< 1680114600000) left outer join eg_pg_transactions t on t.bill_id=pd.billid - where tenantid!='pb.testing') data + where pd.tenantid!='pb.testing') data groupBy: orderBy: searchParams: From 8d57fd31a1a089e9dfecd49ce47d83bf876e34fc Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Wed, 7 Jun 2023 10:27:09 +0530 Subject: [PATCH 1189/1630] Changed PDF ws-onetime --- .../data-config/ws-onetime-receipt.json | 45 ++------ .../format-config/ws-onetime-receipt.json | 102 +++--------------- 2 files changed, 23 insertions(+), 124 deletions(-) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index 7f3f0a02d..98bb62934 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": { @@ -377,30 +364,7 @@ "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": { @@ -428,7 +392,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": { @@ -532,6 +496,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/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index e1590e099..82bcf1437 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -228,7 +228,7 @@ "style": "receipt-table" }, { - "text": "Cheque/DD/PO/Transaction Date", + "text": "Chq/DD/PO/Txn Date", "border": [ false, false, @@ -291,49 +291,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": {} @@ -681,7 +640,7 @@ "style": "receipt-table" }, { - "text": "Cheque/DD/PO/Transaction Date", + "text": "Chq/DD/PO/Txn Date", "border": [ false, false, @@ -744,49 +703,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": {} @@ -852,6 +770,18 @@ { "style": "no-signature", "text": "{{no_signature}}" + }, + { + "image": "{{footerLogoImage}}", + "width": 75, + "height": 10, + "alignment": "center", + "margin": [ + -12, + -10, + -230, + 0 + ] } ], "styles": { From 9d6163fc43a95674f99499b953fd865ad70b8a48 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Wed, 7 Jun 2023 12:57:22 +0530 Subject: [PATCH 1190/1630] Removed NA --- .../format-config/ws-onetime-receipt.json | 50 ++----------------- 1 file changed, 4 insertions(+), 46 deletions(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 82bcf1437..97864425d 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -208,7 +208,7 @@ ], [ { - "text": "Cheque/DD/PO/Transaction No.", + "text": "Chq/DD/PO/Txn Date", "border": [ true, false, @@ -523,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": [ @@ -575,8 +533,8 @@ ], "style": "receipt-table" } - ], - [ + ], + [ { "text": "{{payer_contact}}", "border": [ @@ -620,7 +578,7 @@ ], [ { - "text": "Cheque/DD/PO/Transaction No.", + "text": "Chq/DD/PO/Txn Date", "border": [ true, false, From 3c68be2f8cac77f5585190d5c5aaf63e6cb7ff7c Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Wed, 7 Jun 2023 13:20:02 +0530 Subject: [PATCH 1191/1630] Changed CONSUMER text --- 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 98bb62934..d5309c6cd 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_NO" + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_NO_APP" }, "type": "label", "localisation": { From 27b7ffd6253325e9a5e27163b6a9c237d4c452f0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 16 Jun 2023 14:09:20 +0530 Subject: [PATCH 1192/1630] enable cash collection --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index f99653420..8e266265d 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1190,7 +1190,7 @@ ReportDefinitions: 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 + and pd.businessservice in ('WS','SW') where payment.tenantid=$tenantid orderby: ORDER BY pd.receiptdate DESC - reportName: CollectionsSummaryHeadwiseReport From 1c4259ce07f09026fd6f1d2b62acbd05ede43f7e Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Mon, 26 Jun 2023 09:08:55 +0530 Subject: [PATCH 1193/1630] Removed Logo mSeva --- .../pdf-service/data-config/ws-onetime-receipt.json | 7 +------ .../format-config/ws-onetime-receipt.json | 12 ------------ 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index d5309c6cd..9502c79b4 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -496,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 97864425d..8e957540f 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -728,18 +728,6 @@ { "style": "no-signature", "text": "{{no_signature}}" - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] } ], "styles": { From 14b6c56ec5c1b7facbe7b25ae890ea7b7d5d3928 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Mon, 26 Jun 2023 10:04:32 +0530 Subject: [PATCH 1194/1630] revert change ws watre --- .../data-config/ws-onetime-receipt.json | 44 +++++- .../format-config/ws-onetime-receipt.json | 140 +++++++++++++++++- 2 files changed, 172 insertions(+), 12 deletions(-) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index 9502c79b4..7f3f0a02d 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -124,6 +124,19 @@ "module": "rainmaker-common" } }, + { + "variable": "G8ReceiptNo", + "value": { + "path": "$.paymentDetails[0].manualReceiptNumber" + } + }, + { + "variable": "G8ReceiptDate", + "value": { + "path": "$.paymentDetails[0].manualReceiptDate" + }, + "type": "date" + }, { "variable": "paymentDate", "value": { @@ -223,7 +236,7 @@ { "variable": "consumer_id", "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_NO_APP" + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_NO" }, "type": "label", "localisation": { @@ -364,7 +377,30 @@ "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": { @@ -392,7 +428,7 @@ { "variable": "no_signature", "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE_WATER" + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" }, "type": "label", "localisation": { @@ -496,7 +532,7 @@ "prefix": null, "module": "rainmaker-common" } - } + } ] }, { diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 8e957540f..e1590e099 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -208,7 +208,7 @@ ], [ { - "text": "Chq/DD/PO/Txn Date", + "text": "Cheque/DD/PO/Transaction No.", "border": [ true, false, @@ -228,7 +228,7 @@ "style": "receipt-table" }, { - "text": "Chq/DD/PO/Txn Date", + "text": "Cheque/DD/PO/Transaction Date", "border": [ false, false, @@ -291,8 +291,49 @@ "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": {} @@ -523,6 +564,48 @@ ], "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": [ @@ -533,8 +616,8 @@ ], "style": "receipt-table" } - ], - [ + ], + [ { "text": "{{payer_contact}}", "border": [ @@ -578,7 +661,7 @@ ], [ { - "text": "Chq/DD/PO/Txn Date", + "text": "Cheque/DD/PO/Transaction No.", "border": [ true, false, @@ -598,7 +681,7 @@ "style": "receipt-table" }, { - "text": "Chq/DD/PO/Txn Date", + "text": "Cheque/DD/PO/Transaction Date", "border": [ false, false, @@ -661,8 +744,49 @@ "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 2b2763719a6c1773d8451ffc85d55b2fef3b2e3d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 28 Jun 2023 14:14:23 +0530 Subject: [PATCH 1195/1630] Receipt register WS --- configs/reports/configs/ws-reports.yml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 8e266265d..c5e4ebe4a 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -13,12 +13,7 @@ ReportDefinitions: label: reports.ws.receiptno type: string source: ws - total: false - - name: connectionno - label: reports.ws.connectionno - type: string - source: ws - total: false + total: false - name: mobileno label: reports.ws.mobileno type: string @@ -112,8 +107,7 @@ ReportDefinitions: query: | -- Use CTE to force query plan, compute & use CTE later select - receiptnumber as receiptno, - wsconnection.connectionno as connectionno, + receiptnumber as receiptno, 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, @@ -126,10 +120,9 @@ ReportDefinitions: 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_ws_connection wsconnection on wsconnection.connectionno=bill.consumercode + 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 + where payment.tenantid=$tenantid and pd.businessservice in ('WS','SW') orderby: order by pd.receiptdate desc From 388063e04b2ba41fc56cd3806ecd4f0c446eba52 Mon Sep 17 00:00:00 2001 From: Kabirmis <58412951+Kabirmis@users.noreply.github.com> Date: Fri, 30 Jun 2023 08:40:56 +0530 Subject: [PATCH 1196/1630] ReceiptRegisterSW rectified doubling of receipt --- configs/reports/configs/ws-reports.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index c5e4ebe4a..463a69e8d 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -13,7 +13,12 @@ ReportDefinitions: label: reports.ws.receiptno type: string source: ws - total: false + total: false + - name: connectionno + label: reports.ws.connectionno + type: string + source: ws + total: false - name: mobileno label: reports.ws.mobileno type: string @@ -107,7 +112,8 @@ ReportDefinitions: query: | -- Use CTE to force query plan, compute & use CTE later select - receiptnumber as receiptno, + 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, @@ -122,7 +128,7 @@ ReportDefinitions: 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') + where payment.tenantid=$tenantid and pd.businessservice in ('WS','SW') and bill.status='ACTIVE' orderby: order by pd.receiptdate desc From 7baae87694915ceb1fd2915315f2b2c62ce0bedd Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Wed, 5 Jul 2023 08:21:49 +0530 Subject: [PATCH 1197/1630] Updated WS changes --- .../data-config/ws-onetime-receipt.json | 44 +----- .../format-config/ws-onetime-receipt.json | 140 +----------------- 2 files changed, 12 insertions(+), 172 deletions(-) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index 7f3f0a02d..9502c79b4 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_NO_APP" }, "type": "label", "localisation": { @@ -377,30 +364,7 @@ "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": { @@ -428,7 +392,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": { @@ -532,7 +496,7 @@ "prefix": null, "module": "rainmaker-common" } - } + } ] }, { diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index e1590e099..8e957540f 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -208,7 +208,7 @@ ], [ { - "text": "Cheque/DD/PO/Transaction No.", + "text": "Chq/DD/PO/Txn Date", "border": [ true, false, @@ -228,7 +228,7 @@ "style": "receipt-table" }, { - "text": "Cheque/DD/PO/Transaction Date", + "text": "Chq/DD/PO/Txn Date", "border": [ false, false, @@ -291,49 +291,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": {} @@ -564,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": [ @@ -616,8 +533,8 @@ ], "style": "receipt-table" } - ], - [ + ], + [ { "text": "{{payer_contact}}", "border": [ @@ -661,7 +578,7 @@ ], [ { - "text": "Cheque/DD/PO/Transaction No.", + "text": "Chq/DD/PO/Txn Date", "border": [ true, false, @@ -681,7 +598,7 @@ "style": "receipt-table" }, { - "text": "Cheque/DD/PO/Transaction Date", + "text": "Chq/DD/PO/Txn Date", "border": [ false, false, @@ -744,49 +661,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 0768223f0332988f2a967fd43ee2018306514af5 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 6 Jul 2023 11:46:13 +0530 Subject: [PATCH 1198/1630] Update trade subtype collection --- configs/reports/configs/tl-reports.yml | 58 ++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index e90f9c524..77a037fda 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2919,3 +2919,61 @@ ReportDefinitions: 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 + 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 + 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; + + + + + + From 9c6423c13d9744404afb7a680b605fc9ee6260b7 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 17 Jul 2023 14:53:21 +0530 Subject: [PATCH 1199/1630] report added --- 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 77a037fda..8093430e6 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2962,7 +2962,7 @@ ReportDefinitions: searchClause: AND tl.applicationdate <= $toDate query: | SELECT - tradetype,count(*) as count,sum(pd.amountpaid) as collectionamount,message as tradesubtype + tradetype,count(*) as count,sum(pd.amountpaid) as collectionamount,message as tradesubtype,tl.workflowcode 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 @@ -2970,7 +2970,7 @@ ReportDefinitions: 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; + groupby: GROUP BY tradetype,message,tl.workflowcode; From d3f5b1c2c04f601a4241a0c4b244f2c1275e3b17 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 17 Jul 2023 14:56:10 +0530 Subject: [PATCH 1200/1630] Update tl-reports.yml --- configs/reports/configs/tl-reports.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 8093430e6..5d74b29d6 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2947,6 +2947,11 @@ ReportDefinitions: type: string source: tl total: false + - name: workflowcode + label: report.tl.workflowcode + type: string + source: tl + total: false searchParams: - name: fromDate label: reports.tl.fromDate @@ -2962,7 +2967,7 @@ ReportDefinitions: searchClause: AND tl.applicationdate <= $toDate query: | SELECT - tradetype,count(*) as count,sum(pd.amountpaid) as collectionamount,message as tradesubtype,tl.workflowcode + tradetype,count(*) as count,sum(pd.amountpaid) as collectionamount,message as tradesubtype,workflowcode 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 @@ -2970,7 +2975,7 @@ ReportDefinitions: 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,tl.workflowcode; + groupby: GROUP BY tradetype,message,workflowcode; From 951d101da6f96a6ac4e27b86e977f62c22280912 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 18 Jul 2023 09:43:49 +0530 Subject: [PATCH 1201/1630] tl haz --- configs/reports/configs/tl-reports.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 5d74b29d6..a1707e9d6 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2951,7 +2951,12 @@ ReportDefinitions: label: report.tl.workflowcode type: string source: tl - total: false + total: false + - name: category + label: report.tl.category + type: string + source: tl + total: false searchParams: - name: fromDate label: reports.tl.fromDate @@ -2968,6 +2973,7 @@ ReportDefinitions: 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 From 4f14e379d37aa114d5af7acaf7f048dfbbf2783a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 18 Jul 2023 09:53:18 +0530 Subject: [PATCH 1202/1630] 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 a1707e9d6..e023d98ad 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2972,7 +2972,7 @@ ReportDefinitions: searchClause: AND tl.applicationdate <= $toDate query: | SELECT - tradetype,count(*) as count,sum(pd.amountpaid) as collectionamount,message as tradesubtype,workflowcode + 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 From ae81ebedd0bba953ae4455fda16297e95a102edb Mon Sep 17 00:00:00 2001 From: Amardeep Gumber <45850454+deepgumber9996@users.noreply.github.com> Date: Thu, 27 Jul 2023 10:07:04 +0530 Subject: [PATCH 1203/1630] Update IFMS integration query --- .../egov-searcher/rainmaker-pt-gissearch.yml | 49 ++++++++++++++++--- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index 020aac58f..c3a391c6b 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -82,17 +82,52 @@ SearchDefinitions: - name: IFMSintegration query: baseQuery: | - select array_to_json(array_agg(row_to_json(data))) from ( - select receiptnumber,name,mobilenumber,amountpaid,consumer_code,businessservice,pd.tenantid - from egcl_paymentdetail pd - inner join egcl_payment p on (p.id=pd.paymentid and pd.receiptdate>= 1680028200000 and pd.receiptdate< 1680114600000) - left outer join eg_pg_transactions t on t.bill_id=pd.billid - where pd.tenantid!='pb.testing') data + 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 payment.paymentstatus != 'CANCELLED' + $where + 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: true + jsonPath: $.searchCriteria.fromDate + operator: GE + - name: pd.receiptdate + isMandatory: true + jsonPath: $.searchCriteria.toDate + operator: LE output: jsonFormat: {"ResponseInfo": {}} From 27ee90394c14bf1a24731ea001889be04c3c5756 Mon Sep 17 00:00:00 2001 From: palak-egov <86659286+palak-egov@users.noreply.github.com> Date: Tue, 1 Aug 2023 11:58:14 +0530 Subject: [PATCH 1204/1630] correct query for sw and ws locality search --- 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 33bb9d3cd..e14bc7521 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 5ea03e9c83f31437a94a4fe6ec1b430660d5333a Mon Sep 17 00:00:00 2001 From: Amardeep Gumber <45850454+deepgumber9996@users.noreply.github.com> Date: Tue, 1 Aug 2023 12:26:57 +0530 Subject: [PATCH 1205/1630] Rollback ifms intigration query --- .../egov-searcher/rainmaker-pt-gissearch.yml | 49 +++---------------- 1 file changed, 6 insertions(+), 43 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index c3a391c6b..7115c2f4d 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -82,53 +82,16 @@ SearchDefinitions: - 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 payment.paymentstatus != 'CANCELLED' - $where - 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 - + select array_to_json(array_agg(row_to_json(data))) from ( + select receiptnumber,name,mobilenumber,amountpaid,consumer_code,businessservice,pd.tenantid + from egcl_paymentdetail pd + inner join egcl_payment p on (p.id=pd.paymentid and pd.receiptdate>= 1680028200000 and pd.receiptdate< 1680114600000) + left outer join eg_pg_transactions t on t.bill_id=pd.billid ) data groupBy: orderBy: searchParams: - condition: AND - - name: pd.receiptdate - isMandatory: true - jsonPath: $.searchCriteria.fromDate - operator: GE - - name: pd.receiptdate - isMandatory: true - jsonPath: $.searchCriteria.toDate - operator: LE - + output: jsonFormat: {"ResponseInfo": {}} outJsonPath: $.data From 3ddf15e054516efac4e4371d1331a4b43fa5317c Mon Sep 17 00:00:00 2001 From: Rahul Sharma Date: Tue, 1 Aug 2023 12:55:34 +0530 Subject: [PATCH 1206/1630] updated rollback --- configs/egov-searcher/rainmaker-pt-gissearch.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index 7115c2f4d..108aef7db 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -91,6 +91,8 @@ SearchDefinitions: groupBy: orderBy: searchParams: + condition: AND + params: output: jsonFormat: {"ResponseInfo": {}} From 2180c8f17f999937364c4504f9644e3fcc233065 Mon Sep 17 00:00:00 2001 From: Rahul Sharma Date: Tue, 1 Aug 2023 13:03:19 +0530 Subject: [PATCH 1207/1630] updated syntax --- configs/egov-searcher/rainmaker-pt-gissearch.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index 108aef7db..020aac58f 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -82,18 +82,18 @@ SearchDefinitions: - name: IFMSintegration query: baseQuery: | - select array_to_json(array_agg(row_to_json(data))) from ( + select array_to_json(array_agg(row_to_json(data))) from ( select receiptnumber,name,mobilenumber,amountpaid,consumer_code,businessservice,pd.tenantid from egcl_paymentdetail pd inner join egcl_payment p on (p.id=pd.paymentid and pd.receiptdate>= 1680028200000 and pd.receiptdate< 1680114600000) - left outer join eg_pg_transactions t on t.bill_id=pd.billid ) data - + left outer join eg_pg_transactions t on t.bill_id=pd.billid + where pd.tenantid!='pb.testing') data groupBy: orderBy: searchParams: condition: AND params: - + output: jsonFormat: {"ResponseInfo": {}} outJsonPath: $.data From 56b59c8152ce77c28397f586d0ba62cd0a58ca96 Mon Sep 17 00:00:00 2001 From: palak-egov <86659286+palak-egov@users.noreply.github.com> Date: Wed, 2 Aug 2023 12:01:42 +0530 Subject: [PATCH 1208/1630] [UM-4633] --- .../RoleDashboardMappingsConf.json | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/RoleDashboardMappingsConf.json b/configs/egov-dss-dashboards/dashboard-analytics/RoleDashboardMappingsConf.json index 1fd49332d..e8aad1609 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": "Fire Noc", + "id": "noc" + }, + { + "name": "Misc Collect", + "id": "mCollect" } ] }, @@ -55,8 +63,14 @@ { "id": "ulb-home" }, - { + { "id": "ulb-ws" + }, + { + "id": "ulb-mCollect" + }, + { + "id": "ulb-noc" } ] } From 2fc5425600ab5814b1964f274410942ba8872fe9 Mon Sep 17 00:00:00 2001 From: palak-egov Date: Wed, 2 Aug 2023 14:31:05 +0530 Subject: [PATCH 1209/1630] [UM-6440] --- .../MasterDashboardConfig.json | 30 ------------------- .../RoleDashboardMappingsConf.json | 4 +++ 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index be798b005..82ff449e6 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -1572,36 +1572,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", diff --git a/configs/egov-dss-dashboards/dashboard-analytics/RoleDashboardMappingsConf.json b/configs/egov-dss-dashboards/dashboard-analytics/RoleDashboardMappingsConf.json index e8aad1609..4ef2b70c6 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/RoleDashboardMappingsConf.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/RoleDashboardMappingsConf.json @@ -38,6 +38,10 @@ { "name": "Misc Collect", "id": "mCollect" + }, + { + "name": "Finance", + "id": "finance" } ] }, From b5e4cb0f68d6957db3718c9faafef18af035f637 Mon Sep 17 00:00:00 2001 From: Amardeep Gumber <45850454+deepgumber9996@users.noreply.github.com> Date: Mon, 14 Aug 2023 09:35:42 +0530 Subject: [PATCH 1210/1630] Update IFMS integration --- .../egov-searcher/rainmaker-pt-gissearch.yml | 38 ++++++++++++++++--- 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index 020aac58f..90fa667e3 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -82,12 +82,38 @@ SearchDefinitions: - name: IFMSintegration query: baseQuery: | - select array_to_json(array_agg(row_to_json(data))) from ( - select receiptnumber,name,mobilenumber,amountpaid,consumer_code,businessservice,pd.tenantid - from egcl_paymentdetail pd - inner join egcl_payment p on (p.id=pd.paymentid and pd.receiptdate>= 1680028200000 and pd.receiptdate< 1680114600000) - left outer join eg_pg_transactions t on t.bill_id=pd.billid - where pd.tenantid!='pb.testing') data + 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 payment.paymentstatus != 'CANCELLED' and pd.receiptdate>= 1680028200000 + and pd.receiptdate< 1680114600000 + 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: From 6269f95028ba37678dfb06008f7aba0841e41542 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 14 Aug 2023 17:04:19 +0530 Subject: [PATCH 1211/1630] property list report.yml --- configs/reports/configs/pt-reports.yml | 83 ++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index b17ac4c2d..1a5328b25 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9458,5 +9458,88 @@ ReportDefinitions: 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 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 From 53d5fdcb46f3820efb5b985939f6aed3787dc8e4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 15 Aug 2023 19:02:16 +0530 Subject: [PATCH 1212/1630] added PropertyListReport as dump report --- configs/reports/configs/pt-reports.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 1a5328b25..2843ba494 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9532,14 +9532,10 @@ ReportDefinitions: total: false searchParams: 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') + 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 From 2bf75540360454141b3d7a6c2427f528459e2d66 Mon Sep 17 00:00:00 2001 From: Kabirmis <58412951+Kabirmis@users.noreply.github.com> Date: Fri, 18 Aug 2023 09:43:18 +0530 Subject: [PATCH 1213/1630] PropertyListReport search parameters --- configs/reports/configs/pt-reports.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 2843ba494..173024370 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9531,6 +9531,27 @@ ReportDefinitions: source: pt total: false 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 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: | select *,plotsize as landarea,propertyusagetype as usagecategory,mobilenumber as mobileno from report_properties p From 5b515ea7264edb4b0704c3c2592a9a26e5edddff Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 22 Aug 2023 11:35:31 +0530 Subject: [PATCH 1214/1630] locality search in PropertyListReport --- configs/reports/configs/pt-reports.yml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 173024370..fd9e52103 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9531,27 +9531,12 @@ ReportDefinitions: source: pt total: false 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 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) + searchClause: AND localitycode IN ($localityArray) query: | select *,plotsize as landarea,propertyusagetype as usagecategory,mobilenumber as mobileno from report_properties p From bb529625989ec0ec85ce67274f166d858caf9042 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 25 Aug 2023 10:17:01 +0530 Subject: [PATCH 1215/1630] property list report propertystatus filteration --- configs/reports/configs/pt-reports.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index fd9e52103..39c24553e 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9536,12 +9536,19 @@ ReportDefinitions: type: boundarylist source: pt isMandatory: false - searchClause: AND localitycode IN ($localityArray) + searchClause: AND localitycode IN ($localityArray) + - name: pstatus + label: property status + type: singlevaluelist + pattern: 'list://ACTIVE:ACTIVE,INWORKFLOW:INWORKFLOW,INACTIVE:INACTIVE' + source: pt + isMandatory: false + searchClause: and 1=1 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' + where p.tenantid=$tenantid and propertystatus=$pstatus orderby: ORDER BY p.propertyid From 64ae08681ab2e572ea73865c5384193a4b1749c2 Mon Sep 17 00:00:00 2001 From: Amardeep Gumber <45850454+deepgumber9996@users.noreply.github.com> Date: Tue, 29 Aug 2023 12:06:56 +0530 Subject: [PATCH 1216/1630] Update rainmaker-pt-gissearch.yml --- configs/egov-searcher/rainmaker-pt-gissearch.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index 90fa667e3..a8ea6638e 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -94,8 +94,7 @@ SearchDefinitions: 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 payment.paymentstatus != 'CANCELLED' and pd.receiptdate>= 1680028200000 - and pd.receiptdate< 1680114600000 + WHERE payment.paymentstatus != 'CANCELLED' $where GROUP BY pd.receiptnumber,pd.businessservice,pd.amountpaid,pd.tenantid, payment.paymentmode,t.mobile_number,payment.transactionnumber, bill.consumercode,payment.paidby,bad.taxheadcode @@ -119,6 +118,14 @@ SearchDefinitions: 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": {}} From b1b26c233ec817f206a66a7ed43e70d2a91ed183 Mon Sep 17 00:00:00 2001 From: Amardeep Gumber <45850454+deepgumber9996@users.noreply.github.com> Date: Tue, 29 Aug 2023 14:21:13 +0530 Subject: [PATCH 1217/1630] ifms integration --- 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 a8ea6638e..fa9bf952f 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -94,7 +94,7 @@ SearchDefinitions: 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 payment.paymentstatus != 'CANCELLED' $where + $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 From 7c0b366ca021898db50c6854b0e07db6173c4ef3 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 13 Sep 2023 11:34:11 +0530 Subject: [PATCH 1218/1630] included NEFT RTGS in DAilyCollectionReport --- 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 39c24553e..02e0d7032 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7293,7 +7293,7 @@ ReportDefinitions: 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') + and receipt_breakup.pdid=pd.id and paymentmode not in ('CHEQUE') groupby: group by instrumenttype,substring(instrumentnumber,0,position ('/' in instrumentnumber)) From d5421df5041ae4a37b5e28c8c0f75f9dcf5e635e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 15 Sep 2023 11:12:14 +0530 Subject: [PATCH 1219/1630] added OFFLINE_NEFT,OFFLINE_RTGS in DailyChequeDetail 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 02e0d7032..5606ad926 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -7415,7 +7415,7 @@ ReportDefinitions: 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') + and receipt_breakup.pdid=pd.id and payment.paymentmode in ('CHEQUE','CARD','DD','OFFLINE_NEFT','OFFLINE_RTGS') orderby: ORDER BY pd.receiptdate DESC; From 463269ed8c8bab13e9dfb02966dbe12127845d6c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 15 Sep 2023 16:55:23 +0530 Subject: [PATCH 1220/1630] added AccountCodeReport as per Accouting manual --- configs/reports/configs/pt-reports.yml | 93 ++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 5606ad926..8545eb7a8 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9550,5 +9550,98 @@ ReportDefinitions: inner join report_owners o on o.propertyid=p.propertyid where p.tenantid=$tenantid and propertystatus=$pstatus orderby: ORDER BY p.propertyid + +- reportName: AccountCodeReport + summary: PT AccountCode Report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: receiptdate + label: reports.pt.receiptdate + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptnumber + type: string + source: pt + total: false + - name: propertyid + label: reports.pt.propertyid + type: string + source: pt + total: false + - name: paymentmode + label: reports.pt.paymentmode + type: string + source: pt + total: false + - name: payername + label: reports.pt.payername + type: string + source: pt + total: false + - name: cheque_txn_number + label: reports.pt.cheque_txn_number + type: string + source: pt + total: false + - name: chequedate + label: reports.pt.chequedate + type: string + source: pt + total: false + - name: amoutpaid + label: reports.pt.amoutpaid + type: string + source: pt + total: true + - name: cash + label: reports.pt.guardianname + type: string + source: pt + total: true + - name: cdheque + label: reports.pt.cheque + type: string + source: pt + total: true + - name: online + label: reports.pt.online + 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: | + SELECT + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as receiptdate, + pd.receiptnumber, + b.consumercode as propertyid, + payment.paymentmode, + payment.payername, + payment.instrumentnumber as cheque_txn_number, + payment.instrumentdate as chequedate, + split_part(b.tenantid,'.',2) as ulb, + payment.totalamountpaid as amoutpaid, + (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='ONLINE' then payment.totalamountpaid else 0 end) as online + FROM egcl_bill as b + INNER JOIN egcl_paymentdetail as pd on pd.billid = b.id + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE b.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + orderby: ORDER BY pd.receiptdate From 2b029f0092a8c4b032aac29b85e4078de57e9c73 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 12 Oct 2023 10:42:42 +0530 Subject: [PATCH 1221/1630] updated PAID property report to filter with ownership category also --- 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 8545eb7a8..690d1fc81 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9011,7 +9011,7 @@ ReportDefinitions: total: false searchParams: - name: category - label: reports.pt.usagecategory + label: reports.pt.usageownercategory type: string source: pt isMandatory: true @@ -9033,7 +9033,7 @@ 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 properties as ( - select distinct propertyid as propertyid from eg_pt_unit where tenantid=$tenantid and usagecategory LIKE CONCAT('%',upper($category),'%') --like '%EDUCATION%' + 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 ( From e7c0ee15d13bb548bab48bf7bade60039887a01a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 12 Oct 2023 11:07:28 +0530 Subject: [PATCH 1222/1630] view paid properties by ownership category and FY --- configs/reports/configs/pt-reports.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 690d1fc81..06290d7f0 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9031,17 +9031,13 @@ ReportDefinitions: 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 + with 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' + where tenantid=$tenantid and propertyid in (select pt_uuid from report_properties where tenantid='pb.patiala' and ownershipcategory LIKE CONCAT('%',upper($category),'%')) and status='ACTIVE' group by propertyid ), assessments as @@ -9066,13 +9062,13 @@ ReportDefinitions: bndry.blockname as blockname, eg_user.name as ownername, eg_user.mobilenumber as mobileno, - $category as unitcategory, + --$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 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 From ee9d626e52913f365f7aef67059b212969ec58cb Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 16 Oct 2023 11:21:42 +0530 Subject: [PATCH 1223/1630] added property search report by ownership category --- configs/reports/configs/pt-reports.yml | 167 ++++++++++++++++++++++++- 1 file changed, 166 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 06290d7f0..f3b377809 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -8912,8 +8912,173 @@ ReportDefinitions: 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.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),'%') + - 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),'%') --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: PAID_PROPERTY_OWNERSHIP_REPORT_V2 decryptionPathId: ULBPTDataDumpReport_V2 summary: ULB level report version: 1.0.0 From 4b30e249aa53935a3244e44207641320bea3b413 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Thu, 2 Nov 2023 09:41:54 +0530 Subject: [PATCH 1224/1630] estimation charge report in prod v2 --- configs/reports/configs/ws-reports.yml | 229 +++++++++++++++++++++++++ 1 file changed, 229 insertions(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 463a69e8d..586506432 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1613,3 +1613,232 @@ ReportDefinitions: 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 + sourceColumns: + - name: receiptnumber + label: reports.ws.receiptNo + type: string + source: ws + total: false + - name: receiptdate + label: reports.ws.receiptDate + type: string + source: ws + total: false + - name: g8issuedate + label: reports.ws.g8issuedate + type: string + source: ws + total: false + - name: g8receiptno + label: reports.ws.g8receiptno + type: string + source: ws + total: false + - name: amount + label: reports.ws.amount + type: string + source: ws + total: true + - name: consumercode + label: reports.ws.consumercode + type: string + source: ws + total: true + - 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: pendingamount + label: reports.ws.pendingamount + type: string + source: ws + total: true + - name: tenantid + label: reports.ws.tenantid + type: string + source: ws + total: false + - name: instrumenttype + label: reports.ws.paymentMode + type: string + source: ws + total: false + - name: transactionnumber + label: reports.ws.ddChequeTransactionNo + type: string + source: ws + total: false + - name: transactiondate + label: reports.ws.ddChequeTransactionDate + type: string + source: ws + total: false + - name: bankname + label: reports.ws.bankName + type: string + source: ws + total: false + - name: collectorname + label: reports.ws.collectorname + type: string + source: ws + total: false + - name: financialyear + label: reports.ws.financialyear + type: string + source: ws + total: false + searchParams: + - name: fromDate + label: reports.ws.fromDate + type: epoch + source: ws + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.ws.toDate + type: epoch + source: ws + 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: ws + 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: ws + 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 '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.tenantid AS tenantid, + 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 From 945ed0086842df6dfd5f6f08c14ed64bbc172e4b Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Thu, 2 Nov 2023 10:13:28 +0530 Subject: [PATCH 1225/1630] removal of extra search param in w report --- configs/reports/configs/ws-reports.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 586506432..49b735df0 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1766,24 +1766,6 @@ ReportDefinitions: source: ws 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: ws - 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: ws - isMandatory: false - searchClause: AND payment.paymentmode = $paymentMode query: > -- Use CTE to force query plan, compute & use CTE later From 4801eb44bf0fea4057de601067d013ea2a60e896 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Thu, 2 Nov 2023 14:58:35 +0530 Subject: [PATCH 1226/1630] change in estimation report --- configs/reports/configs/ws-reports.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 49b735df0..a133a4d20 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1758,13 +1758,13 @@ ReportDefinitions: label: reports.ws.fromDate type: epoch source: ws - isMandatory: true + isMandatory: false searchClause: AND pd.receiptdate >= $fromDate - name: toDate label: reports.ws.toDate type: epoch source: ws - isMandatory: true + isMandatory: false searchClause: AND pd.receiptdate <= $toDate query: > -- Use CTE to force query plan, compute & use CTE later @@ -1792,7 +1792,7 @@ query: > 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 + -- AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate GROUP BY pdid ) From a43b56fe6d07d9d5eaf5f825d161a1c6583fe5d4 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Thu, 2 Nov 2023 15:14:04 +0530 Subject: [PATCH 1227/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index a133a4d20..61327634d 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1755,13 +1755,13 @@ ReportDefinitions: total: false searchParams: - name: fromDate - label: reports.ws.fromDate + label: reports.pt.fromDate type: epoch source: ws isMandatory: false searchClause: AND pd.receiptdate >= $fromDate - name: toDate - label: reports.ws.toDate + label: reports.pt.toDate type: epoch source: ws isMandatory: false From 3363272dae187071780f9d54a76b0c6c0ce0c265 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Thu, 2 Nov 2023 15:48:23 +0530 Subject: [PATCH 1228/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 264 +++++++++---------------- 1 file changed, 91 insertions(+), 173 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 61327634d..964d80170 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1614,213 +1614,131 @@ ReportDefinitions: 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 + summary: estimation charge version: 1.0.0 moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" sourceColumns: - - name: receiptnumber - label: reports.ws.receiptNo + - name: receiptno + label: reports.ws.receiptno type: string source: ws total: false - - name: receiptdate - label: reports.ws.receiptDate + - name: connectionno + label: reports.ws.connectionno type: string source: ws - total: false - - name: g8issuedate - label: reports.ws.g8issuedate + total: false + - name: mobileno + label: reports.ws.mobileno type: string source: ws - total: false - - name: g8receiptno - label: reports.ws.g8receiptno + total: false + - name: receiptdate1 + label: reports.ws.receiptdate type: string source: ws total: false - - name: amount - label: reports.ws.amount - type: string - source: ws - total: true - - name: consumercode - label: reports.ws.consumercode - type: string - source: ws - total: true - - 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 + - name: service + label: reports.ws.serive type: string source: ws total: false - - name: ws_time_interest - label: reports.ws.ws_time_interest + - name: billnumber + label: reports.ws.billnumber type: string source: ws total: false - - name: ws_time_penalty - label: reports.ws.ws_time_penalty + - name: billdate1 + label: reports.ws.billdate type: string source: ws total: false - - name: user_charge - label: reports.ws.user_charge + - name: paidby + label: reports.ws.paidby type: string source: ws total: false - - name: pendingamount - label: reports.ws.pendingamount + - name: amountpaid + label: reports.ws.amountpaid type: string source: ws total: true - - name: tenantid - label: reports.ws.tenantid - type: string - source: ws - total: false - - name: instrumenttype - label: reports.ws.paymentMode - type: string - source: ws - total: false - - name: transactionnumber - label: reports.ws.ddChequeTransactionNo - type: string - source: ws - total: false - - name: transactiondate - label: reports.ws.ddChequeTransactionDate - type: string - source: ws - total: false - - name: bankname - label: reports.ws.bankName + - name: paymentmode + label: reports.ws.paymentmode type: string source: ws total: false - - name: collectorname - label: reports.ws.collectorname + - name: paymentstatus + label: reports.ws.paymentstatus type: string source: ws total: false - - name: financialyear - label: reports.ws.financialyear + - name: ownername1 + label: reports.ws.ownername1 type: string source: ws - total: false + total: false searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: ws - isMandatory: false - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: ws - isMandatory: false - 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 '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.tenantid AS tenantid, - 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 + - 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 From c176f734af278fbb8025163825039322324ade2b Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:44:54 +0530 Subject: [PATCH 1229/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 1714 ++++++++++++++++++++++++ 1 file changed, 1714 insertions(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 964d80170..f666e7018 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1621,6 +1621,17 @@ ReportDefinitions: print: pdfPageSize: "A1" sourceColumns: +--- +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 @@ -1742,3 +1753,1706 @@ ReportDefinitions: 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: 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 + 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 From 0bd18b9a47bb35f320c73a2f1053015e11e4b5f8 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Fri, 3 Nov 2023 09:29:30 +0530 Subject: [PATCH 1230/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 240 +++++++++++++------------ 1 file changed, 125 insertions(+), 115 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index f666e7018..669a7fadf 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3245,121 +3245,131 @@ ReportDefinitions: 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: 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 +- 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 From 3a314d4e19722c05e1ddf90411fb7d97cb38f938 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Mon, 6 Nov 2023 10:20:42 +0530 Subject: [PATCH 1231/1630] removal of extra code --- configs/reports/configs/ws-reports.yml | 1624 ------------------------ 1 file changed, 1624 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 669a7fadf..32300b87d 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1613,1630 +1613,6 @@ ReportDefinitions: 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: ---- -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 From 1b5069bf3ec4f6e1f1f014f251107499c39b047e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 6 Nov 2023 10:51:03 +0530 Subject: [PATCH 1232/1630] correction estimation_charge report --- configs/reports/configs/ws-reports.yml | 251 +++++++++++++------------ 1 file changed, 126 insertions(+), 125 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 32300b87d..ef7dc3188 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1613,6 +1613,7 @@ ReportDefinitions: 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 @@ -1621,131 +1622,131 @@ ReportDefinitions: 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 + - 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 From 7aa0c60272f7ddbccdfa38c02e6033a3c082c9b2 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 6 Nov 2023 10:59:07 +0530 Subject: [PATCH 1233/1630] search parameters estimation_charge report --- configs/reports/configs/ws-reports.yml | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index ef7dc3188..207ac6d66 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1766,27 +1766,7 @@ ReportDefinitions: 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 + searchClause: AND pd.businessservice like $serviceType query: | -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( @@ -1812,7 +1792,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='WS.ONE_TIME_FEE' - -- AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate + AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate GROUP BY pdid ) From d32b4f93a0fd414281de679dd63fa0f821cc96b5 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Mon, 6 Nov 2023 14:54:28 +0530 Subject: [PATCH 1234/1630] addition of usage category wise data --- configs/reports/configs/ws-reports.yml | 45 ++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 207ac6d66..22377ddb6 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1823,3 +1823,48 @@ ReportDefinitions: 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 + +- reportName: usageWiseReport + summary: Usage Wise Report + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: no_of_applications + label: reports.ws.no_of_applications + type: string + source: ws + total: false + - name: catergory + label: reports.ws.catergory + type: string + source: ws + total: false + - name: water_status + label: reports.ws.water_status + 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 + query: | + select count(*) as no_of_applications, pt.usagecategory as catergory, + ws.status as water_status from eg_ws_connection ws, eg_pt_property pt where ws.property_id=pt.propertyid + and ws.createdtime>=$fromDate + and ws.createdtime<=$toDate + and ws.tenantid=$tenantid + groupby: group by pt.usagecategory, ws.status + From 97c9224471968814f8bedde4c9064276cb14824f Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Tue, 7 Nov 2023 09:09:54 +0530 Subject: [PATCH 1235/1630] change in from to date for usageType report --- configs/reports/configs/ws-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 22377ddb6..74ee9f80c 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1853,13 +1853,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate + searchClause: AND ws.createdtime>= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND pd.receiptdate <= $toDate + searchClause: AND ws.createdtime<= $toDate query: | select count(*) as no_of_applications, pt.usagecategory as catergory, ws.status as water_status from eg_ws_connection ws, eg_pt_property pt where ws.property_id=pt.propertyid From 4f455dd805cb39b917e387a9dcd099b74a1f9785 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Tue, 7 Nov 2023 09:19:51 +0530 Subject: [PATCH 1236/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 74ee9f80c..198786c73 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1836,7 +1836,7 @@ ReportDefinitions: label: reports.ws.no_of_applications type: string source: ws - total: false + total: true - name: catergory label: reports.ws.catergory type: string From 961c769710d680398f85715fcd8f66bd7a259499 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Fri, 10 Nov 2023 16:06:14 +0530 Subject: [PATCH 1237/1630] added generated demand report --- configs/reports/configs/ws-reports.yml | 79 +++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 198786c73..54ab8054a 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1867,4 +1867,81 @@ ReportDefinitions: and ws.createdtime<=$toDate and ws.tenantid=$tenantid groupby: group by pt.usagecategory, ws.status - + +- reportName: GeneratedDemandReport + summary: Generated Demand Report + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: quarter + label: reports.ws.quarter + type: string + source: ws + total: true + - name: tax_period_from_date + label: reports.ws.tax_period_from_date + type: string + source: ws + total: false + - name: total_demand_amount + label: reports.ws.total_demand_amount + type: string + source: ws + total: false + - name: total_collected_amount + label: reports.ws.total_collected_amount + type: string + source: ws + total: false + - name: distinct_consumercode_count + label: reports.ws.distinct_consumercode_count + type: string + source: ws + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND ws.createdtime>= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND ws.createdtime<= $toDate +query: | + WITH quarterly_data AS ( + SELECT + d1.taxperiodfrom, + d1.taxperiodto, + d1.consumertype, + COUNT(DISTINCT d1.consumercode) AS distinct_consumercode_count, + SUM(d2.taxamount) AS total_demand_amount, + SUM(d2.collectionamount) AS total_collected_amount + FROM egbs_demand_v1 d1 + LEFT JOIN egbs_demanddetail_v1 AS d2 ON d1.id = d2.demandid + LEFT JOIN eg_ws_connection AS d4 ON d4.connectionno = d1.consumercode + WHERE d1.businessservice = 'WS' + AND d1.tenantid = $tenantid + AND d1.taxperiodfrom = $fromdate + GROUP BY d1.taxperiodfrom, d1.taxperiodto, d1.consumertype + ) + SELECT + to_char(to_timestamp(qd.taxperiodfrom/1000), 'YYYY') || '->' || + CASE + WHEN EXTRACT(MONTH FROM to_timestamp(qd.taxperiodfrom/1000)) = 04 THEN 'Quarter 1' + WHEN EXTRACT(MONTH FROM to_timestamp(qd.taxperiodfrom/1000)) = 07 THEN 'Quarter 2' + WHEN EXTRACT(MONTH FROM to_timestamp(qd.taxperiodfrom/1000)) = 10 THEN 'Quarter 3' + WHEN EXTRACT(MONTH FROM to_timestamp(qd.taxperiodfrom/1000)) = 01 THEN 'Quarter 4' + END AS quarter, + to_char(to_timestamp(qd.taxperiodfrom/1000), 'YYYY-MM-DD') AS tax_period_from_date, + COALESCE(CAST(qd.total_demand_amount AS TEXT), 'No Tax amount') AS total_demand_amount, + COALESCE(CAST(qd.total_collected_amount AS TEXT), 'No Collection Amount') AS total_collected_amount, + COALESCE(CAST(qd.distinct_consumercode_count AS TEXT), '0') AS distinct_consumercode_count + FROM quarterly_data qd +orderby: ORDER BY qd.taxperiodfrom; From 3897313566c7059e985052e3d64a9d27e54a116c Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Wed, 15 Nov 2023 09:39:21 +0530 Subject: [PATCH 1238/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 54ab8054a..e0a2d30d4 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1914,7 +1914,7 @@ ReportDefinitions: source: pt isMandatory: true searchClause: AND ws.createdtime<= $toDate -query: | + query: | WITH quarterly_data AS ( SELECT d1.taxperiodfrom, @@ -1944,4 +1944,4 @@ query: | COALESCE(CAST(qd.total_collected_amount AS TEXT), 'No Collection Amount') AS total_collected_amount, COALESCE(CAST(qd.distinct_consumercode_count AS TEXT), '0') AS distinct_consumercode_count FROM quarterly_data qd -orderby: ORDER BY qd.taxperiodfrom; + orderby: ORDER BY qd.taxperiodfrom; From 5a90d44b8600ba0780bd5326cb4cf8f67aab5a9c Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Wed, 15 Nov 2023 14:33:14 +0530 Subject: [PATCH 1239/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index e0a2d30d4..da0f4d1d0 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1928,7 +1928,7 @@ ReportDefinitions: LEFT JOIN eg_ws_connection AS d4 ON d4.connectionno = d1.consumercode WHERE d1.businessservice = 'WS' AND d1.tenantid = $tenantid - AND d1.taxperiodfrom = $fromdate + AND d1.taxperiodfrom = $fromDate GROUP BY d1.taxperiodfrom, d1.taxperiodto, d1.consumertype ) SELECT From 99dda97c7a6f50a3647be7f1cd44db247bfcd652 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Wed, 15 Nov 2023 15:01:31 +0530 Subject: [PATCH 1240/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index da0f4d1d0..c18ef048c 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1907,13 +1907,14 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND ws.createdtime>= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch + searchClause: AND d1.taxperiodfrom>= $fromDate + - name: serviceType + label: serviceType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' source: pt isMandatory: true - searchClause: AND ws.createdtime<= $toDate + searchClause: AND d1.businessservice like $serviceType query: | WITH quarterly_data AS ( SELECT @@ -1926,7 +1927,7 @@ ReportDefinitions: FROM egbs_demand_v1 d1 LEFT JOIN egbs_demanddetail_v1 AS d2 ON d1.id = d2.demandid LEFT JOIN eg_ws_connection AS d4 ON d4.connectionno = d1.consumercode - WHERE d1.businessservice = 'WS' + WHERE d1.businessservice = $serviceType AND d1.tenantid = $tenantid AND d1.taxperiodfrom = $fromDate GROUP BY d1.taxperiodfrom, d1.taxperiodto, d1.consumertype From bd93aa03c67229064baca3f0650399ee20825e5d Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Wed, 15 Nov 2023 15:11:33 +0530 Subject: [PATCH 1241/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index c18ef048c..8dea9448d 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1945,4 +1945,4 @@ ReportDefinitions: COALESCE(CAST(qd.total_collected_amount AS TEXT), 'No Collection Amount') AS total_collected_amount, COALESCE(CAST(qd.distinct_consumercode_count AS TEXT), '0') AS distinct_consumercode_count FROM quarterly_data qd - orderby: ORDER BY qd.taxperiodfrom; + orderby: ORDER BY qd.taxperiodfrom; From 2ea0391a0b77f8ee1988af6c84a7d695a93164b6 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Wed, 15 Nov 2023 16:56:54 +0530 Subject: [PATCH 1242/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 60 +++++++++++++------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 8dea9448d..35813501a 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1916,33 +1916,33 @@ ReportDefinitions: isMandatory: true searchClause: AND d1.businessservice like $serviceType query: | - WITH quarterly_data AS ( - SELECT - d1.taxperiodfrom, - d1.taxperiodto, - d1.consumertype, - COUNT(DISTINCT d1.consumercode) AS distinct_consumercode_count, - SUM(d2.taxamount) AS total_demand_amount, - SUM(d2.collectionamount) AS total_collected_amount - FROM egbs_demand_v1 d1 - LEFT JOIN egbs_demanddetail_v1 AS d2 ON d1.id = d2.demandid - LEFT JOIN eg_ws_connection AS d4 ON d4.connectionno = d1.consumercode - WHERE d1.businessservice = $serviceType - AND d1.tenantid = $tenantid - AND d1.taxperiodfrom = $fromDate - GROUP BY d1.taxperiodfrom, d1.taxperiodto, d1.consumertype - ) - SELECT - to_char(to_timestamp(qd.taxperiodfrom/1000), 'YYYY') || '->' || - CASE - WHEN EXTRACT(MONTH FROM to_timestamp(qd.taxperiodfrom/1000)) = 04 THEN 'Quarter 1' - WHEN EXTRACT(MONTH FROM to_timestamp(qd.taxperiodfrom/1000)) = 07 THEN 'Quarter 2' - WHEN EXTRACT(MONTH FROM to_timestamp(qd.taxperiodfrom/1000)) = 10 THEN 'Quarter 3' - WHEN EXTRACT(MONTH FROM to_timestamp(qd.taxperiodfrom/1000)) = 01 THEN 'Quarter 4' - END AS quarter, - to_char(to_timestamp(qd.taxperiodfrom/1000), 'YYYY-MM-DD') AS tax_period_from_date, - COALESCE(CAST(qd.total_demand_amount AS TEXT), 'No Tax amount') AS total_demand_amount, - COALESCE(CAST(qd.total_collected_amount AS TEXT), 'No Collection Amount') AS total_collected_amount, - COALESCE(CAST(qd.distinct_consumercode_count AS TEXT), '0') AS distinct_consumercode_count - FROM quarterly_data qd - orderby: ORDER BY qd.taxperiodfrom; + WITH quarterly_data AS ( + SELECT + d1.taxperiodfrom, + d1.taxperiodto, + d1.consumertype, + COUNT(DISTINCT d1.consumercode) AS distinct_consumercode_count, + SUM(d2.taxamount) AS total_demand_amount, + SUM(d2.collectionamount) AS total_collected_amount + FROM egbs_demand_v1 d1 + LEFT JOIN egbs_demanddetail_v1 AS d2 ON d1.id = d2.demandid + LEFT JOIN eg_ws_connection AS d4 ON d4.connectionno = d1.consumercode + WHERE d1.businessservice = $serviceType + AND d1.tenantid = $tenantid + AND d1.taxperiodfrom = $fromDate + GROUP BY d1.taxperiodfrom, d1.taxperiodto, d1.consumertype + ) + SELECT + to_char(to_timestamp(qd.taxperiodfrom/1000), 'YYYY') || '->' || + CASE + WHEN EXTRACT(MONTH FROM to_timestamp(qd.taxperiodfrom/1000)) = 04 THEN 'Quarter 1' + WHEN EXTRACT(MONTH FROM to_timestamp(qd.taxperiodfrom/1000)) = 07 THEN 'Quarter 2' + WHEN EXTRACT(MONTH FROM to_timestamp(qd.taxperiodfrom/1000)) = 10 THEN 'Quarter 3' + WHEN EXTRACT(MONTH FROM to_timestamp(qd.taxperiodfrom/1000)) = 01 THEN 'Quarter 4' + END AS quarter, + to_char(to_timestamp(qd.taxperiodfrom/1000), 'YYYY-MM-DD') AS tax_period_from_date, + COALESCE(CAST(qd.total_demand_amount AS TEXT), 'No Tax amount') AS total_demand_amount, + COALESCE(CAST(qd.total_collected_amount AS TEXT), 'No Collection Amount') AS total_collected_amount, + COALESCE(CAST(qd.distinct_consumercode_count AS TEXT), '0') AS distinct_consumercode_count + FROM quarterly_data qd + orderby: ORDER BY qd.taxperiodfrom; From f6aae3df1f788841be55ce6595fd8aba35c238b2 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Fri, 17 Nov 2023 09:04:39 +0530 Subject: [PATCH 1243/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 35813501a..07254b479 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1944,5 +1944,5 @@ ReportDefinitions: COALESCE(CAST(qd.total_demand_amount AS TEXT), 'No Tax amount') AS total_demand_amount, COALESCE(CAST(qd.total_collected_amount AS TEXT), 'No Collection Amount') AS total_collected_amount, COALESCE(CAST(qd.distinct_consumercode_count AS TEXT), '0') AS distinct_consumercode_count - FROM quarterly_data qd + FROM quarterly_data qd where 1=1 orderby: ORDER BY qd.taxperiodfrom; From 089eb74d13477bfbf7bdd1050df53f21ab5993fe Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Fri, 17 Nov 2023 10:24:20 +0530 Subject: [PATCH 1244/1630] change in query or generated demand report --- configs/reports/configs/ws-reports.yml | 55 ++++++++++++++------------ 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 07254b479..99c0d05ea 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1918,31 +1918,36 @@ ReportDefinitions: query: | WITH quarterly_data AS ( SELECT - d1.taxperiodfrom, - d1.taxperiodto, - d1.consumertype, + EXTRACT(YEAR FROM to_timestamp(d1.taxperiodfrom / 1000)) AS year, + CASE + WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) = 04 THEN 'Quarter 1' + WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) = 07 THEN 'Quarter 2' + WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) = 10 THEN 'Quarter 3' + WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) = 01 THEN 'Quarter 4' + END AS quarter, + to_char(to_timestamp(d1.taxperiodfrom / 1000), 'YYYY-MM-DD') AS tax_period_from_date, COUNT(DISTINCT d1.consumercode) AS distinct_consumercode_count, SUM(d2.taxamount) AS total_demand_amount, SUM(d2.collectionamount) AS total_collected_amount - FROM egbs_demand_v1 d1 - LEFT JOIN egbs_demanddetail_v1 AS d2 ON d1.id = d2.demandid - LEFT JOIN eg_ws_connection AS d4 ON d4.connectionno = d1.consumercode - WHERE d1.businessservice = $serviceType - AND d1.tenantid = $tenantid - AND d1.taxperiodfrom = $fromDate - GROUP BY d1.taxperiodfrom, d1.taxperiodto, d1.consumertype - ) - SELECT - to_char(to_timestamp(qd.taxperiodfrom/1000), 'YYYY') || '->' || - CASE - WHEN EXTRACT(MONTH FROM to_timestamp(qd.taxperiodfrom/1000)) = 04 THEN 'Quarter 1' - WHEN EXTRACT(MONTH FROM to_timestamp(qd.taxperiodfrom/1000)) = 07 THEN 'Quarter 2' - WHEN EXTRACT(MONTH FROM to_timestamp(qd.taxperiodfrom/1000)) = 10 THEN 'Quarter 3' - WHEN EXTRACT(MONTH FROM to_timestamp(qd.taxperiodfrom/1000)) = 01 THEN 'Quarter 4' - END AS quarter, - to_char(to_timestamp(qd.taxperiodfrom/1000), 'YYYY-MM-DD') AS tax_period_from_date, - COALESCE(CAST(qd.total_demand_amount AS TEXT), 'No Tax amount') AS total_demand_amount, - COALESCE(CAST(qd.total_collected_amount AS TEXT), 'No Collection Amount') AS total_collected_amount, - COALESCE(CAST(qd.distinct_consumercode_count AS TEXT), '0') AS distinct_consumercode_count - FROM quarterly_data qd where 1=1 - orderby: ORDER BY qd.taxperiodfrom; + FROM + egbs_demand_v1 d1 + LEFT JOIN egbs_demanddetail_v1 d2 ON d1.id = d2.demandid + LEFT JOIN eg_ws_connection d4 ON d4.connectionno = d1.consumercode + WHERE + d1.tenantid = $tenantid + AND d1.businessservice = $serviceType + AND d1.taxperiodfrom >= fromDate + GROUP BY + year, quarter, tax_period_from_date + ) + + SELECT + year || '->' || quarter AS quarter, + tax_period_from_date, + COALESCE(CAST(total_demand_amount AS TEXT), 'No Tax amount') AS total_demand_amount, + COALESCE(CAST(total_collected_amount AS TEXT), 'No Collection Amount') AS total_collected_amount, + COALESCE(CAST(distinct_consumercode_count AS TEXT), '0') AS distinct_consumercode_count + FROM + quarterly_data + + From a8d0951e24113928d3ffb4d64dfd579ad5309a7f Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Fri, 17 Nov 2023 10:42:55 +0530 Subject: [PATCH 1245/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 99c0d05ea..ab8e58e38 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1939,15 +1939,15 @@ ReportDefinitions: AND d1.taxperiodfrom >= fromDate GROUP BY year, quarter, tax_period_from_date - ) + ) - SELECT - year || '->' || quarter AS quarter, - tax_period_from_date, - COALESCE(CAST(total_demand_amount AS TEXT), 'No Tax amount') AS total_demand_amount, - COALESCE(CAST(total_collected_amount AS TEXT), 'No Collection Amount') AS total_collected_amount, - COALESCE(CAST(distinct_consumercode_count AS TEXT), '0') AS distinct_consumercode_count - FROM + SELECT + year || '->' || quarter AS quarter, + tax_period_from_date, + COALESCE(CAST(total_demand_amount AS TEXT), 'No Tax amount') AS total_demand_amount, + COALESCE(CAST(total_collected_amount AS TEXT), 'No Collection Amount') AS total_collected_amount, + COALESCE(CAST(distinct_consumercode_count AS TEXT), '0') AS distinct_consumercode_count + FROM quarterly_data From b4df51930aa76e9c349b5d11c366d7a0912e02a6 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Fri, 17 Nov 2023 11:32:27 +0530 Subject: [PATCH 1246/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index ab8e58e38..c108719b0 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1907,14 +1907,14 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND d1.taxperiodfrom>= $fromDate + searchClause: and 1=1 - name: serviceType label: serviceType type: singlevaluelist pattern: 'list://WS%:Water,SW%:Sewerage' source: pt isMandatory: true - searchClause: AND d1.businessservice like $serviceType + searchClause: AND 1=1 query: | WITH quarterly_data AS ( SELECT @@ -1933,10 +1933,9 @@ ReportDefinitions: egbs_demand_v1 d1 LEFT JOIN egbs_demanddetail_v1 d2 ON d1.id = d2.demandid LEFT JOIN eg_ws_connection d4 ON d4.connectionno = d1.consumercode - WHERE - d1.tenantid = $tenantid - AND d1.businessservice = $serviceType - AND d1.taxperiodfrom >= fromDate + WHERE d1.taxperiodfrom >= $fromDate + AND d1.businessservice = $serviceType + AND d1.tenantid = $tenantid GROUP BY year, quarter, tax_period_from_date ) @@ -1948,6 +1947,6 @@ ReportDefinitions: COALESCE(CAST(total_collected_amount AS TEXT), 'No Collection Amount') AS total_collected_amount, COALESCE(CAST(distinct_consumercode_count AS TEXT), '0') AS distinct_consumercode_count FROM - quarterly_data + quarterly_data where 1=1 From 45de2b6dcd0d5f506f6c1cb337a7166f8e8d0e6e Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Fri, 17 Nov 2023 11:54:51 +0530 Subject: [PATCH 1247/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index c108719b0..a069056d1 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1911,7 +1911,7 @@ ReportDefinitions: - name: serviceType label: serviceType type: singlevaluelist - pattern: 'list://WS%:Water,SW%:Sewerage' + pattern: 'list://WS:Water,SW:Sewerage' source: pt isMandatory: true searchClause: AND 1=1 From 6f9742952d249788cf1f2f87c20d3bfc306b2ec0 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Fri, 17 Nov 2023 12:28:31 +0530 Subject: [PATCH 1248/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index a069056d1..9d5beee9b 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1880,7 +1880,7 @@ ReportDefinitions: label: reports.ws.quarter type: string source: ws - total: true + total: false - name: tax_period_from_date label: reports.ws.tax_period_from_date type: string @@ -1890,17 +1890,17 @@ ReportDefinitions: label: reports.ws.total_demand_amount type: string source: ws - total: false + total: true - name: total_collected_amount label: reports.ws.total_collected_amount type: string source: ws - total: false + total: true - name: distinct_consumercode_count label: reports.ws.distinct_consumercode_count type: string source: ws - total: false + total: true searchParams: - name: fromDate label: reports.pt.fromDate From 5840cb0968c148b6494ecbeb4be0c11430db5401 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 23 Nov 2023 12:02:52 +0530 Subject: [PATCH 1249/1630] Update uc-reports.yml echallan report v2 --- configs/reports/configs/uc-reports.yml | 98 ++++++++++++++++++++++---- 1 file changed, 85 insertions(+), 13 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 8ad58746d..f5d39e34d 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1826,7 +1826,66 @@ ReportDefinitions: 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 @@ -1843,22 +1902,35 @@ ReportDefinitions: query: | -- Use CTE to force query plan, compute & use CTE later SELECT - egcl_bill.status, - egcl_bill.totalamount, + string_agg(distinct egcl_bill.status,',') as billstatus, + string_agg(distinct egcl_bill.totalamount::text,',') as totalamount, eg_echallan.challanno, - eg_echallan.businessservice, - eg_echallan.description, - eg_echallan.applicationstatus, - egcl_paymentdetail.receiptnumber, - doorno, - buildingname, - street, - payment.mobilenumber, + 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 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' - orderby: ORDER BY eg_echallan.createdtime DESC + groupby: group by challanno , egcl_paymentdetail.receiptdate - reportName: NewMiscReceiptULB_v2 decryptionPathId: MiscReceiptULB_v2 From 95cc30f2aa6098e5be9e8552b90ae49e043bc007 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 23 Nov 2023 13:09:20 +0530 Subject: [PATCH 1250/1630] Update uc-reports.yml echall report --- configs/reports/configs/uc-reports.yml | 123 +++++++++++-------------- 1 file changed, 54 insertions(+), 69 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index f5d39e34d..76463d808 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1766,78 +1766,68 @@ ReportDefinitions: print: pdfPageSize: "A3" sourceColumns: - - name: totalamount - label: reports.uc.totalamount + - name: ulb + label: reports.uc.ulb 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 + - name: receiptnumber + label: reports.uc.receiptnumber type: string source: uc - total: false - - name: description - label: reports.uc.description + total: true + - name: receiptdate + label: reports.uc.receiptdate type: string source: uc total: false - - name: applicationstatus - label: reports.uc.applicationstatus + - name: g8issuedate + label: reports.uc.g8issuedate type: string source: uc total: false - - name: receiptnumber - label: reports.uc.receiptnumber + - name: g8receiptno + label: reports.uc.g8receiptno type: string source: uc total: false - - name: receiptdate - label: reports.uc.receiptdate + - name: receiptstatus + label: reports.uc.receiptstatus type: string source: uc total: false - - name: doorno - label: reports.uc.doorno + - name: businessdetails + label: reports.uc.businessdetails type: string source: uc total: false - - name: buildingname - label: reports.uc.buildingname + - name: cgst + label: reports.uc.cgst type: string source: uc - total: false - - name: street - label: reports.uc.street + total: true + - name: tax + label: reports.uc.tax type: string source: uc - total: false - - name: mobilenumber - label: reports.uc.mobilenumber + total: true + - name: fieldcollection + label: reports.uc.fieldcollection type: string source: uc - total: false - - name: manualreceiptnumber - label: reports.uc.manualreceiptnumber + total: true + - name: sgst + label: reports.uc.sgst type: string source: uc - total: false - - name: manualreceiptdate - label: reports.uc.manualreceiptdate + total: true + - name: cheque_dd_no + label: reports.uc.cheque_dd_no type: string source: uc total: false - - name: ifsc - label: reports.uc.ifsc + - name: cheque_dd_date + label: reports.uc.cheque_dd_date type: string source: uc total: false @@ -1851,41 +1841,32 @@ ReportDefinitions: 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 + - name: collectiontype + label: reports.uc.collectiontype type: string source: uc - total: false - - name: cgst - label: reports.uc.cgst + total: false + - name: collectorname + label: reports.uc.collectorname type: string source: uc total: false - - name: sgst - label: reports.uc.sgst + - name: totalamount + label: reports.uc.totalamount type: string source: uc - total: false - - name: tax - label: reports.uc.tax + total: true + - name: paymentmode + label: reports.uc.paymentmode type: string source: uc - total: false - - name: fieldcollection - label: reports.uc.fieldcollection + total: false + - name: comments + label: reports.uc.comments 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 @@ -1903,29 +1884,33 @@ ReportDefinitions: -- Use CTE to force query plan, compute & use CTE later SELECT string_agg(distinct egcl_bill.status,',') as billstatus, + string_agg(distinct payment.paymentstatus,',') receiptstatus, + string_agg(distinct payment.tenantid,',') as ulb, 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.businessservice,',') as businessdetails, + string_agg(distinct eg_echallan.description,',') as comments, 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 egcl_paymentdetail.manualreceiptnumber,',') as g8receiptno, + string_agg(distinct egcl_paymentdetail.manualreceiptdate::text,',') as g8issuedate, 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.instrumentdate::text,',') as cheque_dd_date, string_agg(distinct payment.transactionnumber,',') as transactionnumber, + string_agg(distinct payment.paymentmode,',') as paymentmode, 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, + 'System' as collectiontype, 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 From a39bb4ef64c14487b369a400bd3a1984a7bb1602 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 23 Nov 2023 13:46:23 +0530 Subject: [PATCH 1251/1630] 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 76463d808..a4367de3c 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1770,12 +1770,12 @@ ReportDefinitions: label: reports.uc.ulb type: string source: uc - total: true + total: false - name: receiptnumber label: reports.uc.receiptnumber type: string source: uc - total: true + total: false - name: receiptdate label: reports.uc.receiptdate type: string From ec18ce8539d05a70f7b82299eee7b19e191fadc9 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 23 Nov 2023 17:14:44 +0530 Subject: [PATCH 1252/1630] echallan update report --- 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 a4367de3c..915bfecb5 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1902,7 +1902,7 @@ ReportDefinitions: 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_dd_date, + to_char((To_timestamp(payment.instrumentdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS cheque_dd_date, string_agg(distinct payment.transactionnumber,',') as transactionnumber, string_agg(distinct payment.paymentmode,',') as paymentmode, SUM(CASE WHEN bad.taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, @@ -1915,7 +1915,7 @@ ReportDefinitions: 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 + groupby: group by challanno , egcl_paymentdetail.receiptdate ,payment.instrumentdate - reportName: NewMiscReceiptULB_v2 decryptionPathId: MiscReceiptULB_v2 From c5ecbed029bf12d094d3da49ef9cb8182e947e71 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 28 Nov 2023 15:03:29 +0530 Subject: [PATCH 1253/1630] Update uc-reports.yml --- configs/reports/configs/uc-reports.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 915bfecb5..5791612d3 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1880,6 +1880,22 @@ ReportDefinitions: 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 From d0383d06087cd63f04654bd32c0a4db9ccf46c48 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 28 Nov 2023 15:59:20 +0530 Subject: [PATCH 1254/1630] 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 5791612d3..08384b39a 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1887,7 +1887,7 @@ ReportDefinitions: source: uc wrapper: true isMandatory: false - searchClause: AND businessservice = $businessservice + searchClause: AND egcl_bill.businessservice = $businessservice - name: collectorname label: reports.uc.collectorname type: singlevaluelist From ebc8062aef6846515ce90c7bc3e1e0fb0c6473ff Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 29 Nov 2023 09:59:56 +0530 Subject: [PATCH 1255/1630] Update uc-reports.yml challan report changes --- 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 08384b39a..fbb44e1c5 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1913,7 +1913,7 @@ ReportDefinitions: string_agg(distinct street,',') as street, string_agg(distinct payment.mobilenumber,',') as mobilenumber, string_agg(distinct egcl_paymentdetail.manualreceiptnumber,',') as g8receiptno, - string_agg(distinct egcl_paymentdetail.manualreceiptdate::text,',') as g8issuedate, + To_char((To_timestamp(egcl_paymentdetail.manualreceiptdate/ 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, string_agg(distinct payment.ifsccode,',') as ifsc, string_agg(distinct bank_branches.bank_name,',') as bankname, string_agg(distinct bank_branches.branch,',') as branchname, @@ -1931,7 +1931,7 @@ ReportDefinitions: 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 ,payment.instrumentdate + groupby: group by challanno , egcl_paymentdetail.receiptdate ,payment.instrumentdate,egcl_paymentdetail.manualreceiptdate - reportName: NewMiscReceiptULB_v2 decryptionPathId: MiscReceiptULB_v2 From 355b471816dcaade6caaf12f0bfcea9bb8792b8a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 4 Dec 2023 09:48:51 +0530 Subject: [PATCH 1256/1630] Update uc-reports door street building name added --- configs/reports/configs/uc-reports.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index fbb44e1c5..d4c6b7663 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1866,6 +1866,21 @@ ReportDefinitions: 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 searchParams: - name: fromDate From 3047263653e98341a9b3be2b3328bb6ef8b4dc74 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 11 Dec 2023 13:00:52 +0530 Subject: [PATCH 1257/1630] added countOpen to fetch open complaints for 24 hrs --- .../rainmaker-pgr-v2-searcher.yml | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml index 5614e17f4..76308662c 100644 --- a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml +++ b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml @@ -204,6 +204,54 @@ SearchDefinitions: 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: From 44f956a435e9d0471a5892da9318d41dc7e60c35 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Wed, 20 Dec 2023 14:24:24 +0530 Subject: [PATCH 1258/1630] updated text for testing --- 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 b405b666f..601900340 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -23,13 +23,13 @@ { "stack": [ { - "text": "{{logo_header}} {{mcGrade}}", + "text": "{{logo_header}} {{mcGrade}} testingggg", "style": "receipt-logo-header" }, { "stack": [ { - "text": "{{address}}" + "text": "{{address}} onewwwww" }, { "text": "{{phoneNumber}}" From 4b08157e3bd871e8207b6ee01fde03ff2017fbcf Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Wed, 20 Dec 2023 14:48:41 +0530 Subject: [PATCH 1259/1630] Updated property id pdf --- configs/pdf-service/data-config/ws-bill.json | 6 ++++++ configs/pdf-service/format-config/ws-bill.json | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json index 1325d2567..7f9e42eba 100644 --- a/configs/pdf-service/data-config/ws-bill.json +++ b/configs/pdf-service/data-config/ws-bill.json @@ -456,6 +456,12 @@ "path": "$.mobileNumber" } }, + { + "variable": "propertyID", + "value": { + "path": "$.connection.propertyId" + } + }, { "variable": "oldConnectionNo", "value": { diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index 601900340..0348d96c0 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -23,13 +23,13 @@ { "stack": [ { - "text": "{{logo_header}} {{mcGrade}} testingggg", + "text": "{{logo_header}} {{mcGrade}}", "style": "receipt-logo-header" }, { "stack": [ { - "text": "{{address}} onewwwww" + "text": "{{address}}" }, { "text": "{{phoneNumber}}" @@ -444,6 +444,16 @@ ], "style": "receipt-table2" }, + { + "text": "{{propertyID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, { "text":"{{streetName}}{{landmark}}", "border": [ From 74d5d0d54e94d899f84801f7bb3bec21167055c8 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Wed, 20 Dec 2023 15:07:20 +0530 Subject: [PATCH 1260/1630] removed property --- configs/pdf-service/format-config/ws-bill.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index 0348d96c0..b405b666f 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -444,16 +444,6 @@ ], "style": "receipt-table2" }, - { - "text": "{{propertyID}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, { "text":"{{streetName}}{{landmark}}", "border": [ From c122e057439d3ec92a319970d2c00f34088e53eb Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Wed, 20 Dec 2023 15:28:51 +0530 Subject: [PATCH 1261/1630] Updated property id --- .../pdf-service/format-config/ws-bill.json | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index b405b666f..3d6c527f9 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -327,6 +327,16 @@ ], "style": "receipt-table-value2" }, + { + "text": "Property ID", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, { "text": "Locality", "border": [ @@ -369,6 +379,16 @@ ], "style": "receipt-table2" }, + { + "text": "{{propertyID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, { "text":"{{locality}}", "border": [ From a61e82ae7da563375ef86d0c6509c0e0c681b315 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Wed, 20 Dec 2023 15:42:44 +0530 Subject: [PATCH 1262/1630] remove old consumer number --- .../pdf-service/format-config/ws-bill.json | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index 3d6c527f9..18abbd8a7 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": "{{propertyID}}", "border": [ false, false, @@ -327,16 +327,6 @@ ], "style": "receipt-table-value2" }, - { - "text": "Property ID", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, { "text": "Locality", "border": [ @@ -379,16 +369,6 @@ ], "style": "receipt-table2" }, - { - "text": "{{propertyID}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, { "text":"{{locality}}", "border": [ From 0dcdf3669254b4763e154cb65f57a221f9aabae6 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Wed, 20 Dec 2023 15:49:55 +0530 Subject: [PATCH 1263/1630] Updated propertyid 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 18abbd8a7..a379ad6ff 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -224,7 +224,7 @@ "style": "receipt-table-value2" }, { - "text": "Old Consumer No.", + "text": "Property ID", "border": [ false, false, From be5172e8b2edafcf03dffb44de57f4c01de14c80 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Wed, 20 Dec 2023 16:04:21 +0530 Subject: [PATCH 1264/1630] Replaced street name to propertyid --- configs/pdf-service/format-config/ws-bill.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index a379ad6ff..805796cc3 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -224,7 +224,7 @@ "style": "receipt-table-value2" }, { - "text": "Property ID", + "text": "Old Consumer No.", "border": [ false, false, @@ -266,7 +266,7 @@ "style": "receipt-table2" }, { - "text": "{{propertyID}}", + "text": "{{oldConnectionNo}}", "border": [ false, false, @@ -402,7 +402,7 @@ "style": "receipt-table-value2" }, { - "text": "Street Name/Landmark", + "text": "Property ID", "border": [ false, false, @@ -445,7 +445,7 @@ "style": "receipt-table2" }, { - "text":"{{streetName}}{{landmark}}", + "text":"{{propertyID}}", "border": [ false, false, From a9a15599a8ebdf53a84f55e173c9700ccdc1753a Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Thu, 21 Dec 2023 11:10:41 +0530 Subject: [PATCH 1265/1630] Updated address --- .../format-config/consolidatedreceipt.json | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 3064d3356..59728f933 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -562,7 +562,29 @@ ], "style": "receipt-table" } - ] + ], + [{ + "text": "Payer Address", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ifsc}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ] ] }, "layout": {} From f1557552f467afb685aa2b7e10263ee0adca7531 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Thu, 21 Dec 2023 12:04:43 +0530 Subject: [PATCH 1266/1630] Change revert --- .../format-config/consolidatedreceipt.json | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 59728f933..3064d3356 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -562,29 +562,7 @@ ], "style": "receipt-table" } - ], - [{ - "text": "Payer Address", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{ifsc}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - - } - ] + ] ] }, "layout": {} From 072d9e59ea75c1377a214bce80b864b41ece7f8e Mon Sep 17 00:00:00 2001 From: Dheeraj Kapoor <90672944+DheerajKapoor15@users.noreply.github.com> Date: Tue, 26 Dec 2023 12:57:09 +0530 Subject: [PATCH 1267/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 9d5beee9b..750e74d5f 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1065,13 +1065,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: false - searchClause: AND payment.transactiondate >= $fromDate + searchClause: AND pd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: false - searchClause: AND payment.transactiondate <= $toDate + searchClause: AND pd.receiptdate <= $toDate query: | -- Use CTE to force query plan, compute & use CTE later select From 49514291b32ab02cc182802183d71e65d4dbfcc6 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Wed, 3 Jan 2024 17:50:31 +0530 Subject: [PATCH 1268/1630] 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 8e957540f..9e9442d78 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 49c6b717fc08c176aa1ac54e870f1894b9ec1f7e Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Wed, 3 Jan 2024 17:51:04 +0530 Subject: [PATCH 1269/1630] 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 9e9442d78..053ecb28b 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}} {{mcGradePwssb}}", "style": "receipt-logo-header" }, { From 7e53c2dfca714539cabf98c0796042b514ed467e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 3 Jan 2024 18:05:01 +0530 Subject: [PATCH 1270/1630] 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 053ecb28b..5ed1e43d2 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}}{{mcGradePwssb}}", + "text": "{{logo-header}} {{mcGradePwssb}}", "style": "receipt-logo-header" }, { From 13b658b07da4d0730f94f9dddfc99023e76cb7f6 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 3 Jan 2024 18:19:50 +0530 Subject: [PATCH 1271/1630] Update ws-onetime-receipt.json pdf --- 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 9502c79b4..d5a70579a 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 3b9cdea9cf9050f6c780c5dfbacd05ab3dfe8cab Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Fri, 5 Jan 2024 11:18:17 +0530 Subject: [PATCH 1272/1630] Update ws-bill.json --- .../pdf-service/format-config/ws-bill.json | 50 ++++++++++++------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index 805796cc3..035957ed9 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -23,17 +23,14 @@ { "stack": [ { - "text": "{{logo_header}} {{mcGrade}}", + "text": "{{logo_header}} {{mcGradePwssb}}", "style": "receipt-logo-header" }, { "stack": [ { "text": "{{address}}" - }, - { - "text": "{{phoneNumber}}" - }, + }, { "text": "{{website}}" }, @@ -54,7 +51,7 @@ { "stack": [ { - "text": "{{total_amount_due}}" + "text": "{{total_amount_due}} {{testing billWS}}" }, { "text": "{{Rs}} {{totalAmountDue}}", @@ -224,7 +221,7 @@ "style": "receipt-table-value2" }, { - "text": "Old Consumer No.", + "text": "Old Consumer id No.", "border": [ false, false, @@ -244,7 +241,7 @@ "style": "receipt-table-value2" }, { - "text": "Ledger Id", + "text": "Ledger No", "border": [ false, false, @@ -402,7 +399,7 @@ "style": "receipt-table-value2" }, { - "text": "Property ID", + "text": "Street Name/Landmark", "border": [ false, false, @@ -424,7 +421,7 @@ ], [ { - "text": "{{usageType}}", + "text": "{{usageTypedddddd}}", "border": [ false, false, @@ -435,7 +432,7 @@ }, { - "text": "{{mobileNo}}", + "text": "{{mobileNodddd}}", "border": [ false, false, @@ -445,7 +442,7 @@ "style": "receipt-table2" }, { - "text":"{{propertyID}}", + "text":"{{streetName}}{{landmark}}", "border": [ false, false, @@ -717,7 +714,7 @@ ], [ { - "text": "1. Online payment can be done for {{serviceType}} charges payment. http://bit.ly/{{logo_header}}{{serviceType}}", + "text": "1. Online payment can be done for {{serviceType}} charges payment. https://mseva.lgpunjab.gov.in/{{logo_header}}{{serviceType}}", "border": [ true, false, @@ -734,7 +731,7 @@ ], [ { - "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.", + "text": "2. If last date of bill is a holiday. Kindly pay your bills either online or offline on next working day to avoid penalty.", "border": [ true, false, @@ -751,7 +748,7 @@ ], [ { - "text": "3. Payment mode available: Cash/Cheque at office counter,Online: Credit/Debit Card/PayTM/FreeCharge/BBPS/Airtel/SewaKendra.", + "text": "3. Payment mode available: Cash/Cheque at office counter,Online.", "border": [ true, false, @@ -785,7 +782,24 @@ ], [ { - "text": "5. {{rate}}% Late payment charges will be applied after due date", + "text": "5. {{rate}}% surcharge charges will be applied after due date", + "border": [ + true, + false, + true, + false + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ], + [ + { + "text": "6. surcharge & late payment charges calculated based on the payment date will reflect in next bill ", "border": [ true, false, @@ -802,7 +816,7 @@ ], [ { - "text": "6. Interest & late payment charges calculated based on the payment date will reflect in next bill ", + "text": "7. Bill Payment collect/recover during office period i.e.09:00AM to 01:30PM. ", "border": [ true, false, @@ -1011,7 +1025,7 @@ "receipt-logo-header": { "color": "#484848", "fontFamily": "Roboto", - "fontSize": 14, + "fontSize": 8, "bold": true, "letterSpacing": 0.74, "margin": [ From 918e96dd5e02e15f2c0576d083c18cd28d8cd912 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Mon, 8 Jan 2024 11:11:31 +0530 Subject: [PATCH 1273/1630] Update ws-bill.json --- configs/pdf-service/format-config/ws-bill.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index 035957ed9..7b60bb9fb 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -421,7 +421,7 @@ ], [ { - "text": "{{usageTypedddddd}}", + "text": "{{usageType}}", "border": [ false, false, @@ -432,7 +432,7 @@ }, { - "text": "{{mobileNodddd}}", + "text": "{{mobileNo}}", "border": [ false, false, @@ -714,7 +714,7 @@ ], [ { - "text": "1. Online payment can be done for {{serviceType}} charges payment. https://mseva.lgpunjab.gov.in/{{logo_header}}{{serviceType}}", + "text": "1. Online payment can be done for {{serviceType}} charges payment. https://mseva.lgpunjab.gov.in/", "border": [ true, false, @@ -782,7 +782,7 @@ ], [ { - "text": "5. {{rate}}% surcharge charges will be applied after due date", + "text": "5. 10% surcharge charges will be applied after due date", "border": [ true, false, @@ -799,7 +799,7 @@ ], [ { - "text": "6. surcharge & late payment charges calculated based on the payment date will reflect in next bill ", + "text": "6. surcharge with & late payment charges calculated based on the payment date will reflect in next bill ", "border": [ true, false, From 3a1d5400b56c3597af36910e3b505935c236bc38 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Mon, 8 Jan 2024 11:15:16 +0530 Subject: [PATCH 1274/1630] correction firenoc receipt register --- 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 e2f139457..d30e08c29 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -651,7 +651,7 @@ ReportDefinitions: source: noc wrapper: true isMandatory: false - searchClause: AND fnoc.tenantId IN ($ulb) + searchClause: AND payment.tenantid =$ulb query: | -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( From 1cf0ccfbbd2e2db0987ef245f191b60e8bd25877 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Mon, 8 Jan 2024 11:30:43 +0530 Subject: [PATCH 1275/1630] Update ws-bill.json --- 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 7b60bb9fb..3b23982b6 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}} {{mcGradePwssb}}", + "text": "{{logo_header}} {{mcGrade}}", "style": "receipt-logo-header" }, { From b1d1a89c9dfce14b6b0709b6514bc3fddbc9e1ed Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Mon, 8 Jan 2024 14:59:56 +0530 Subject: [PATCH 1276/1630] Update ws-bill.json --- configs/pdf-service/format-config/ws-bill.json | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index 3b23982b6..41cd1a347 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -29,13 +29,16 @@ { "stack": [ { - "text": "{{address}}" + "text": "{{address}}", + "style": "receipt-logo-sub-header" }, { - "text": "{{website}}" + "text": "{{website}}", + "style": "receipt-logo-sub-header" }, { - "text": "{{email}}" + "text": "{{email}}", + "style": "receipt-logo-sub-header" } ] } @@ -1025,7 +1028,7 @@ "receipt-logo-header": { "color": "#484848", "fontFamily": "Roboto", - "fontSize": 8, + "fontSize": 12, "bold": true, "letterSpacing": 0.74, "margin": [ @@ -1038,7 +1041,7 @@ "receipt-logo-sub-header": { "color": "#484848", "fontFamily": "Roboto", - "fontSize": 12, + "fontSize": 10, "letterSpacing": 0.6 }, "noc-table": { From 8163f7f03fe7d9c988f608a919d1868bfae30cc3 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Tue, 9 Jan 2024 12:28:17 +0530 Subject: [PATCH 1277/1630] corrected query for firenoc receipt register --- .../reports/configs/rainmaker-noc-reports.yml | 69 +++++++++---------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index d30e08c29..a098aa620 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -654,44 +654,41 @@ ReportDefinitions: searchClause: AND payment.tenantid =$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 + 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.*, + bill.consumercode, + 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' + inner JOIN egcl_paymentdetail AS paydetail ON paydetail.paymentid = payment.id + --inner JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id + inner JOIN eg_user ON payment.createdby::INTEGER = eg_user.id + inner JOIN egcl_bill AS bill ON bill.id = paydetail.billid + inner JOIN eg_fn_firenocdetail AS fdet ON fdet.applicationnumber = bill.consumercode + inner 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 = 'pb.batala' + AND payment.paymentstatus != 'CANCELLED' + AND payment.createdtime>= 1648751400000 + AND payment.createdtime <= 1680287399000 orderby: ORDER BY paydetail.receiptdate DESC - reportName: CancelledReceiptRegisterFirenocReport_V2 From a94c0fe5341b758952e94ba81b986b785ca92eb5 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 9 Jan 2024 12:33:29 +0530 Subject: [PATCH 1278/1630] removed hard codes firenoc receiptregister --- configs/reports/configs/rainmaker-noc-reports.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index a098aa620..80cc5f6ad 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -637,13 +637,13 @@ ReportDefinitions: type: epoch source: noc isMandatory: false - searchClause: AND applicationdate >= $fromDate + searchClause: AND payment.createdtime >= $fromDate - name: toDate label: reports.noc.toDate type: epoch source: noc isMandatory: false - searchClause: AND applicationdate <= $toDate + searchClause: AND payment.createdtime <= $toDate - name: ulb label: reports.noc.ulb type: multivaluelist @@ -685,10 +685,7 @@ ReportDefinitions: WHERE payment.tenantid != 'pb.testing' AND paydetail.businessservice = 'FIRENOC' AND paydetail.receiptnumber NOT LIKE 'MP%' - AND payment.tenantid = 'pb.batala' AND payment.paymentstatus != 'CANCELLED' - AND payment.createdtime>= 1648751400000 - AND payment.createdtime <= 1680287399000 orderby: ORDER BY paydetail.receiptdate DESC - reportName: CancelledReceiptRegisterFirenocReport_V2 From 3566d80587bc774fb4a947c63dddb000506e8f0f Mon Sep 17 00:00:00 2001 From: palak-egov <86659286+palak-egov@users.noreply.github.com> Date: Wed, 10 Jan 2024 14:15:31 +0530 Subject: [PATCH 1279/1630] UM-6683 UC todays collection showing zero --- .../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 0c16ed54f..490065240 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4322,7 +4322,7 @@ "chartName": "DSS_TOTAL_COLLECTION_TODAY", "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", From 45eda427d61a6d04419f17a93625297c0ee537df Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 11 Jan 2024 11:20:23 +0530 Subject: [PATCH 1280/1630] Update pt-reports.yml defaulter --- configs/reports/configs/pt-reports.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index f3b377809..78311dea4 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6107,8 +6107,7 @@ ReportDefinitions: 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) + where tenantid=$tenantid and propertyid not in (select propertyid from report_assessments where tenantid=$tenantid and assessmentyears =$finYear) group by propertyid ), owners as @@ -6117,7 +6116,7 @@ ReportDefinitions: split_part(string_agg(ownername,','),',',1) as ownername, split_part(string_agg(mobileNumber,','),',',1) as mobileNumber, propertyid - from report_owners + from report_owners where tenantid=$tenantid and status='ACTIVE' group by propertyid ) select @@ -6137,7 +6136,7 @@ ReportDefinitions: 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) + where tenantid=$tenantid - reportName: PT_RECEIPTREGISTER_REPORT_V2 decryptionPathId: ReceiptRegister_V2 From a056012fab4136414365d77cde8e5e19b3a2c6f4 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Mon, 15 Jan 2024 15:29:33 +0530 Subject: [PATCH 1281/1630] Update ws-onetime-receipt.json --- 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 5ed1e43d2..044dee8ed 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -31,7 +31,7 @@ "style": "receipt-logo-sub-header" } ], - "alignment": "left", + "alignment": "center", "margin": [ 0, 7, @@ -54,7 +54,7 @@ "text": "{{email}}" } ], - "alignment": "right", + "alignment": "center", "color": "#484848", "margin": [ -100, From ac82c8b48faa95acf2728db1d6731bac3de709b6 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Tue, 23 Jan 2024 16:26:12 +0530 Subject: [PATCH 1282/1630] 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 79102e7a1..975dfd2f0 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -273,7 +273,7 @@ { "variable": "Interest", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].amount" + "path": "$.paymentDetails[0].additionalDetails.assessmentYears == '2023-2024' ? 0 : $.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].amount" } }, { From f0f2abc513fd9d26e6390762df079a2c76a0e461 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Tue, 23 Jan 2024 16:40:32 +0530 Subject: [PATCH 1283/1630] 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 975dfd2f0..79102e7a1 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -273,7 +273,7 @@ { "variable": "Interest", "value": { - "path": "$.paymentDetails[0].additionalDetails.assessmentYears == '2023-2024' ? 0 : $.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].amount" + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].amount" } }, { From 098d1ff87b6f28f85afdd8266bb5117557d87d16 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 25 Jan 2024 17:07:00 +0530 Subject: [PATCH 1284/1630] 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 78311dea4..82adbab79 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4356,7 +4356,7 @@ ReportDefinitions: (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' + and pt.propertyid = bill.consumercode and pt.status='ACTIVE' groupby: GROUP BY financialyear orderby: ORDER BY financialyear From bf4549e4bb538011d6b14baea1ca05bd3603b3b0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 Feb 2024 14:06:27 +0530 Subject: [PATCH 1285/1630] summary receipt register updated with toalamount --- 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 82adbab79..878805fe1 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3968,7 +3968,7 @@ ReportDefinitions: 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 + sum(amount) 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 From 8244880d3b75b2db26374a23c434128c45072272 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Thu, 8 Feb 2024 11:13:27 +0530 Subject: [PATCH 1286/1630] check commit --- 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 7f9e42eba..e108f2d4c 100644 --- a/configs/pdf-service/data-config/ws-bill.json +++ b/configs/pdf-service/data-config/ws-bill.json @@ -4,7 +4,7 @@ "serviceName": "rainmaker-common", "version": "1.0.0", "baseKeyPath": "$.Bill.*", - "entityIdPath": "$.billNumber", + "entityIdPath": "$.billNumber" , "isCommonTableBorderRequired": true, "mappings": [ { From a82a208c716a9b3159d3023f865e6ff7b377e703 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Thu, 8 Feb 2024 15:57:11 +0530 Subject: [PATCH 1287/1630] changes for water sewerage query --- configs/reports/configs/ws-reports.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 750e74d5f..a7e67e72b 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1911,7 +1911,7 @@ ReportDefinitions: - name: serviceType label: serviceType type: singlevaluelist - pattern: 'list://WS:Water,SW:Sewerage' + pattern: 'list://WS:Water' source: pt isMandatory: true searchClause: AND 1=1 @@ -1928,7 +1928,7 @@ ReportDefinitions: to_char(to_timestamp(d1.taxperiodfrom / 1000), 'YYYY-MM-DD') AS tax_period_from_date, COUNT(DISTINCT d1.consumercode) AS distinct_consumercode_count, SUM(d2.taxamount) AS total_demand_amount, - SUM(d2.collectionamount) AS total_collected_amount + SUM(d2.collectionamount) AS total_collected_amount,d5.usagecategory AS UsageType FROM egbs_demand_v1 d1 LEFT JOIN egbs_demanddetail_v1 d2 ON d1.id = d2.demandid @@ -1936,8 +1936,9 @@ ReportDefinitions: WHERE d1.taxperiodfrom >= $fromDate AND d1.businessservice = $serviceType AND d1.tenantid = $tenantid + AND d1.status !='CANCELLED' GROUP BY - year, quarter, tax_period_from_date + year, quarter, tax_period_from_date,UsageType ) SELECT @@ -1945,7 +1946,8 @@ ReportDefinitions: tax_period_from_date, COALESCE(CAST(total_demand_amount AS TEXT), 'No Tax amount') AS total_demand_amount, COALESCE(CAST(total_collected_amount AS TEXT), 'No Collection Amount') AS total_collected_amount, - COALESCE(CAST(distinct_consumercode_count AS TEXT), '0') AS distinct_consumercode_count + COALESCE(CAST(distinct_consumercode_count AS TEXT), '0') AS distinct_consumercode_count, + UsageType FROM quarterly_data where 1=1 From bb65f282a3ad19f7262d7079b4b0547d19935395 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Thu, 8 Feb 2024 16:15:03 +0530 Subject: [PATCH 1288/1630] change in water query --- configs/reports/configs/ws-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index a7e67e72b..1ebc8ddbb 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1933,6 +1933,7 @@ ReportDefinitions: egbs_demand_v1 d1 LEFT JOIN egbs_demanddetail_v1 d2 ON d1.id = d2.demandid LEFT JOIN eg_ws_connection d4 ON d4.connectionno = d1.consumercode + LEFT JOIN eg_pt_property d5 ON d4.property_id = d5.propertyid WHERE d1.taxperiodfrom >= $fromDate AND d1.businessservice = $serviceType AND d1.tenantid = $tenantid From f57330cc1d9157bfa16dddc659e0618d9fb12773 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Fri, 9 Feb 2024 09:52:39 +0530 Subject: [PATCH 1289/1630] addition of column usagetype in ws generarted report --- configs/reports/configs/ws-reports.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 1ebc8ddbb..0fc67ea79 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1901,6 +1901,11 @@ ReportDefinitions: type: string source: ws total: true + - name: UsageType + label: reports.ws.UsageType + type: string + source: ws + total: false searchParams: - name: fromDate label: reports.pt.fromDate From 1b40d1acdcadfd4268c37e69cb6ef530cb9a9cdc Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:16:15 +0530 Subject: [PATCH 1290/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 0fc67ea79..c9336f7bf 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1001,7 +1001,7 @@ ReportDefinitions: 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 + where paymentmode='ONLINE' and pd.businessservice in ('WS','SW') and payment.tenantid=$tenantid orderby: ORDER BY payment.transactiondate DESC - reportName: ReceiptCollections From 5ebf92b26d953ccd7c42dd3d1126151e7cfa4656 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:17:49 +0530 Subject: [PATCH 1291/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index c9336f7bf..46a95933d 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1869,7 +1869,7 @@ ReportDefinitions: groupby: group by pt.usagecategory, ws.status - reportName: GeneratedDemandReport - summary: Generated Demand Report + summary: Water Demand Report version: 1.0.0 moduleName: rainmaker-ws additionalConfig: From 21d8503dae6892a472f49c5e81a997f4ce9986b4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:31:46 +0530 Subject: [PATCH 1292/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 91 +++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 46a95933d..8b1334b17 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1955,6 +1955,95 @@ ReportDefinitions: COALESCE(CAST(distinct_consumercode_count AS TEXT), '0') AS distinct_consumercode_count, UsageType FROM - quarterly_data where 1=1 + quarterly_data where 1=1 + +- reportName: GeneratSWDemandReport + summary: Sewerage Demand Report + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: quarter + label: reports.ws.quarter + type: string + source: ws + total: false + - name: tax_period_from_date + label: reports.ws.tax_period_from_date + type: string + source: ws + total: false + - name: total_demand_amount + label: reports.ws.total_demand_amount + type: string + source: ws + total: true + - name: total_collected_amount + label: reports.ws.total_collected_amount + type: string + source: ws + total: true + - name: distinct_consumercode_count + label: reports.ws.distinct_consumercode_count + type: string + source: ws + total: true + - name: UsageType + label: reports.ws.UsageType + type: string + source: ws + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: and 1=1 + - name: serviceType + label: serviceType + type: singlevaluelist + pattern: 'list://SW:Sewerage' + source: pt + isMandatory: true + searchClause: AND 1=1 + query: | + WITH quarterly_data AS ( + SELECT + EXTRACT(YEAR FROM to_timestamp(d1.taxperiodfrom / 1000)) AS year, + CASE + WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) = 04 THEN 'Quarter 1' + WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) = 07 THEN 'Quarter 2' + WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) = 10 THEN 'Quarter 3' + WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) = 01 THEN 'Quarter 4' + END AS quarter, + to_char(to_timestamp(d1.taxperiodfrom / 1000), 'YYYY-MM-DD') AS tax_period_from_date, + COUNT(DISTINCT d1.consumercode) AS distinct_consumercode_count, + SUM(d2.taxamount) AS total_demand_amount, + SUM(d2.collectionamount) AS total_collected_amount,d5.usagecategory AS UsageType + FROM + egbs_demand_v1 d1 + LEFT JOIN egbs_demanddetail_v1 d2 ON d1.id = d2.demandid + LEFT JOIN eg_sw_connection d4 ON d4.connectionno = d1.consumercode + LEFT JOIN eg_pt_property d5 ON d4.property_id = d5.propertyid + WHERE d1.taxperiodfrom >= $fromDate + AND d1.businessservice = $serviceType + AND d1.tenantid = $tenantid + AND d1.status !='CANCELLED' + GROUP BY + year, quarter, tax_period_from_date,UsageType + ) + + SELECT + year || '->' || quarter AS quarter, + tax_period_from_date, + COALESCE(CAST(total_demand_amount AS TEXT), 'No Tax amount') AS total_demand_amount, + COALESCE(CAST(total_collected_amount AS TEXT), 'No Collection Amount') AS total_collected_amount, + COALESCE(CAST(distinct_consumercode_count AS TEXT), '0') AS distinct_consumercode_count, + UsageType + FROM + quarterly_data where 1=1 From a20ab4702c5a82c719967c99480f6e0ab17a2712 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:36:14 +0530 Subject: [PATCH 1293/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 8b1334b17..84ca59dae 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2002,13 +2002,6 @@ ReportDefinitions: source: pt isMandatory: true searchClause: and 1=1 - - name: serviceType - label: serviceType - type: singlevaluelist - pattern: 'list://SW:Sewerage' - source: pt - isMandatory: true - searchClause: AND 1=1 query: | WITH quarterly_data AS ( SELECT @@ -2029,7 +2022,7 @@ ReportDefinitions: LEFT JOIN eg_sw_connection d4 ON d4.connectionno = d1.consumercode LEFT JOIN eg_pt_property d5 ON d4.property_id = d5.propertyid WHERE d1.taxperiodfrom >= $fromDate - AND d1.businessservice = $serviceType + AND d1.businessservice = 'SW' AND d1.tenantid = $tenantid AND d1.status !='CANCELLED' GROUP BY From 3707eabb662084ebbf78c3b7f1972c7de7930b3b Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Sat, 10 Feb 2024 12:04:57 +0530 Subject: [PATCH 1294/1630] Update ws-onetime-receipt.json --- .../data-config/ws-onetime-receipt.json | 1375 ++++++++++------- 1 file changed, 845 insertions(+), 530 deletions(-) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index d5a70579a..d6fa91b13 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -1,563 +1,878 @@ { "key": "ws-onetime-receipt", - "documentType": "CONSOLIDATED_RECEIPT", - "DataConfigs": { - "moduleName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Payments.*", - "entityIdPath": "$.id", - "isCommonTableBorderRequired": true, - "mappings": [ + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ { - "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" - } + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 60, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{mcGradePwssb}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}}(Employee Copy)", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "center", + "margin": [ + 0, + 7, + 0, + 0 + ] }, { - "variable": "Municipal_Corporation", - "value": { - "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - } + "stack": [ + { + "text": "{{address}}", + "style": "receipt-address-header" + }, + { + "text": "{{website}}", + "style": "receipt-website-header" + } + + ] + + } ] - }, + ] + }, + "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": [ { - "derived": [ + "text": [ { - "variable": "pendingAmount", - "formula": "{{paidAmount}}>{{dueAmount}}?0:{{dueAmount}}-{{paidAmount}}" + "text": "{{generated_by}}: ", + "bold": true }, { - "variable": "advanceAmount", - "formula": "{{paidAmount}}>{{dueAmount}}?{{paidAmount}}-{{dueAmount}}:0" + "text": "{{user-name}}", + "bold": false } - ] + ], + "alignment": "left" }, { - "externalAPI": [ + "text": [ { - "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" - }, + "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": [ { - "variable":"mcGradePwssb", - "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + "text": "{{logo-header}} {{mcGradePwssb}}", + "style": "receipt-logo-header" }, { - "variable": "phoneNumber", - "value": "$.MdmsRes.tenant.tenants[0].contactNumber" - }, + "text": "{{serviceType}} {{payment_receipt}}(Citizen Copy)", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 13, + 7, + 0, + 0 + ] + }, + { + "stack": [ { - "variable": "website", - "value": "$.MdmsRes.tenant.tenants[0].domainUrl" + "text": "{{address}}" }, { - "variable": "email", - "value": "$.MdmsRes.tenant.tenants[0].emailId" + "text": "{{phoneNumber}}" }, { - "variable": "logoImage", - "value": "$.MdmsRes.tenant.tenants[0].logoId", - "type": "image" + "text": "{{website}}" }, { - "variable": "logo-header", - "value": "$.MdmsRes.tenant.tenants[0].code", - "localisation": { - "required": true, - "prefix": "TENANT_TENANTS", - "module": "rainmaker-common" - } + "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, + 0 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 12, + "letterSpacing": 0.6 + }, + + "receipt-address-header": { + "absolutePosition" : { + "x" : 500, + "y" : 300 + } + }, + "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" } - ] + } } } From 93cf016eda52542d107e41ed09ede46f424f6b33 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Sat, 10 Feb 2024 12:08:01 +0530 Subject: [PATCH 1295/1630] Revert change --- .../data-config/ws-onetime-receipt.json | 1375 +++++++---------- 1 file changed, 530 insertions(+), 845 deletions(-) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index d6fa91b13..d5a70579a 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -1,878 +1,563 @@ { "key": "ws-onetime-receipt", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "content": [ + "documentType": "CONSOLIDATED_RECEIPT", + "DataConfigs": { + "moduleName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Payments.*", + "entityIdPath": "$.id", + "isCommonTableBorderRequired": true, + "mappings": [ { - "style": "noc-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 60, - "height": 61.25 - }, - { - "stack": [ - { - "text": "{{logo-header}} {{mcGradePwssb}}", - "style": "receipt-logo-header" - }, - { - "text": "{{serviceType}} {{payment_receipt}}(Employee Copy)", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "center", - "margin": [ - 0, - 7, - 0, - 0 - ] + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } }, { - "stack": [ - { - "text": "{{address}}", - "style": "receipt-address-header" - }, - { - "text": "{{website}}", - "style": "receipt-website-header" - } - - ] - - } - ] - ] - }, - "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" - - } - ] + "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" + } + }, - ] - }, - "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 + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } }, { - "text": "{{user-name}}", - "bold": false - } - ], - "alignment": "left" + "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" + } + } + ] }, { - "text": [ + "derived": [ { - "text": "{{commissioner/eo}}", - "bold": true + "variable": "pendingAmount", + "formula": "{{paidAmount}}>{{dueAmount}}?0:{{dueAmount}}-{{paidAmount}}" + }, + { + "variable": "advanceAmount", + "formula": "{{paidAmount}}>{{dueAmount}}?{{paidAmount}}-{{dueAmount}}:0" } - ], - "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": [ + }, + { + "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": [ { - "text": "{{logo-header}} {{mcGradePwssb}}", - "style": "receipt-logo-header" + "variable": "address", + "value": "$.MdmsRes.tenant.tenants[0].address" }, { - "text": "{{serviceType}} {{payment_receipt}}(Citizen Copy)", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "left", - "margin": [ - 13, - 7, - 0, - 0 - ] - }, - { - "stack": [ + "variable":"mcGradePwssb", + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, + { + "variable": "phoneNumber", + "value": "$.MdmsRes.tenant.tenants[0].contactNumber" + }, { - "text": "{{address}}" + "variable": "website", + "value": "$.MdmsRes.tenant.tenants[0].domainUrl" }, { - "text": "{{phoneNumber}}" + "variable": "email", + "value": "$.MdmsRes.tenant.tenants[0].emailId" }, { - "text": "{{website}}" + "variable": "logoImage", + "value": "$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" }, { - "text": "{{email}}" + "variable": "logo-header", + "value": "$.MdmsRes.tenant.tenants[0].code", + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } } - ], - "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, - 0 - ] - }, - "receipt-logo-sub-header": { - "color": "#000000", - "fontSize": 12, - "letterSpacing": 0.6 - }, - - "receipt-address-header": { - "absolutePosition" : { - "x" : 500, - "y" : 300 - } - }, - "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" } - } + ] } } From 80c88a9b5078700fe7bf05ab5ed0ee3b98503d36 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 13 Feb 2024 11:24:23 +0530 Subject: [PATCH 1296/1630] correction summary receiptregister --- 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 878805fe1..bffc878f0 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3967,8 +3967,8 @@ 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,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(amount) as totalamount + (CASE WHEN payment.paymentmode!='ONLINE' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname, --for Online collecion show None as collectorname, + sum(bad.amount) 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 From d1646f8efceb97cc0746929d78c557ee750ee62f Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Tue, 13 Feb 2024 12:02:33 +0530 Subject: [PATCH 1297/1630] Change layout PDF --- .../format-config/ws-onetime-receipt.json | 81 ++++++------------- 1 file changed, 25 insertions(+), 56 deletions(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 044dee8ed..ce6353ff8 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -9,9 +9,9 @@ "style": "noc-head", "table": { "widths": [ - 60, - "*", - 120 + 40, + 500, + 20 ], "body": [ [ @@ -23,47 +23,29 @@ { "stack": [ { - "text": "{{logo-header}} {{mcGradePwssb}}", + "text": "{{logo-header}} {{mcGradePwssb}} testing", "style": "receipt-logo-header" }, - { - "text": "{{serviceType}} {{payment_receipt}}(Employee Copy)", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "center", - "margin": [ - 0, - 7, - 0, - 0 - ] - }, - { - "stack": [ { "text": "{{address}}" - }, - { - "text": "{{phoneNumber}}" - }, + }, { "text": "{{website}}" }, { - "text": "{{email}}" + "text": "{{serviceType}} {{payment_receipt}}(Employee Copy)", + "style": "receipt-logo-sub-header-ASR" } ], "alignment": "center", - "color": "#484848", "margin": [ - -100, + 60, + 7, 0, - -25, 0 ] } - ] + ] ] }, "layout": "noBorders" @@ -379,9 +361,9 @@ "style": "noc-head", "table": { "widths": [ - 60, - "*", - 120 + 40, + 500, + 20 ], "body": [ [ @@ -396,41 +378,23 @@ "text": "{{logo-header}} {{mcGradePwssb}}", "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}}" + "text": "{{serviceType}} {{payment_receipt}}(Citizen Copy)", + "style": "receipt-logo-sub-header" } ], - "alignment": "right", - "color": "#484848", + "alignment": "center", "margin": [ - -100, + 13, + 7, 0, - -25, - -3 + 0 ] } ] @@ -769,6 +733,11 @@ "fontSize": 12, "letterSpacing": 0.6 }, + "receipt-logo-sub-header-ASR": { + "color": "#000000", + "fontSize": 12, + "letterSpacing": 0.6 + }, "noc-table": { "fontSize": 12, "color": "#000000", From 11f5945bdfa8baa5d1a2464952008812bec9ab0d Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Tue, 13 Feb 2024 12:50:20 +0530 Subject: [PATCH 1298/1630] 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 ce6353ff8..9a2696309 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}} {{mcGradePwssb}} testing", + "text": "{{logo-header}} {{mcGradePwssb}}", "style": "receipt-logo-header" }, { From 3a4df9c943151259f081315f3c3cb23d0db30b8d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 14 Feb 2024 09:37:01 +0530 Subject: [PATCH 1299/1630] 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 bffc878f0..24cd537ed 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3968,7 +3968,7 @@ ReportDefinitions: 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(bad.amount) as totalamount + sum(bad.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 From 07c35d79d7776d47f21c0ca01ca515cfb0fa2577 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Wed, 14 Feb 2024 10:28:36 +0530 Subject: [PATCH 1300/1630] Update ws-bill.json --- 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 41cd1a347..2a99d0aa9 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -43,7 +43,7 @@ ] } ], - "alignment": "left", + "alignment": "center", "margin": [ 0, 1, From 46b8ff3cfd5e636190f973dea3640fde5403f948 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 14 Feb 2024 12:52:52 +0530 Subject: [PATCH 1301/1630] 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 24cd537ed..cbe5f1e51 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4356,7 +4356,7 @@ ReportDefinitions: (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='ACTIVE' + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' groupby: GROUP BY financialyear orderby: ORDER BY financialyear From 4e3b4b03e0335def2d1cfe0411b33b416cdd2546 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 14 Feb 2024 13:01:55 +0530 Subject: [PATCH 1302/1630] 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 cbe5f1e51..9c7eb43ad 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5863,7 +5863,7 @@ ReportDefinitions: 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' + WHERE propety.tenantid=$tenantid AND propety.acknowldgementnumber NOTNULL orderby: ORDER BY propety.createdtime DESC - reportName: ULBPTData From b6ca8be4da835f4538ce988500ff41ca5613c823 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 14 Feb 2024 15:29:29 +0530 Subject: [PATCH 1303/1630] connection count --- configs/reports/configs/ws-reports.yml | 140 +++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 84ca59dae..d95b7f6e2 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2039,4 +2039,144 @@ ReportDefinitions: FROM quarterly_data where 1=1 +- reportName: Connectioncountreport + summary: Connection Count Report + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: +- name: Total Water Connections + label: reports.ws.Total Water Connections + type: string + source: ws + total: false +- name: Total Sewerage connections + label: reports.ws.Total Sewerage connections + type: string + source: ws + total: false +- name: Both Connection + label: reports.ws.Both Connection + type: string + source: ws + total: false +- name: Total Water Active + label: reports.ws.Total Water Active + type: string + source: ws + total: false +- name: Total Sewerage Active + label: reports.ws.Total Sewerage Active + type: string + source: ws + total: false +- name: Both ACTIVE Connection + label: reports.ws.Both ACTIVE Connection + type: string + source: ws + total: false +- name: Total Active RESIDENTIAL in Water + label: reports.ws.Total Active RESIDENTIAL in Water + type: string + source: ws + total: false +- name: Total Active RESIDENTIAL in Sewerage + label: reports.ws.Total Active RESIDENTIAL in Sewerage + type: string + source: ws + total: false +- name: Total Active NON-RESIDENTIAL in Sewerage + label: reports.ws.Total Active NON-RESIDENTIAL in Sewerage + type: string + source: ws + total: false +- name: Total Active NON-RESIDENTIAL in Water + label: reports.ws.Total Active NON-RESIDENTIAL in Water + type: string + source: ws + total: false +- name: Total Metered Connections + label: reports.ws.Total Metered Connections + type: string + source: ws + total: false +- name: Total Exempted in Water + label: reports.ws.Total Exempted in Water + type: string + source: ws + total: false +- name: Total Exempted in Sewerage + label: reports.ws.Total Exempted in Sewerage + type: string + source: ws + total: false +- name: Between 5 Marla Water + label: reports.ws.Between 5 Marla Water + type: string + source: ws + total: false +- name: Between 5 Marla Sewerage + label: reports.ws.Between 5 Marla Sewerage + type: string + source: ws + total: false +- name: Between 6-10 Marla Water + label: reports.ws.Between 6-10 Marla Water + type: string + source: ws + total: false +- name: Between 6-10 Marla Sewerage + label: reports.ws.Between 6-10 Marla Sewerage + type: string + source: ws + total: false +- name: More than 10 Marla Water + label: reports.ws.More than 10 Marla Water + type: string + source: ws + total: false +- name: More than 10 Marla Sewerage + label: reports.ws.More than 10 Marla Sewerage + type: string + source: ws + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: and 1=1 + query: | + -- Use CTE to force query plan, compute & use CTE later + + select a.*, b.*,c.*, d.*,e.*,f.*,g.*,h.*,i.*, j.*,k.*,l.*,m.*, n.*,o.*,p.*,q.*,r.*,s.* from (select count (*) as "Total Water Connections" from eg_ws_connection where tenantid=$tenantid)a, + + (select count (*) as "Total Sewerage connections" from eg_sw_connection where tenantid=$tenantid)b,(SELECT SUM(cnt) AS "Both Connection"FROM ( SELECT COUNT(*) AS cnt FROM eg_ws_connection where tenantid=$tenantid + + UNION ALL SELECT COUNT(*) AS cnt FROM eg_sw_connection where tenantid=$tenantid) AS "Both Connection")c,(select count(*) as "Total Water Active" from eg_ws_connection where applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)d, + + (select count(*) as "Total Sewerage Active" from eg_sw_connection where applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)e,(SELECT SUM(cnt) AS "Both ACTIVE Connection" + + FROM ( SELECT COUNT(*) AS cnt FROM eg_ws_connection where tenantid=$tenantid and applicationstatus='CONNECTION_ACTIVATED' UNION ALL SELECT COUNT(*) AS cnt FROM eg_sw_connection where tenantid=$tenantid and applicationstatus='CONNECTION_ACTIVATED' + + ) AS "Both ACTIVE Connection")f, (select count(*) as "Total Active RESIDENTIAL in Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('RESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)g, + + (select count(*) as "Total Active RESIDENTIAL in Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('RESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)h, (select count(*) as "Total Active NON-RESIDENTIAL in Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)i, + + (select count(*) as "Total Active NON-RESIDENTIAL in Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid='pb.amritsar')j, + + (select count(*) as "Total Metered Connections" from eg_ws_connection where tenantid='pb.amritsar' and additionaldetails->>'meterId' is not null)k,(select count(*) as "Total Exempted in Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between + + 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and applicationstatus='CONNECTION_ACTIVATED' and tenantid='pb.amritsar')l,(select count(*) as "Total Exempted in Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and applicationstatus='CONNECTION_ACTIVATED' and tenantid='pb.amritsar')m,(select count(*) as "Between 5 Marla Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between + + 0 and 125 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid='pb.amritsar')n,(select count(*) as "Between 5 Marla Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid='pb.amritsar')o,(select count(*) as "Between 6-10 Marla Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between + + 126 and 250 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid='pb.amritsar')p,(select count(*) as "Between 6-10 Marla Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid='$tenantid')q,(select count(*) as "More than 10 Marla Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 + + and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid='pb.amritsar')r, (select count(*) as "More than 10 Marla Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status='ACTIVE') + + and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)s; From 4e40d2f56f3a78fc6f58694f815d5a5dafa8d064 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 14 Feb 2024 15:41:08 +0530 Subject: [PATCH 1304/1630] connection count --- configs/reports/configs/ws-reports.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index d95b7f6e2..c4f73469c 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2166,17 +2166,17 @@ ReportDefinitions: (select count(*) as "Total Active RESIDENTIAL in Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('RESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)h, (select count(*) as "Total Active NON-RESIDENTIAL in Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)i, - (select count(*) as "Total Active NON-RESIDENTIAL in Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid='pb.amritsar')j, + (select count(*) as "Total Active NON-RESIDENTIAL in Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)j, - (select count(*) as "Total Metered Connections" from eg_ws_connection where tenantid='pb.amritsar' and additionaldetails->>'meterId' is not null)k,(select count(*) as "Total Exempted in Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between + (select count(*) as "Total Metered Connections" from eg_ws_connection where tenantid=$tenantid and additionaldetails->>'meterId' is not null)k,(select count(*) as "Total Exempted in Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between - 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and applicationstatus='CONNECTION_ACTIVATED' and tenantid='pb.amritsar')l,(select count(*) as "Total Exempted in Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and applicationstatus='CONNECTION_ACTIVATED' and tenantid='pb.amritsar')m,(select count(*) as "Between 5 Marla Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between + 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)l,(select count(*) as "Total Exempted in Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)m,(select count(*) as "Between 5 Marla Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between - 0 and 125 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid='pb.amritsar')n,(select count(*) as "Between 5 Marla Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid='pb.amritsar')o,(select count(*) as "Between 6-10 Marla Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between + 0 and 125 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)n,(select count(*) as "Between 5 Marla Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)o,(select count(*) as "Between 6-10 Marla Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between - 126 and 250 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid='pb.amritsar')p,(select count(*) as "Between 6-10 Marla Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid='$tenantid')q,(select count(*) as "More than 10 Marla Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 + 126 and 250 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)p,(select count(*) as "Between 6-10 Marla Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)q,(select count(*) as "More than 10 Marla Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 - and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid='pb.amritsar')r, (select count(*) as "More than 10 Marla Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status='ACTIVE') + and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)r, (select count(*) as "More than 10 Marla Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status='ACTIVE') and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)s; From aa76542fd2745b89c949d4c970cd59ccc041b0ec Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 15 Feb 2024 09:36:48 +0530 Subject: [PATCH 1305/1630] Update ws-reports.yml count connection --- configs/reports/configs/ws-reports.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index c4f73469c..ad61be5d5 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2153,30 +2153,17 @@ ReportDefinitions: -- Use CTE to force query plan, compute & use CTE later select a.*, b.*,c.*, d.*,e.*,f.*,g.*,h.*,i.*, j.*,k.*,l.*,m.*, n.*,o.*,p.*,q.*,r.*,s.* from (select count (*) as "Total Water Connections" from eg_ws_connection where tenantid=$tenantid)a, - (select count (*) as "Total Sewerage connections" from eg_sw_connection where tenantid=$tenantid)b,(SELECT SUM(cnt) AS "Both Connection"FROM ( SELECT COUNT(*) AS cnt FROM eg_ws_connection where tenantid=$tenantid - UNION ALL SELECT COUNT(*) AS cnt FROM eg_sw_connection where tenantid=$tenantid) AS "Both Connection")c,(select count(*) as "Total Water Active" from eg_ws_connection where applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)d, - (select count(*) as "Total Sewerage Active" from eg_sw_connection where applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)e,(SELECT SUM(cnt) AS "Both ACTIVE Connection" - FROM ( SELECT COUNT(*) AS cnt FROM eg_ws_connection where tenantid=$tenantid and applicationstatus='CONNECTION_ACTIVATED' UNION ALL SELECT COUNT(*) AS cnt FROM eg_sw_connection where tenantid=$tenantid and applicationstatus='CONNECTION_ACTIVATED' - ) AS "Both ACTIVE Connection")f, (select count(*) as "Total Active RESIDENTIAL in Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('RESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)g, - (select count(*) as "Total Active RESIDENTIAL in Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('RESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)h, (select count(*) as "Total Active NON-RESIDENTIAL in Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)i, - (select count(*) as "Total Active NON-RESIDENTIAL in Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)j, - (select count(*) as "Total Metered Connections" from eg_ws_connection where tenantid=$tenantid and additionaldetails->>'meterId' is not null)k,(select count(*) as "Total Exempted in Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between - 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)l,(select count(*) as "Total Exempted in Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)m,(select count(*) as "Between 5 Marla Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between - 0 and 125 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)n,(select count(*) as "Between 5 Marla Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)o,(select count(*) as "Between 6-10 Marla Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between - 126 and 250 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)p,(select count(*) as "Between 6-10 Marla Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)q,(select count(*) as "More than 10 Marla Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 - and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)r, (select count(*) as "More than 10 Marla Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status='ACTIVE') - and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)s; From 69ed8ace2eb1495076e566ce7d16327ed72e73ec Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 15 Feb 2024 10:21:07 +0530 Subject: [PATCH 1306/1630] count connection report --- configs/reports/configs/ws-reports.yml | 94 +++++++++++--------------- 1 file changed, 40 insertions(+), 54 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index ad61be5d5..ca1ebb4ab 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2047,98 +2047,98 @@ ReportDefinitions: print: pdfPageSize: A1 sourceColumns: -- name: Total Water Connections - label: reports.ws.Total Water Connections +- name: Total_Water_Connections + label: reports.ws.Total_Water_Connections type: string source: ws total: false -- name: Total Sewerage connections - label: reports.ws.Total Sewerage connections +- name: Total_Sewerage_connections + label: reports.ws.Total_Sewerage_connections type: string source: ws total: false -- name: Both Connection - label: reports.ws.Both Connection +- name: Both_Connection + label: reports.ws.Both_Connection type: string source: ws total: false -- name: Total Water Active - label: reports.ws.Total Water Active +- name: Total_Water_Active + label: reports.ws.Total_Water_Active type: string source: ws total: false -- name: Total Sewerage Active - label: reports.ws.Total Sewerage Active +- name: Total_Sewerage_Active + label: reports.ws.Total_Sewerage_Active type: string source: ws total: false -- name: Both ACTIVE Connection - label: reports.ws.Both ACTIVE Connection +- name: Both_ACTIVE_Connection + label: reports.ws.Both_ACTIVE_Connection type: string source: ws total: false -- name: Total Active RESIDENTIAL in Water - label: reports.ws.Total Active RESIDENTIAL in Water +- name: Total_Active_RESIDENTIAL_in_Water + label: reports.ws.Total_Active_RESIDENTIAL_in_Water type: string source: ws total: false -- name: Total Active RESIDENTIAL in Sewerage - label: reports.ws.Total Active RESIDENTIAL in Sewerage +- name: Total_Active_RESIDENTIAL_in_Sewerage + label: reports.ws.Total_Active_RESIDENTIAL_in_Sewerage type: string source: ws total: false -- name: Total Active NON-RESIDENTIAL in Sewerage - label: reports.ws.Total Active NON-RESIDENTIAL in Sewerage +- name: Total_Active_NON_RESIDENTIAL_in_Sewerage + label: reports.ws.Total_Active_NON_RESIDENTIAL_in_Sewerage type: string source: ws total: false -- name: Total Active NON-RESIDENTIAL in Water - label: reports.ws.Total Active NON-RESIDENTIAL in Water +- name: Total_Active_NON_RESIDENTIAL_in_Water + label: reports.ws.Total_Active_NON_RESIDENTIAL_in_Water type: string source: ws total: false -- name: Total Metered Connections - label: reports.ws.Total Metered Connections +- name: Total_Metered_Connections + label: reports.ws.Total_Metered_Connections type: string source: ws total: false -- name: Total Exempted in Water - label: reports.ws.Total Exempted in Water +- name: Total_Exempted_in_Water + label: reports.ws.Total_Exempted_in_Water type: string source: ws total: false -- name: Total Exempted in Sewerage - label: reports.ws.Total Exempted in Sewerage +- name: Total_Exempted_in_Sewerage + label: reports.ws.Total_Exempted_in_Sewerage type: string source: ws total: false -- name: Between 5 Marla Water - label: reports.ws.Between 5 Marla Water +- name: Between_5_Marla_Water + label: reports.ws.Between_5_Marla_Water type: string source: ws total: false -- name: Between 5 Marla Sewerage - label: reports.ws.Between 5 Marla Sewerage +- name: Between_5_Marla_Sewerage + label: reports.ws.Between_5_Marla_Sewerage type: string source: ws total: false -- name: Between 6-10 Marla Water - label: reports.ws.Between 6-10 Marla Water +- name: Between_6_10_Marla_Water + label: reports.ws.Between_6_10_Marla_Water type: string source: ws total: false -- name: Between 6-10 Marla Sewerage - label: reports.ws.Between 6-10 Marla Sewerage +- name: Between_6_10_Marla_Sewerage + label: reports.ws.Between_6_10_Marla_Sewerage type: string source: ws total: false -- name: More than 10 Marla Water - label: reports.ws.More than 10 Marla Water +- name: More_than_10_Marla_Water + label: reports.ws.More_than_10_Marla_Water type: string source: ws total: false -- name: More than 10 Marla Sewerage - label: reports.ws.More than 10 Marla Sewerage +- name: More_than_10_Marla_Sewerage + label: reports.ws.More_than_10_Marla_Sewerage type: string source: ws total: false @@ -2151,19 +2151,5 @@ ReportDefinitions: searchClause: and 1=1 query: | -- Use CTE to force query plan, compute & use CTE later - - select a.*, b.*,c.*, d.*,e.*,f.*,g.*,h.*,i.*, j.*,k.*,l.*,m.*, n.*,o.*,p.*,q.*,r.*,s.* from (select count (*) as "Total Water Connections" from eg_ws_connection where tenantid=$tenantid)a, - (select count (*) as "Total Sewerage connections" from eg_sw_connection where tenantid=$tenantid)b,(SELECT SUM(cnt) AS "Both Connection"FROM ( SELECT COUNT(*) AS cnt FROM eg_ws_connection where tenantid=$tenantid - UNION ALL SELECT COUNT(*) AS cnt FROM eg_sw_connection where tenantid=$tenantid) AS "Both Connection")c,(select count(*) as "Total Water Active" from eg_ws_connection where applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)d, - (select count(*) as "Total Sewerage Active" from eg_sw_connection where applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)e,(SELECT SUM(cnt) AS "Both ACTIVE Connection" - FROM ( SELECT COUNT(*) AS cnt FROM eg_ws_connection where tenantid=$tenantid and applicationstatus='CONNECTION_ACTIVATED' UNION ALL SELECT COUNT(*) AS cnt FROM eg_sw_connection where tenantid=$tenantid and applicationstatus='CONNECTION_ACTIVATED' - ) AS "Both ACTIVE Connection")f, (select count(*) as "Total Active RESIDENTIAL in Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('RESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)g, - (select count(*) as "Total Active RESIDENTIAL in Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('RESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)h, (select count(*) as "Total Active NON-RESIDENTIAL in Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)i, - (select count(*) as "Total Active NON-RESIDENTIAL in Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)j, - (select count(*) as "Total Metered Connections" from eg_ws_connection where tenantid=$tenantid and additionaldetails->>'meterId' is not null)k,(select count(*) as "Total Exempted in Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between - 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)l,(select count(*) as "Total Exempted in Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)m,(select count(*) as "Between 5 Marla Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between - 0 and 125 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)n,(select count(*) as "Between 5 Marla Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)o,(select count(*) as "Between 6-10 Marla Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between - 126 and 250 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)p,(select count(*) as "Between 6-10 Marla Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)q,(select count(*) as "More than 10 Marla Water" from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 - and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)r, (select count(*) as "More than 10 Marla Sewerage" from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status='ACTIVE') - and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)s; - + select a.*, b.*,c.*, d.*,e.*,f.*,g.*,h.*,i.*, j.*,k.*,l.*,m.*, n.*,o.*,p.*,q.*,r.*,s.* from (select count (*) as Total_Water_Connections from eg_ws_connection where tenantid=$tenantid )a,(select count (*) as Total_Sewerage_connections from eg_sw_connection where tenantid=$tenantid )b,(SELECT SUM(cnt) AS Both_Connection FROM ( SELECT COUNT(*) AS cnt FROM eg_ws_connection where tenantid=$tenantid UNION ALL SELECT COUNT(*) AS cnt FROM eg_sw_connection where tenantid=$tenantid ) AS Both_Connection)c,(select count(*) as Total_Water_Active from eg_ws_connection where applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )d,(select count(*) as Total_Sewerage_Active from eg_sw_connection where applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )e,(SELECT SUM(cnt) AS Both_ACTIVE_Connection FROM (SELECT COUNT(*) AS cnt FROM eg_ws_connection where tenantid=$tenantid and applicationstatus='CONNECTION_ACTIVATED' UNION ALL SELECT COUNT(*) AS cnt FROM eg_sw_connection where tenantid=$tenantid and applicationstatus='CONNECTION_ACTIVATED') AS "Both ACTIVE Connection")f, (select count(*) as Total_Active_RESIDENTIAL_in_Water from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('RESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )g,(select count(*) as Total_Active_RESIDENTIAL_in_Sewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('RESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )h, (select count(*) as Total_Active_NON_RESIDENTIAL_in_Sewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )i,(select count(*) as Total_Active_NON_RESIDENTIAL_in_Water from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )j,(select count(*) as Total_Metered_Connections from eg_ws_connection where tenantid=$tenantid and additionaldetails->>'meterId' is not null)k,(select count(*) as Total_Exempted_in_Water from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )l,(select count(*) as Total_Exempted_in_Sewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )m,(select count(*) as Between_5_Marla_Water from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between + 0 and 125 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )n,(select count(*) as Between_5_Marla_Sewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )o,(select count(*) as Between_6_10_Marla_Water from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )p,(select count(*) as Between_6_10_Marla_Sewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )q,(select count(*) as More_than_10_Marla_Water from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )r, (select count(*) as More_than_10_Marla_Sewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status='ACTIVE') and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)s; From f7ea140209c343aa7aabedafee79338f4868b60e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 15 Feb 2024 11:04:35 +0530 Subject: [PATCH 1307/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 94 +++++++++++++++----------- 1 file changed, 56 insertions(+), 38 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index ca1ebb4ab..dc12d9d33 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2047,58 +2047,58 @@ ReportDefinitions: print: pdfPageSize: A1 sourceColumns: -- name: Total_Water_Connections - label: reports.ws.Total_Water_Connections +- name: totalwaterconnections + label: reports.ws.totalwaterconnections type: string source: ws total: false -- name: Total_Sewerage_connections - label: reports.ws.Total_Sewerage_connections +- name: totalsewerageconnections + label: reports.ws.totalsewerageconnections type: string source: ws total: false -- name: Both_Connection - label: reports.ws.Both_Connection +- name: bothconnection + label: reports.ws.bothconnection type: string source: ws total: false -- name: Total_Water_Active - label: reports.ws.Total_Water_Active +- name: totalwateractive + label: reports.ws.totalwateractive type: string source: ws total: false -- name: Total_Sewerage_Active - label: reports.ws.Total_Sewerage_Active +- name: totalsewerageactive + label: reports.ws.totalsewerageactive type: string source: ws total: false -- name: Both_ACTIVE_Connection - label: reports.ws.Both_ACTIVE_Connection +- name: bothactiveconnection + label: reports.ws.bothactiveconnection type: string source: ws total: false -- name: Total_Active_RESIDENTIAL_in_Water - label: reports.ws.Total_Active_RESIDENTIAL_in_Water +- name: totalactiveresidentialinwater + label: reports.ws.totalactiveresidentialinwater type: string source: ws total: false -- name: Total_Active_RESIDENTIAL_in_Sewerage - label: reports.ws.Total_Active_RESIDENTIAL_in_Sewerage +- name: totalactiveresidentialinsewerage + label: reports.ws.totalactiveresidentialinsewerage type: string source: ws total: false -- name: Total_Active_NON_RESIDENTIAL_in_Sewerage - label: reports.ws.Total_Active_NON_RESIDENTIAL_in_Sewerage +- name: totalactivenonresidentialinsewerage + label: reports.ws.totalactivenonresidentialinsewerage type: string source: ws total: false -- name: Total_Active_NON_RESIDENTIAL_in_Water - label: reports.ws.Total_Active_NON_RESIDENTIAL_in_Water +- name: totalactivenonresidentialinwater + label: reports.ws.totalactivenonresidentialinwater type: string source: ws total: false -- name: Total_Metered_Connections - label: reports.ws.Total_Metered_Connections +- name: totalmeteredconnections + label: reports.ws.totalmeteredconnections type: string source: ws total: false @@ -2107,38 +2107,38 @@ ReportDefinitions: type: string source: ws total: false -- name: Total_Exempted_in_Sewerage - label: reports.ws.Total_Exempted_in_Sewerage +- name: totalexemptedinwater + label: reports.ws.totalexemptedinwater type: string source: ws total: false -- name: Between_5_Marla_Water - label: reports.ws.Between_5_Marla_Water +- name: betweenfivemarlawater + label: reports.ws.betweenfivemarlawater type: string source: ws total: false -- name: Between_5_Marla_Sewerage - label: reports.ws.Between_5_Marla_Sewerage +- name: betweenfivemarlasewerage + label: reports.ws.betweenfivemarlasewerage type: string source: ws total: false -- name: Between_6_10_Marla_Water - label: reports.ws.Between_6_10_Marla_Water +- name: betweensixmarlawater + label: reports.ws.betweensixmarlawater type: string source: ws total: false -- name: Between_6_10_Marla_Sewerage - label: reports.ws.Between_6_10_Marla_Sewerage +- name: betweensixandtenmarlasewerage + label: reports.ws.betweensixandtenmarlasewerage type: string source: ws total: false -- name: More_than_10_Marla_Water - label: reports.ws.More_than_10_Marla_Water +- name: morethantenmarlawater + label: reports.ws.morethantenmarlawater type: string source: ws total: false -- name: More_than_10_Marla_Sewerage - label: reports.ws.More_than_10_Marla_Sewerage +- name: morethantenmarlasewerage + label: reports.ws.morethantenmarlasewerage type: string source: ws total: false @@ -2151,5 +2151,23 @@ ReportDefinitions: searchClause: and 1=1 query: | -- Use CTE to force query plan, compute & use CTE later - select a.*, b.*,c.*, d.*,e.*,f.*,g.*,h.*,i.*, j.*,k.*,l.*,m.*, n.*,o.*,p.*,q.*,r.*,s.* from (select count (*) as Total_Water_Connections from eg_ws_connection where tenantid=$tenantid )a,(select count (*) as Total_Sewerage_connections from eg_sw_connection where tenantid=$tenantid )b,(SELECT SUM(cnt) AS Both_Connection FROM ( SELECT COUNT(*) AS cnt FROM eg_ws_connection where tenantid=$tenantid UNION ALL SELECT COUNT(*) AS cnt FROM eg_sw_connection where tenantid=$tenantid ) AS Both_Connection)c,(select count(*) as Total_Water_Active from eg_ws_connection where applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )d,(select count(*) as Total_Sewerage_Active from eg_sw_connection where applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )e,(SELECT SUM(cnt) AS Both_ACTIVE_Connection FROM (SELECT COUNT(*) AS cnt FROM eg_ws_connection where tenantid=$tenantid and applicationstatus='CONNECTION_ACTIVATED' UNION ALL SELECT COUNT(*) AS cnt FROM eg_sw_connection where tenantid=$tenantid and applicationstatus='CONNECTION_ACTIVATED') AS "Both ACTIVE Connection")f, (select count(*) as Total_Active_RESIDENTIAL_in_Water from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('RESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )g,(select count(*) as Total_Active_RESIDENTIAL_in_Sewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('RESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )h, (select count(*) as Total_Active_NON_RESIDENTIAL_in_Sewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )i,(select count(*) as Total_Active_NON_RESIDENTIAL_in_Water from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )j,(select count(*) as Total_Metered_Connections from eg_ws_connection where tenantid=$tenantid and additionaldetails->>'meterId' is not null)k,(select count(*) as Total_Exempted_in_Water from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )l,(select count(*) as Total_Exempted_in_Sewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )m,(select count(*) as Between_5_Marla_Water from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between - 0 and 125 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )n,(select count(*) as Between_5_Marla_Sewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )o,(select count(*) as Between_6_10_Marla_Water from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )p,(select count(*) as Between_6_10_Marla_Sewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )q,(select count(*) as More_than_10_Marla_Water from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid )r, (select count(*) as More_than_10_Marla_Sewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status='ACTIVE') and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)s; + select a.*, b.*,c.*, d.*,e.*,f.*,g.*,h.*,i.*, j.*,k.*,l.*,m.*, + n.*,o.*,p.*,q.*,r.*,s.* from (select count (*) as totalwaterconnections from eg_ws_connection where tenantid=$tenantid)a, + (select count (*) as totalsewerageconnections from eg_sw_connection where tenantid=$tenantid)b, + (SELECT SUM(cnt) AS bothconnection FROM ( SELECT COUNT(*) AS cnt FROM eg_ws_connection where tenantid=$tenantid UNION ALL SELECT COUNT(*) AS cnt FROM eg_sw_connection where tenantid=$tenantid) AS Both_Connection)c, + (select count(*) as totalwateractive from eg_ws_connection where applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)d, + (select count(*) as totalsewerageactive from eg_sw_connection where applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)e, + (SELECT SUM(cnt) AS bothactiveconnection FROM (SELECT COUNT(*) AS cnt FROM eg_ws_connection where tenantid=$tenantid and applicationstatus='CONNECTION_ACTIVATED' UNION ALL SELECT COUNT(*) AS cnt FROM eg_sw_connection where tenantid=$tenantid and applicationstatus='CONNECTION_ACTIVATED') AS "Both ACTIVE Connection")f, + (select count(*) as totalactiveresidentialinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('RESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)g, + (select count(*) as totalactiveresidentialinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('RESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)h, + (select count(*) as totalactivenonresidentialinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)i, + (select count(*) as totalactivenonresidentialinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)j, + (select count(*) as totalmeteredconnections from eg_ws_connection where tenantid=$tenantid and additionaldetails->>'meterId' is not null)k, + (select count(*) as totalexemptedinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)l, + (select count(*) as totalexemptedinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)m, + (select count(*) as betweenfivemarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)n, + (select count(*) as betweenfivemarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)o, + (select count(*) as betweensixmarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)p, + (select count(*) as betweensixandtenmarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)q, + (select count(*) as morethantenmarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)r, + (select count(*) as morethantenmarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status='ACTIVE') and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)s; From 6e3464a1e6c8be7e627898b0b977b3c95eee8518 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 15 Feb 2024 11:30:01 +0530 Subject: [PATCH 1308/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 44 ++++++++++---------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index dc12d9d33..89eadb7a1 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2051,97 +2051,87 @@ ReportDefinitions: label: reports.ws.totalwaterconnections type: string source: ws - total: false -- name: totalsewerageconnections - label: reports.ws.totalsewerageconnections - type: string - source: ws - total: false -- name: bothconnection - label: reports.ws.bothconnection - type: string - source: ws - total: false + total: true - name: totalwateractive label: reports.ws.totalwateractive type: string source: ws - total: false + total: true - name: totalsewerageactive label: reports.ws.totalsewerageactive type: string source: ws - total: false + total: true - name: bothactiveconnection label: reports.ws.bothactiveconnection type: string source: ws - total: false + total: true - name: totalactiveresidentialinwater label: reports.ws.totalactiveresidentialinwater type: string source: ws - total: false + total: true - name: totalactiveresidentialinsewerage label: reports.ws.totalactiveresidentialinsewerage type: string source: ws - total: false + total: true - name: totalactivenonresidentialinsewerage label: reports.ws.totalactivenonresidentialinsewerage type: string source: ws - total: false + total: true - name: totalactivenonresidentialinwater label: reports.ws.totalactivenonresidentialinwater type: string source: ws - total: false + total: true - name: totalmeteredconnections label: reports.ws.totalmeteredconnections type: string source: ws - total: false + total: true - name: Total_Exempted_in_Water label: reports.ws.Total_Exempted_in_Water type: string source: ws - total: false + total: true - name: totalexemptedinwater label: reports.ws.totalexemptedinwater type: string source: ws - total: false + total: true - name: betweenfivemarlawater label: reports.ws.betweenfivemarlawater type: string source: ws - total: false + total: true - name: betweenfivemarlasewerage label: reports.ws.betweenfivemarlasewerage type: string source: ws - total: false + total: true - name: betweensixmarlawater label: reports.ws.betweensixmarlawater type: string source: ws - total: false + total: true - name: betweensixandtenmarlasewerage label: reports.ws.betweensixandtenmarlasewerage type: string source: ws - total: false + total: true - name: morethantenmarlawater label: reports.ws.morethantenmarlawater type: string source: ws - total: false + total: true - name: morethantenmarlasewerage label: reports.ws.morethantenmarlasewerage type: string source: ws - total: false + total: true searchParams: - name: fromDate label: reports.pt.fromDate From 64e24b168ea91f8f20a5d03bcc45728fc1476626 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 15 Feb 2024 11:46:13 +0530 Subject: [PATCH 1309/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 49 +++++++++++--------------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 89eadb7a1..a3cc4a699 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2132,32 +2132,25 @@ ReportDefinitions: type: string source: ws total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: and 1=1 query: | - -- Use CTE to force query plan, compute & use CTE later - select a.*, b.*,c.*, d.*,e.*,f.*,g.*,h.*,i.*, j.*,k.*,l.*,m.*, - n.*,o.*,p.*,q.*,r.*,s.* from (select count (*) as totalwaterconnections from eg_ws_connection where tenantid=$tenantid)a, - (select count (*) as totalsewerageconnections from eg_sw_connection where tenantid=$tenantid)b, - (SELECT SUM(cnt) AS bothconnection FROM ( SELECT COUNT(*) AS cnt FROM eg_ws_connection where tenantid=$tenantid UNION ALL SELECT COUNT(*) AS cnt FROM eg_sw_connection where tenantid=$tenantid) AS Both_Connection)c, - (select count(*) as totalwateractive from eg_ws_connection where applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)d, - (select count(*) as totalsewerageactive from eg_sw_connection where applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)e, - (SELECT SUM(cnt) AS bothactiveconnection FROM (SELECT COUNT(*) AS cnt FROM eg_ws_connection where tenantid=$tenantid and applicationstatus='CONNECTION_ACTIVATED' UNION ALL SELECT COUNT(*) AS cnt FROM eg_sw_connection where tenantid=$tenantid and applicationstatus='CONNECTION_ACTIVATED') AS "Both ACTIVE Connection")f, - (select count(*) as totalactiveresidentialinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('RESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)g, - (select count(*) as totalactiveresidentialinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('RESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)h, - (select count(*) as totalactivenonresidentialinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)i, - (select count(*) as totalactivenonresidentialinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)j, - (select count(*) as totalmeteredconnections from eg_ws_connection where tenantid=$tenantid and additionaldetails->>'meterId' is not null)k, - (select count(*) as totalexemptedinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)l, - (select count(*) as totalexemptedinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)m, - (select count(*) as betweenfivemarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)n, - (select count(*) as betweenfivemarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)o, - (select count(*) as betweensixmarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)p, - (select count(*) as betweensixandtenmarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)q, - (select count(*) as morethantenmarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)r, - (select count(*) as morethantenmarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status='ACTIVE') and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)s; + -- Use CTE to force query plan, compute & use CTE later + select a.*, b.*,c.*, d.*,e.*,f.*,g.*,h.*,i.*, j.*,k.*,l.*,m.*, + n.*,o.*,p.*,q.*,r.*,s.* from (select count (*) as totalwaterconnections from eg_ws_connection where tenantid=$tenantid)a, + (select count (*) as totalsewerageconnections from eg_sw_connection where tenantid=$tenantid)b, + (SELECT SUM(cnt) AS bothconnection FROM ( SELECT COUNT(*) AS cnt FROM eg_ws_connection where tenantid=$tenantid UNION ALL SELECT COUNT(*) AS cnt FROM eg_sw_connection where tenantid=$tenantid) AS Both_Connection)c, + (select count(*) as totalwateractive from eg_ws_connection where applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)d, + (select count(*) as totalsewerageactive from eg_sw_connection where applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)e, + (SELECT SUM(cnt) AS bothactiveconnection FROM (SELECT COUNT(*) AS cnt FROM eg_ws_connection where tenantid=$tenantid and applicationstatus='CONNECTION_ACTIVATED' UNION ALL SELECT COUNT(*) AS cnt FROM eg_sw_connection where tenantid=$tenantid and applicationstatus='CONNECTION_ACTIVATED') AS "Both ACTIVE Connection")f, + (select count(*) as totalactiveresidentialinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('RESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)g, + (select count(*) as totalactiveresidentialinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('RESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)h, + (select count(*) as totalactivenonresidentialinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)i, + (select count(*) as totalactivenonresidentialinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)j, + (select count(*) as totalmeteredconnections from eg_ws_connection where tenantid=$tenantid and additionaldetails->>'meterId' is not null)k, + (select count(*) as totalexemptedinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)l, + (select count(*) as totalexemptedinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)m, + (select count(*) as betweenfivemarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)n, + (select count(*) as betweenfivemarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)o, + (select count(*) as betweensixmarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)p, + (select count(*) as betweensixandtenmarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)q, + (select count(*) as morethantenmarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)r, + (select count(*) as morethantenmarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status='ACTIVE') and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)s; From ab8bf7fb646cc6e41714691dc1f2028af47faac7 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 15 Feb 2024 12:01:36 +0530 Subject: [PATCH 1310/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 80 -------------------------- 1 file changed, 80 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index a3cc4a699..c4899c75b 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2052,86 +2052,6 @@ ReportDefinitions: type: string source: ws total: true -- name: totalwateractive - label: reports.ws.totalwateractive - type: string - source: ws - total: true -- name: totalsewerageactive - label: reports.ws.totalsewerageactive - type: string - source: ws - total: true -- name: bothactiveconnection - label: reports.ws.bothactiveconnection - type: string - source: ws - total: true -- name: totalactiveresidentialinwater - label: reports.ws.totalactiveresidentialinwater - type: string - source: ws - total: true -- name: totalactiveresidentialinsewerage - label: reports.ws.totalactiveresidentialinsewerage - type: string - source: ws - total: true -- name: totalactivenonresidentialinsewerage - label: reports.ws.totalactivenonresidentialinsewerage - type: string - source: ws - total: true -- name: totalactivenonresidentialinwater - label: reports.ws.totalactivenonresidentialinwater - type: string - source: ws - total: true -- name: totalmeteredconnections - label: reports.ws.totalmeteredconnections - type: string - source: ws - total: true -- name: Total_Exempted_in_Water - label: reports.ws.Total_Exempted_in_Water - type: string - source: ws - total: true -- name: totalexemptedinwater - label: reports.ws.totalexemptedinwater - type: string - source: ws - total: true -- name: betweenfivemarlawater - label: reports.ws.betweenfivemarlawater - type: string - source: ws - total: true -- name: betweenfivemarlasewerage - label: reports.ws.betweenfivemarlasewerage - type: string - source: ws - total: true -- name: betweensixmarlawater - label: reports.ws.betweensixmarlawater - type: string - source: ws - total: true -- name: betweensixandtenmarlasewerage - label: reports.ws.betweensixandtenmarlasewerage - type: string - source: ws - total: true -- name: morethantenmarlawater - label: reports.ws.morethantenmarlawater - type: string - source: ws - total: true -- name: morethantenmarlasewerage - label: reports.ws.morethantenmarlasewerage - type: string - source: ws - total: true query: | -- Use CTE to force query plan, compute & use CTE later select a.*, b.*,c.*, d.*,e.*,f.*,g.*,h.*,i.*, j.*,k.*,l.*,m.*, From 2cde4b74b565a1cbc6029f5121110d307441f66e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 15 Feb 2024 12:10:37 +0530 Subject: [PATCH 1311/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index c4899c75b..2b6b64dba 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2047,11 +2047,11 @@ ReportDefinitions: print: pdfPageSize: A1 sourceColumns: -- name: totalwaterconnections - label: reports.ws.totalwaterconnections - type: string - source: ws - total: true + - name: totalwaterconnections + label: reports.ws.totalwaterconnections + type: string + source: ws + total: true query: | -- Use CTE to force query plan, compute & use CTE later select a.*, b.*,c.*, d.*,e.*,f.*,g.*,h.*,i.*, j.*,k.*,l.*,m.*, From 57c92738cecb6d5282aa645aa9d8168662a14a22 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 15 Feb 2024 12:21:01 +0530 Subject: [PATCH 1312/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 80 ++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 2b6b64dba..76dc7b70e 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2052,6 +2052,86 @@ ReportDefinitions: type: string source: ws total: true + - name: totalwateractive + label: reports.ws.totalwateractive + type: string + source: ws + total: true + - name: totalsewerageactive + label: reports.ws.totalsewerageactive + type: string + source: ws + total: true + - name: bothactiveconnection + label: reports.ws.bothactiveconnection + type: string + source: ws + total: true + - name: totalactiveresidentialinwater + label: reports.ws.totalactiveresidentialinwater + type: string + source: ws + total: true + - name: totalactiveresidentialinsewerage + label: reports.ws.totalactiveresidentialinsewerage + type: string + source: ws + total: true + - name: totalactivenonresidentialinsewerage + label: reports.ws.totalactivenonresidentialinsewerage + type: string + source: ws + total: true + - name: totalactivenonresidentialinwater + label: reports.ws.totalactivenonresidentialinwater + type: string + source: ws + total: true + - name: totalmeteredconnections + label: reports.ws.totalmeteredconnections + type: string + source: ws + total: true + - name: Total_Exempted_in_Water + label: reports.ws.Total_Exempted_in_Water + type: string + source: ws + total: true + - name: totalexemptedinwater + label: reports.ws.totalexemptedinwater + type: string + source: ws + total: true + - name: betweenfivemarlawater + label: reports.ws.betweenfivemarlawater + type: string + source: ws + total: true + - name: betweenfivemarlasewerage + label: reports.ws.betweenfivemarlasewerage + type: string + source: ws + total: true + - name: betweensixmarlawater + label: reports.ws.betweensixmarlawater + type: string + source: ws + total: true + - name: betweensixandtenmarlasewerage + label: reports.ws.betweensixandtenmarlasewerage + type: string + source: ws + total: true + - name: morethantenmarlawater + label: reports.ws.morethantenmarlawater + type: string + source: ws + total: true + - name: morethantenmarlasewerage + label: reports.ws.morethantenmarlasewerage + type: string + source: ws + total: true query: | -- Use CTE to force query plan, compute & use CTE later select a.*, b.*,c.*, d.*,e.*,f.*,g.*,h.*,i.*, j.*,k.*,l.*,m.*, From ce2b719e6b148ebb7b7e3013639a4698e0576841 Mon Sep 17 00:00:00 2001 From: Atul Sharma <89570609+atul6261@users.noreply.github.com> Date: Thu, 15 Feb 2024 12:31:22 +0530 Subject: [PATCH 1313/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 76dc7b70e..9b595ad27 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2052,6 +2052,11 @@ ReportDefinitions: type: string source: ws total: true + - name: totalsewerageconnections + label: reports.ws.totalwaterconnections + type: string + source: ws + total: true - name: totalwateractive label: reports.ws.totalwateractive type: string From e9d99d1ca94b55db3d5831e568b6040c20de23f0 Mon Sep 17 00:00:00 2001 From: Atul Sharma <89570609+atul6261@users.noreply.github.com> Date: Thu, 15 Feb 2024 12:40:30 +0530 Subject: [PATCH 1314/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 9b595ad27..d525f86d0 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2053,7 +2053,7 @@ ReportDefinitions: source: ws total: true - name: totalsewerageconnections - label: reports.ws.totalwaterconnections + label: reports.ws.totalsewerageconnections type: string source: ws total: true From d9da4de0c982ad15844655d41239cddb9bb06eba Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 29 Feb 2024 11:26:26 +0530 Subject: [PATCH 1315/1630] Update tl-reports.yml --- configs/reports/configs/tl-reports.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index e023d98ad..48b75951e 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2427,7 +2427,13 @@ ReportDefinitions: 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' + and tenantid in ('pb.khanna','pb.shahkot','pb.handiaya','pb.lalru','pb.dasuya','pb.sultanpurlodhi','pb.zirakpur','pb.adampur','pb.alawalpur','pb.bassipathana','pb.bhogpur','pb.hariana','pb.shamchurasi','pb.sunam','pb.urmartanda', + 'pb.hoshiarpur','pb.mudki','pb.dirba','pb.khanauri','pb.mahilpur','pb.makhu','pb.mallanwala','pb.sangatmandi','pb.arniwala','pb.balachaur','pb.batala','pb.bhawanigarh', + 'pb.derabassi','pb.dhuri','pb.faridkot','pb.fazilka','pb.garhdiwala','pb.gurdaspur','pb.jalalabad','pb.kartarpur','pb.machhiwara','pb.jagraon','pb.dharamkot','pb.muktsar','pb.nawanshahr','pb.rajpura','pb.samana','pb.sahnewal',pb.sangrur', + 'pb.sirhind','pb.talwara','pb.zira','pb.ajnala','pb.maluka','pb.nathana','pb.patti','pb.rayya','pb.tapa','pb.garhshankar','pb.badhnikalan','pb.bhikhiwind','pb.boha','pb.ghagga','pb.gidderbaha','pb.goraya','pb.khamano','pb.kotfatta','pb.kotshamir', + 'pb.mandikalan','pb.nihalsinghwala','pb.rahon','pb.rajasansi','pb.ropar','pb.samrala','pb.sanaur','pb.srihargobindpur','pb.lehragaga','pb.ahmedgarh','pb.amloh','pb.baghapurana','pb.balianwali','pb.bareta','pb.bariwala','pb.barnala','pb.bhadson','pb.cheema', + 'pb.doraha','pb.ghanaur','pb.goniana','pb.kharar','pb.kotissekhan','pb.kotkapura','pb.kurali','pb.lohiankhas','pb.longowal','pb.maloud','pb.mansa','pb.maur','pb.mehraj','pb.morinda','pb.mukerian','pb.mullanpur','pb.nayagaon','pb.patran','pb.phillaur','pb.raikot', + 'pb.raman','pb.sujanpur','pb.talwandisabo','pb.tarntaran') orderby: order by tenantid From aba240a5e01db2aef5c1032d7a3f51021d0ebfea Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 29 Feb 2024 11:40:05 +0530 Subject: [PATCH 1316/1630] 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 48b75951e..3f535f9ba 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2429,7 +2429,7 @@ ReportDefinitions: 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 in ('pb.khanna','pb.shahkot','pb.handiaya','pb.lalru','pb.dasuya','pb.sultanpurlodhi','pb.zirakpur','pb.adampur','pb.alawalpur','pb.bassipathana','pb.bhogpur','pb.hariana','pb.shamchurasi','pb.sunam','pb.urmartanda', 'pb.hoshiarpur','pb.mudki','pb.dirba','pb.khanauri','pb.mahilpur','pb.makhu','pb.mallanwala','pb.sangatmandi','pb.arniwala','pb.balachaur','pb.batala','pb.bhawanigarh', - 'pb.derabassi','pb.dhuri','pb.faridkot','pb.fazilka','pb.garhdiwala','pb.gurdaspur','pb.jalalabad','pb.kartarpur','pb.machhiwara','pb.jagraon','pb.dharamkot','pb.muktsar','pb.nawanshahr','pb.rajpura','pb.samana','pb.sahnewal',pb.sangrur', + 'pb.derabassi','pb.dhuri','pb.faridkot','pb.fazilka','pb.garhdiwala','pb.gurdaspur','pb.jalalabad','pb.kartarpur','pb.machhiwara','pb.jagraon','pb.dharamkot','pb.muktsar','pb.nawanshahr','pb.rajpura','pb.samana','pb.sahnewal','pb.sangrur', 'pb.sirhind','pb.talwara','pb.zira','pb.ajnala','pb.maluka','pb.nathana','pb.patti','pb.rayya','pb.tapa','pb.garhshankar','pb.badhnikalan','pb.bhikhiwind','pb.boha','pb.ghagga','pb.gidderbaha','pb.goraya','pb.khamano','pb.kotfatta','pb.kotshamir', 'pb.mandikalan','pb.nihalsinghwala','pb.rahon','pb.rajasansi','pb.ropar','pb.samrala','pb.sanaur','pb.srihargobindpur','pb.lehragaga','pb.ahmedgarh','pb.amloh','pb.baghapurana','pb.balianwali','pb.bareta','pb.bariwala','pb.barnala','pb.bhadson','pb.cheema', 'pb.doraha','pb.ghanaur','pb.goniana','pb.kharar','pb.kotissekhan','pb.kotkapura','pb.kurali','pb.lohiankhas','pb.longowal','pb.maloud','pb.mansa','pb.maur','pb.mehraj','pb.morinda','pb.mukerian','pb.mullanpur','pb.nayagaon','pb.patran','pb.phillaur','pb.raikot', From 73654ebfc9caa8f72ed25044569c05fb79756f49 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 29 Feb 2024 12:02:13 +0530 Subject: [PATCH 1317/1630] Update tl-reports.yml --- configs/reports/configs/tl-reports.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 3f535f9ba..b0f498aef 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2427,13 +2427,7 @@ ReportDefinitions: 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 in ('pb.khanna','pb.shahkot','pb.handiaya','pb.lalru','pb.dasuya','pb.sultanpurlodhi','pb.zirakpur','pb.adampur','pb.alawalpur','pb.bassipathana','pb.bhogpur','pb.hariana','pb.shamchurasi','pb.sunam','pb.urmartanda', - 'pb.hoshiarpur','pb.mudki','pb.dirba','pb.khanauri','pb.mahilpur','pb.makhu','pb.mallanwala','pb.sangatmandi','pb.arniwala','pb.balachaur','pb.batala','pb.bhawanigarh', - 'pb.derabassi','pb.dhuri','pb.faridkot','pb.fazilka','pb.garhdiwala','pb.gurdaspur','pb.jalalabad','pb.kartarpur','pb.machhiwara','pb.jagraon','pb.dharamkot','pb.muktsar','pb.nawanshahr','pb.rajpura','pb.samana','pb.sahnewal','pb.sangrur', - 'pb.sirhind','pb.talwara','pb.zira','pb.ajnala','pb.maluka','pb.nathana','pb.patti','pb.rayya','pb.tapa','pb.garhshankar','pb.badhnikalan','pb.bhikhiwind','pb.boha','pb.ghagga','pb.gidderbaha','pb.goraya','pb.khamano','pb.kotfatta','pb.kotshamir', - 'pb.mandikalan','pb.nihalsinghwala','pb.rahon','pb.rajasansi','pb.ropar','pb.samrala','pb.sanaur','pb.srihargobindpur','pb.lehragaga','pb.ahmedgarh','pb.amloh','pb.baghapurana','pb.balianwali','pb.bareta','pb.bariwala','pb.barnala','pb.bhadson','pb.cheema', - 'pb.doraha','pb.ghanaur','pb.goniana','pb.kharar','pb.kotissekhan','pb.kotkapura','pb.kurali','pb.lohiankhas','pb.longowal','pb.maloud','pb.mansa','pb.maur','pb.mehraj','pb.morinda','pb.mukerian','pb.mullanpur','pb.nayagaon','pb.patran','pb.phillaur','pb.raikot', - 'pb.raman','pb.sujanpur','pb.talwandisabo','pb.tarntaran') + and tenantid in ('pb.derababananak','pb.jandialaguru','pb.amargarh','pb.banur','pb.begowal','pb.bhadaur','pb.bhikhi','pb.bhuchomandi','pb.budhlada','pb.chamkaursahib','pb.chaunke','pb.dhanaula','pb.dhilwan','pb.dinanagar','pb.ferozepur','pb.guruharsahai','pb.kapurthala','pb.khemkaran','pb.kothaguru','pb.majitha','pb.mandigobindgarh','pb.mehatpur','pb.nabha','pb.nadala','pb.nakodar','pb.nurmahal','pb.payal','pb.sardulgarh','pb.abohar','pb.anandpursahib','pb.bhagtabhai','pb.bhairoopa','pb.bhulath','pb.fatehgarhchurian','pb.lehramohabbat','pb.malout','pb.nangal','pb.quadian','pb.rampuraphul','pb.talwandibhai','pb.banga','pb.jaitu','pb.malerkotla','pb.mamdot','pb.ramdass','pb.moonak','pb.dhariwal','pb.rampura','pb.kiratpur','pb.moga','pb.jalandhar','pb.bilga','pb.phagwara','pb.pathankot','pb.fatehgarhpanjtoor','pb.amritsar','pb.itpatiala','pb.mohali','pb.patiala','pb.narotjaimalsingh') orderby: order by tenantid From 5770678d8a30a8d152acf170c770ffdf73a3ed6d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 29 Feb 2024 12:15:42 +0530 Subject: [PATCH 1318/1630] Update tl-reports.yml --- configs/reports/configs/tl-reports.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index b0f498aef..459127118 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2408,6 +2408,19 @@ ReportDefinitions: 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 split_part(tenantid,'.',2) as ulb, @@ -2427,7 +2440,7 @@ ReportDefinitions: 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 in ('pb.derababananak','pb.jandialaguru','pb.amargarh','pb.banur','pb.begowal','pb.bhadaur','pb.bhikhi','pb.bhuchomandi','pb.budhlada','pb.chamkaursahib','pb.chaunke','pb.dhanaula','pb.dhilwan','pb.dinanagar','pb.ferozepur','pb.guruharsahai','pb.kapurthala','pb.khemkaran','pb.kothaguru','pb.majitha','pb.mandigobindgarh','pb.mehatpur','pb.nabha','pb.nadala','pb.nakodar','pb.nurmahal','pb.payal','pb.sardulgarh','pb.abohar','pb.anandpursahib','pb.bhagtabhai','pb.bhairoopa','pb.bhulath','pb.fatehgarhchurian','pb.lehramohabbat','pb.malout','pb.nangal','pb.quadian','pb.rampuraphul','pb.talwandibhai','pb.banga','pb.jaitu','pb.malerkotla','pb.mamdot','pb.ramdass','pb.moonak','pb.dhariwal','pb.rampura','pb.kiratpur','pb.moga','pb.jalandhar','pb.bilga','pb.phagwara','pb.pathankot','pb.fatehgarhpanjtoor','pb.amritsar','pb.itpatiala','pb.mohali','pb.patiala','pb.narotjaimalsingh') + and tenantid! ='pb.testing' orderby: order by tenantid From c67f34b123a838a40bd4f7b77a9adf1699fc139b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 11 Mar 2024 10:20:10 +0530 Subject: [PATCH 1319/1630] 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 459127118..544a21cea 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 and payment.paymentstatus!='CANCELLED' + WHERE tl.tenantid = $tenantid and payment.paymentstatus!='CANCELLED' orderby: ORDER BY egcl_paymentdetail.receiptnumber DESC; - reportName: StateTradeLicenseCancelledRegistryReport_v2 From 62297db04a113fa57fea5ace4f4baa8b02d5c2c4 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Tue, 12 Mar 2024 15:46:52 +0530 Subject: [PATCH 1320/1630] Update ws-onetime-receipt.json --- .../pdf-service/data-config/ws-onetime-receipt.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index d5a70579a..545ff0b07 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -18,6 +18,18 @@ "value": { "path": "$.payerName" } + }, + { + "variable": "UsageCategory", + "value": { + "path": "$.usageCategory" + } + }, + { + "variable": "ADdress", + "value": { + "path": "$.address" + } }, { "variable": "user-name", From 5b81766b1169bda54536cbe955ce54050938981a Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Tue, 12 Mar 2024 15:49:07 +0530 Subject: [PATCH 1321/1630] 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 9a2696309..361765801 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -231,6 +231,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", @@ -583,6 +626,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", From 88049c006e53335830de568de6d477fd30dd530b Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Wed, 13 Mar 2024 10:30:47 +0530 Subject: [PATCH 1322/1630] Update land area ws-onetime-receipt.json --- .../format-config/ws-onetime-receipt.json | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 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 361765801..eb9fffcd7 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -316,8 +316,30 @@ "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" + } + ] ] }, "layout": {} From 341835694629c85ccac44875768a0eae7646c798 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 14 Mar 2024 12:15:52 +0530 Subject: [PATCH 1323/1630] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 9c7eb43ad..5959a2c41 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3492,7 +3492,12 @@ ReportDefinitions: label: reports.pt.mobileno type: string source: pt - total: false + total: false + - name: usagecategory + label: reports.pt.usagecategory + type: string + source: pt + total: false - name: address label: reports.pt.address type: string @@ -3579,6 +3584,7 @@ ReportDefinitions: --pot.occupancytype as occupancy, --pot.propertytype as propertytype, --pta.locality as "localitycode", + pt.usagecategory as usagecategory, localnames.localityname as localityname from egcl_paymentdetail as payd inner join egcl_payment as payment on payment.id = payd.paymentid From b63d6103b136016327c3f3474ed82f710b24ad52 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 15 Mar 2024 15:10:43 +0530 Subject: [PATCH 1324/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 30 +++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index d525f86d0..f3c5fe875 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2143,19 +2143,19 @@ ReportDefinitions: n.*,o.*,p.*,q.*,r.*,s.* from (select count (*) as totalwaterconnections from eg_ws_connection where tenantid=$tenantid)a, (select count (*) as totalsewerageconnections from eg_sw_connection where tenantid=$tenantid)b, (SELECT SUM(cnt) AS bothconnection FROM ( SELECT COUNT(*) AS cnt FROM eg_ws_connection where tenantid=$tenantid UNION ALL SELECT COUNT(*) AS cnt FROM eg_sw_connection where tenantid=$tenantid) AS Both_Connection)c, - (select count(*) as totalwateractive from eg_ws_connection where applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)d, - (select count(*) as totalsewerageactive from eg_sw_connection where applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)e, - (SELECT SUM(cnt) AS bothactiveconnection FROM (SELECT COUNT(*) AS cnt FROM eg_ws_connection where tenantid=$tenantid and applicationstatus='CONNECTION_ACTIVATED' UNION ALL SELECT COUNT(*) AS cnt FROM eg_sw_connection where tenantid=$tenantid and applicationstatus='CONNECTION_ACTIVATED') AS "Both ACTIVE Connection")f, - (select count(*) as totalactiveresidentialinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('RESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)g, - (select count(*) as totalactiveresidentialinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('RESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)h, - (select count(*) as totalactivenonresidentialinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)i, - (select count(*) as totalactivenonresidentialinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)j, + (select count(*) as totalwateractive from eg_ws_connection where status='Active' and tenantid=$tenantid)d, + (select count(*) as totalsewerageactive from eg_sw_connection where status='Active' and tenantid=$tenantid)e, + (SELECT SUM(cnt) AS bothactiveconnection FROM (SELECT COUNT(*) AS cnt FROM eg_ws_connection where tenantid=$tenantid and status='Active' UNION ALL SELECT COUNT(*) AS cnt FROM eg_sw_connection where tenantid=$tenantid and status='Active') AS "Both ACTIVE Connection")f, + (select count(*) as totalactiveresidentialinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('RESIDENTIAL')) and status='Active' and tenantid=$tenantid)g, + (select count(*) as totalactiveresidentialinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('RESIDENTIAL')) and status='Active' and tenantid=$tenantid)h, + (select count(*) as totalactivenonresidentialinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and status='Active' and tenantid=$tenantid)i, + (select count(*) as totalactivenonresidentialinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and status='Active' and tenantid=$tenantid)j, (select count(*) as totalmeteredconnections from eg_ws_connection where tenantid=$tenantid and additionaldetails->>'meterId' is not null)k, - (select count(*) as totalexemptedinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)l, - (select count(*) as totalexemptedinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)m, - (select count(*) as betweenfivemarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)n, - (select count(*) as betweenfivemarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)o, - (select count(*) as betweensixmarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)p, - (select count(*) as betweensixandtenmarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)q, - (select count(*) as morethantenmarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status='ACTIVE')and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)r, - (select count(*) as morethantenmarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status='ACTIVE') and applicationstatus='CONNECTION_ACTIVATED' and tenantid=$tenantid)s; + (select count(*) as totalexemptedinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and status='Active' and tenantid=$tenantid)l, + (select count(*) as totalexemptedinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and status='Active' and tenantid=$tenantid)m, + (select count(*) as betweenfivemarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE')and status='Active' and tenantid=$tenantid)n, + (select count(*) as betweenfivemarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE')and status='Active' and tenantid=$tenantid)o, + (select count(*) as betweensixmarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE')and status='Active' and tenantid=$tenantid)p, + (select count(*) as betweensixandtenmarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE')and status='Active' and tenantid=$tenantid)q, + (select count(*) as morethantenmarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status='ACTIVE')and status='Active' and tenantid=$tenantid)r, + (select count(*) as morethantenmarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status='ACTIVE') and status='Active' and tenantid=$tenantid)s; From d7b25fbe49ec27c983dfbe20b7471fedc1448e5d Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Fri, 15 Mar 2024 16:07:25 +0530 Subject: [PATCH 1325/1630] revert ws-onetime-receipt.json --- .../pdf-service/data-config/ws-onetime-receipt.json | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index 545ff0b07..16e87d973 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -20,18 +20,6 @@ } }, { - "variable": "UsageCategory", - "value": { - "path": "$.usageCategory" - } - }, - { - "variable": "ADdress", - "value": { - "path": "$.address" - } - }, - { "variable": "user-name", "value": { "path": "$.userInfo.name" From 32af353b716c3e6614130b2a036fcfc111b6dc09 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Fri, 15 Mar 2024 16:08:15 +0530 Subject: [PATCH 1326/1630] Revert ws-onetime-receipt.json --- .../format-config/ws-onetime-receipt.json | 198 ++++++------------ 1 file changed, 60 insertions(+), 138 deletions(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index eb9fffcd7..81954b29f 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -9,9 +9,9 @@ "style": "noc-head", "table": { "widths": [ - 40, - 500, - 20 + 60, + "*", + 120 ], "body": [ [ @@ -26,26 +26,34 @@ "text": "{{logo-header}} {{mcGradePwssb}}", "style": "receipt-logo-header" }, - { - "text": "{{address}}" - }, - { - "text": "{{website}}" - }, { "text": "{{serviceType}} {{payment_receipt}}(Employee Copy)", - "style": "receipt-logo-sub-header-ASR" + "style": "receipt-logo-sub-header" } ], "alignment": "center", "margin": [ - 60, + 0, 7, 0, 0 ] + }, + { + "stack": [ + { + "text": "{{address}}", + "style": "receipt-address-header" + }, + { + "text": "{{website}}", + "style": "receipt-website-header" + } + + ] + } - ] + ] ] }, "layout": "noBorders" @@ -230,50 +238,8 @@ "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", @@ -316,30 +282,8 @@ "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" - } - ] + ] }, "layout": {} @@ -426,9 +370,9 @@ "style": "noc-head", "table": { "widths": [ - 40, - 500, - 20 + 60, + "*", + 120 ], "body": [ [ @@ -443,24 +387,42 @@ "text": "{{logo-header}} {{mcGradePwssb}}", "style": "receipt-logo-header" }, - { - "text": "{{address}}" - }, - { - "text": "{{website}}" - }, { "text": "{{serviceType}} {{payment_receipt}}(Citizen Copy)", "style": "receipt-logo-sub-header" } ], - "alignment": "center", + "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 + ] } ] ] @@ -647,50 +609,8 @@ "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", @@ -833,7 +753,7 @@ 0, 0, 0, - 2 + 0 ] }, "receipt-logo-sub-header": { @@ -841,10 +761,12 @@ "fontSize": 12, "letterSpacing": 0.6 }, - "receipt-logo-sub-header-ASR": { - "color": "#000000", - "fontSize": 12, - "letterSpacing": 0.6 + + "receipt-address-header": { + "absolutePosition" : { + "x" : 500, + "y" : 300 + } }, "noc-table": { "fontSize": 12, From 006d86a123d9b229260cd99447e9fe2adf608cfd Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Fri, 15 Mar 2024 16:16:00 +0530 Subject: [PATCH 1327/1630] Revert ws-onetime-receipt.json --- .../format-config/ws-onetime-receipt.json | 112 ++++++++---------- 1 file changed, 52 insertions(+), 60 deletions(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 81954b29f..985a4a581 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -9,9 +9,9 @@ "style": "noc-head", "table": { "widths": [ - 60, - "*", - 120 + 40, + 500, + 20 ], "body": [ [ @@ -26,34 +26,26 @@ "text": "{{logo-header}} {{mcGradePwssb}}", "style": "receipt-logo-header" }, + { + "text": "{{address}}" + }, + { + "text": "{{website}}" + }, { "text": "{{serviceType}} {{payment_receipt}}(Employee Copy)", - "style": "receipt-logo-sub-header" + "style": "receipt-logo-sub-header-ASR" } ], "alignment": "center", "margin": [ - 0, + 60, 7, 0, 0 ] - }, - { - "stack": [ - { - "text": "{{address}}", - "style": "receipt-address-header" - }, - { - "text": "{{website}}", - "style": "receipt-website-header" - } - - ] - } - ] + ] ] }, "layout": "noBorders" @@ -238,8 +230,7 @@ "style": "receipt-table" } - ], - + ], [ { "text": "Bank Name", @@ -282,8 +273,30 @@ "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" + } + ] ] }, "layout": {} @@ -370,9 +383,9 @@ "style": "noc-head", "table": { "widths": [ - 60, - "*", - 120 + 40, + 500, + 20 ], "body": [ [ @@ -387,41 +400,23 @@ "text": "{{logo-header}} {{mcGradePwssb}}", "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}}" + "text": "{{serviceType}} {{payment_receipt}}(Citizen Copy)", + "style": "receipt-logo-sub-header" } ], - "alignment": "right", - "color": "#484848", + "alignment": "center", "margin": [ - -100, + 13, + 7, 0, - -25, - -3 + 0 ] } ] @@ -609,8 +604,7 @@ "style": "receipt-table" } - ], - + ], [ { "text": "Bank Name", @@ -753,7 +747,7 @@ 0, 0, 0, - 0 + 2 ] }, "receipt-logo-sub-header": { @@ -761,12 +755,10 @@ "fontSize": 12, "letterSpacing": 0.6 }, - - "receipt-address-header": { - "absolutePosition" : { - "x" : 500, - "y" : 300 - } + "receipt-logo-sub-header-ASR": { + "color": "#000000", + "fontSize": 12, + "letterSpacing": 0.6 }, "noc-table": { "fontSize": 12, From 1903be27cf4c2debf24d0faf7ee4b7d7db29a464 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Fri, 15 Mar 2024 16:18:13 +0530 Subject: [PATCH 1328/1630] Revert ws-onetime-receipt.json --- .../format-config/ws-onetime-receipt.json | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 985a4a581..bdff324dc 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -273,30 +273,8 @@ "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" - } - ] + ] }, "layout": {} From 695fc3530ac80503ea6c553ef9f7b16e77387ef2 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 19 Mar 2024 10:07:11 +0530 Subject: [PATCH 1329/1630] Update ws-reports.yml ws defaulter --- configs/reports/configs/ws-reports.yml | 86 ++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index f3c5fe875..896e6d000 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2159,3 +2159,89 @@ ReportDefinitions: (select count(*) as betweensixandtenmarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE')and status='Active' and tenantid=$tenantid)q, (select count(*) as morethantenmarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status='ACTIVE')and status='Active' and tenantid=$tenantid)r, (select count(*) as morethantenmarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status='ACTIVE') and status='Active' and tenantid=$tenantid)s; + +- reportName: WsDefaulterReport + summary: Ws Defaulter 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: total_arrear_demand_amount + label: reports.ws.total_arrear_demand_amount + type: string + source: ws + total: false + - name: current_charges_demand_amount + label: reports.ws.current_charges_demand_amount + type: string + source: ws + total: true + - name: arrear_usage_type + label: reports.ws.arrear_usage_type + type: string + source: ws + total: true + - name: current_charges_usage_type + label: reports.ws.current_charges_usage_type + type: string + source: ws + total: true + + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: and 1=1 + - name: serviceType + label: serviceType + type: singlevaluelist + pattern: 'list://WS:Water' + source: pt + isMandatory: true + searchClause: AND 1=1 + query: | + WITH quarterly_data AS ( + SELECT + d1.consumercode, + CASE + WHEN to_timestamp(d1.taxperiodfrom / 1000) < '2023-10-01'::timestamp THEN 'Arrear' + ELSE 'Current Charges' + END AS charge_category, + to_char(to_timestamp(d1.taxperiodfrom / 1000), 'YYYY-MM-DD') AS tax_period_from_date, + d2.taxamount AS demand_amount, + d2.collectionamount AS collected_amount, + d5.usagecategory AS UsageType, + ROW_NUMBER() OVER (PARTITION BY d1.consumercode ORDER BY to_timestamp(d1.taxperiodfrom / 1000) DESC) AS row_num + FROM + egbs_demand_v1 d1 + LEFT JOIN egbs_demanddetail_v1 d2 ON d1.id = d2.demandid + LEFT JOIN eg_ws_connection d4 ON d4.connectionno = d1.consumercode + LEFT JOIN eg_pt_property d5 ON d4.property_id = d5.propertyid + WHERE d1.taxperiodfrom >= '1672531200000' + AND d1.businessservice = 'WS' + AND d1.tenantid = $tenantid + AND (d2.collectionamount IS NULL OR d2.collectionamount = 0)) -- Include only pending amounts) + SELECT + consumercode, + SUM(CASE WHEN charge_category = 'Arrear' THEN demand_amount ELSE 0 END) AS total_arrear_demand_amount, + MAX(CASE WHEN charge_category = 'Current Charges' THEN demand_amount END) AS current_charges_demand_amount, + MAX(CASE WHEN charge_category = 'Arrear' AND row_num = 1 THEN UsageType END) AS arrear_usage_type, + MAX(CASE WHEN charge_category = 'Current Charges' AND row_num = 1 THEN UsageType END) AS current_charges_usage_type + FROM + + quarterly_data + GROUP BY + consumercode + ORDER BY + consumercode; + + From 7ba5d84440bb4eb15a41a00c9e1d6a33cf8457ea Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 19 Mar 2024 10:11:21 +0530 Subject: [PATCH 1330/1630] Update ws-reports.yml sw defaulter --- configs/reports/configs/ws-reports.yml | 84 ++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 896e6d000..1c0f6c9c1 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2244,4 +2244,88 @@ ReportDefinitions: ORDER BY consumercode; +- reportName: SwDefaulterReport + summary: Sw Defaulter 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: total_arrear_demand_amount + label: reports.ws.total_arrear_demand_amount + type: string + source: ws + total: false + - name: current_charges_demand_amount + label: reports.ws.current_charges_demand_amount + type: string + source: ws + total: true + - name: arrear_usage_type + label: reports.ws.arrear_usage_type + type: string + source: ws + total: true + - name: current_charges_usage_type + label: reports.ws.current_charges_usage_type + type: string + source: ws + total: true + + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: and 1=1 + - name: serviceType + label: serviceType + type: singlevaluelist + pattern: 'list://WS:Water' + source: pt + isMandatory: true + searchClause: AND 1=1 + query: | + WITH quarterly_data AS ( + SELECT + d1.consumercode, + CASE + WHEN to_timestamp(d1.taxperiodfrom / 1000) < '2023-10-01'::timestamp THEN 'Arrear' + ELSE 'Current Charges' + END AS charge_category, + to_char(to_timestamp(d1.taxperiodfrom / 1000), 'YYYY-MM-DD') AS tax_period_from_date, + d2.taxamount AS demand_amount, + d2.collectionamount AS collected_amount, + d5.usagecategory AS UsageType, + ROW_NUMBER() OVER (PARTITION BY d1.consumercode ORDER BY to_timestamp(d1.taxperiodfrom / 1000) DESC) AS row_num + FROM + egbs_demand_v1 d1 + LEFT JOIN egbs_demanddetail_v1 d2 ON d1.id = d2.demandid + LEFT JOIN eg_sw_connection d4 ON d4.connectionno = d1.consumercode + LEFT JOIN eg_pt_property d5 ON d4.property_id = d5.propertyid + WHERE d1.taxperiodfrom >= '1672531200000' + AND d1.businessservice = 'SW' + AND d1.tenantid = $tenantid + AND (d2.collectionamount IS NULL OR d2.collectionamount = 0)) -- Include only pending amounts) + SELECT + consumercode, + SUM(CASE WHEN charge_category = 'Arrear' THEN demand_amount ELSE 0 END) AS total_arrear_demand_amount, + MAX(CASE WHEN charge_category = 'Current Charges' THEN demand_amount END) AS current_charges_demand_amount, + MAX(CASE WHEN charge_category = 'Arrear' AND row_num = 1 THEN UsageType END) AS arrear_usage_type, + MAX(CASE WHEN charge_category = 'Current Charges' AND row_num = 1 THEN UsageType END) AS current_charges_usage_type + FROM + + quarterly_data + GROUP BY + consumercode + ORDER BY + consumercode; + From 0a6a7640c4d1793489cd81f8155e8fa113dc8755 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 19 Mar 2024 10:40:01 +0530 Subject: [PATCH 1331/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 1c0f6c9c1..22e7556af 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2200,14 +2200,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: and 1=1 - - name: serviceType - label: serviceType - type: singlevaluelist - pattern: 'list://WS:Water' + searchClause: AND ws.createdtime>= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch source: pt isMandatory: true - searchClause: AND 1=1 + searchClause: AND ws.createdtime<= $toDate query: | WITH quarterly_data AS ( SELECT @@ -2284,14 +2283,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: and 1=1 - - name: serviceType - label: serviceType - type: singlevaluelist - pattern: 'list://WS:Water' + searchClause: AND ws.createdtime>= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch source: pt isMandatory: true - searchClause: AND 1=1 + searchClause: AND ws.createdtime<= $toDate query: | WITH quarterly_data AS ( SELECT From a03189769aa5389097e170caa5cf9eb413870542 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 20 Mar 2024 13:09:31 +0530 Subject: [PATCH 1332/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 22e7556af..9f20599eb 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2199,13 +2199,13 @@ ReportDefinitions: label: reports.pt.fromDate type: epoch source: pt - isMandatory: true + isMandatory: false searchClause: AND ws.createdtime>= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt - isMandatory: true + isMandatory: false searchClause: AND ws.createdtime<= $toDate query: | WITH quarterly_data AS ( @@ -2282,13 +2282,13 @@ ReportDefinitions: label: reports.pt.fromDate type: epoch source: pt - isMandatory: true + isMandatory: false searchClause: AND ws.createdtime>= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt - isMandatory: true + isMandatory: false searchClause: AND ws.createdtime<= $toDate query: | WITH quarterly_data AS ( From 01586113466c9c046e2b6deecbfc44c02c2c1407 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 20 Mar 2024 14:37:03 +0530 Subject: [PATCH 1333/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 9f20599eb..e4bdbc526 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2232,9 +2232,9 @@ ReportDefinitions: SELECT consumercode, SUM(CASE WHEN charge_category = 'Arrear' THEN demand_amount ELSE 0 END) AS total_arrear_demand_amount, - MAX(CASE WHEN charge_category = 'Current Charges' THEN demand_amount END) AS current_charges_demand_amount, - MAX(CASE WHEN charge_category = 'Arrear' AND row_num = 1 THEN UsageType END) AS arrear_usage_type, - MAX(CASE WHEN charge_category = 'Current Charges' AND row_num = 1 THEN UsageType END) AS current_charges_usage_type + MAX(CASE WHEN charge_category = 'Current Charges' THEN demand_amount else 0 END) AS current_charges_demand_amount, + MAX(CASE WHEN charge_category = 'Arrear' AND row_num = 1 THEN UsageType else 'NA' END) AS arrear_usage_type, + MAX(CASE WHEN charge_category = 'Current Charges' AND row_num = 1 THEN UsageType else 'NA' END) AS current_charges_usage_type FROM quarterly_data From 1334fa74f6878ed1ff1609c18cfca326d2411788 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 20 Mar 2024 14:58:28 +0530 Subject: [PATCH 1334/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index e4bdbc526..0a07157eb 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2187,12 +2187,12 @@ ReportDefinitions: label: reports.ws.arrear_usage_type type: string source: ws - total: true + total: false - name: current_charges_usage_type label: reports.ws.current_charges_usage_type type: string source: ws - total: true + total: false searchParams: - name: fromDate @@ -2270,12 +2270,12 @@ ReportDefinitions: label: reports.ws.arrear_usage_type type: string source: ws - total: true + total: false - name: current_charges_usage_type label: reports.ws.current_charges_usage_type type: string source: ws - total: true + total: false searchParams: - name: fromDate @@ -2315,9 +2315,9 @@ ReportDefinitions: SELECT consumercode, SUM(CASE WHEN charge_category = 'Arrear' THEN demand_amount ELSE 0 END) AS total_arrear_demand_amount, - MAX(CASE WHEN charge_category = 'Current Charges' THEN demand_amount END) AS current_charges_demand_amount, - MAX(CASE WHEN charge_category = 'Arrear' AND row_num = 1 THEN UsageType END) AS arrear_usage_type, - MAX(CASE WHEN charge_category = 'Current Charges' AND row_num = 1 THEN UsageType END) AS current_charges_usage_type + MAX(CASE WHEN charge_category = 'Current Charges' THEN demand_amount else 0 END) AS current_charges_demand_amount, + MAX(CASE WHEN charge_category = 'Arrear' AND row_num = 1 THEN UsageType else 'NA' END) AS arrear_usage_type, + MAX(CASE WHEN charge_category = 'Current Charges' AND row_num = 1 THEN UsageType else 'NA' END) AS current_charges_usage_type FROM quarterly_data From 533508cff08a30370941e35cfe36bb6f5da03532 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 20 Mar 2024 15:16:56 +0530 Subject: [PATCH 1335/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 0a07157eb..dc68b5968 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2315,7 +2315,7 @@ ReportDefinitions: SELECT consumercode, SUM(CASE WHEN charge_category = 'Arrear' THEN demand_amount ELSE 0 END) AS total_arrear_demand_amount, - MAX(CASE WHEN charge_category = 'Current Charges' THEN demand_amount else 0 END) AS current_charges_demand_amount, + MAX(CASE WHEN charge_category = 'Current Charges' THEN demand_amount else 0 END) AS current_charges_demand_amount, MAX(CASE WHEN charge_category = 'Arrear' AND row_num = 1 THEN UsageType else 'NA' END) AS arrear_usage_type, MAX(CASE WHEN charge_category = 'Current Charges' AND row_num = 1 THEN UsageType else 'NA' END) AS current_charges_usage_type FROM @@ -2324,6 +2324,6 @@ ReportDefinitions: GROUP BY consumercode ORDER BY - consumercode; + consumercode; From 89c1d198c6251324b20162f1d5c724e6c738cdf2 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 20 Mar 2024 15:33:14 +0530 Subject: [PATCH 1336/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 30 +++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index dc68b5968..8b7f5b92b 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2251,28 +2251,28 @@ ReportDefinitions: print: pdfPageSize: A1 sourceColumns: - - name: consumercode - label: reports.ws.consumercode + - name: swconsumercode + label: reports.ws.swconsumercode type: string source: ws total: false - - name: total_arrear_demand_amount - label: reports.ws.total_arrear_demand_amount + - name: swtotal_arrear_demand_amount + label: reports.ws.swtotal_arrear_demand_amount type: string source: ws total: false - - name: current_charges_demand_amount - label: reports.ws.current_charges_demand_amount + - name: swcurrent_charges_demand_amount + label: reports.ws.swcurrent_charges_demand_amount type: string source: ws total: true - - name: arrear_usage_type - label: reports.ws.arrear_usage_type + - name: swarrear_usage_type + label: reports.ws.swarrear_usage_type type: string source: ws total: false - - name: current_charges_usage_type - label: reports.ws.current_charges_usage_type + - name: swcurrent_charges_usage_type + label: reports.ws.swcurrent_charges_usage_type type: string source: ws total: false @@ -2313,11 +2313,11 @@ ReportDefinitions: AND d1.tenantid = $tenantid AND (d2.collectionamount IS NULL OR d2.collectionamount = 0)) -- Include only pending amounts) SELECT - consumercode, - SUM(CASE WHEN charge_category = 'Arrear' THEN demand_amount ELSE 0 END) AS total_arrear_demand_amount, - MAX(CASE WHEN charge_category = 'Current Charges' THEN demand_amount else 0 END) AS current_charges_demand_amount, - MAX(CASE WHEN charge_category = 'Arrear' AND row_num = 1 THEN UsageType else 'NA' END) AS arrear_usage_type, - MAX(CASE WHEN charge_category = 'Current Charges' AND row_num = 1 THEN UsageType else 'NA' END) AS current_charges_usage_type + swconsumercode, + SUM(CASE WHEN charge_category = 'Arrear' THEN demand_amount ELSE 0 END) AS swtotal_arrear_demand_amount, + MAX(CASE WHEN charge_category = 'Current Charges' THEN demand_amount else 0 END) AS swcurrent_charges_demand_amount, + MAX(CASE WHEN charge_category = 'Arrear' AND row_num = 1 THEN UsageType else 'NA' END) AS swarrear_usage_type, + MAX(CASE WHEN charge_category = 'Current Charges' AND row_num = 1 THEN UsageType else 'NA' END) AS swcurrent_charges_usage_type FROM quarterly_data From eafc973d4cc880630eab54129e26e981a5e99381 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 20 Mar 2024 15:52:28 +0530 Subject: [PATCH 1337/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 30 +++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 8b7f5b92b..dc68b5968 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2251,28 +2251,28 @@ ReportDefinitions: print: pdfPageSize: A1 sourceColumns: - - name: swconsumercode - label: reports.ws.swconsumercode + - name: consumercode + label: reports.ws.consumercode type: string source: ws total: false - - name: swtotal_arrear_demand_amount - label: reports.ws.swtotal_arrear_demand_amount + - name: total_arrear_demand_amount + label: reports.ws.total_arrear_demand_amount type: string source: ws total: false - - name: swcurrent_charges_demand_amount - label: reports.ws.swcurrent_charges_demand_amount + - name: current_charges_demand_amount + label: reports.ws.current_charges_demand_amount type: string source: ws total: true - - name: swarrear_usage_type - label: reports.ws.swarrear_usage_type + - name: arrear_usage_type + label: reports.ws.arrear_usage_type type: string source: ws total: false - - name: swcurrent_charges_usage_type - label: reports.ws.swcurrent_charges_usage_type + - name: current_charges_usage_type + label: reports.ws.current_charges_usage_type type: string source: ws total: false @@ -2313,11 +2313,11 @@ ReportDefinitions: AND d1.tenantid = $tenantid AND (d2.collectionamount IS NULL OR d2.collectionamount = 0)) -- Include only pending amounts) SELECT - swconsumercode, - SUM(CASE WHEN charge_category = 'Arrear' THEN demand_amount ELSE 0 END) AS swtotal_arrear_demand_amount, - MAX(CASE WHEN charge_category = 'Current Charges' THEN demand_amount else 0 END) AS swcurrent_charges_demand_amount, - MAX(CASE WHEN charge_category = 'Arrear' AND row_num = 1 THEN UsageType else 'NA' END) AS swarrear_usage_type, - MAX(CASE WHEN charge_category = 'Current Charges' AND row_num = 1 THEN UsageType else 'NA' END) AS swcurrent_charges_usage_type + consumercode, + SUM(CASE WHEN charge_category = 'Arrear' THEN demand_amount ELSE 0 END) AS total_arrear_demand_amount, + MAX(CASE WHEN charge_category = 'Current Charges' THEN demand_amount else 0 END) AS current_charges_demand_amount, + MAX(CASE WHEN charge_category = 'Arrear' AND row_num = 1 THEN UsageType else 'NA' END) AS arrear_usage_type, + MAX(CASE WHEN charge_category = 'Current Charges' AND row_num = 1 THEN UsageType else 'NA' END) AS current_charges_usage_type FROM quarterly_data From 7e656b4843f3b7b145e1f89ac9eebfe00ec0ed95 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 21 Mar 2024 09:46:19 +0530 Subject: [PATCH 1338/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index dc68b5968..78bbb1930 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2238,10 +2238,9 @@ ReportDefinitions: FROM quarterly_data - GROUP BY - consumercode - ORDER BY - consumercode; + groupby: group by consumercode + orderby: order by consumercode + - reportName: SwDefaulterReport summary: Sw Defaulter Report @@ -2321,9 +2320,8 @@ ReportDefinitions: FROM quarterly_data - GROUP BY - consumercode - ORDER BY - consumercode; + groupby: group by consumercode + orderby: order by consumercode + From 5138eba4f393cc6a494d6cc8eed85aef5067077c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 21 Mar 2024 09:48:07 +0530 Subject: [PATCH 1339/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 78bbb1930..b80891868 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2320,8 +2320,8 @@ ReportDefinitions: FROM quarterly_data - groupby: group by consumercode - orderby: order by consumercode + groupby: group by consumercode + From f29ab5e93c32903d4ef1d79e9590c6bcaa67f5d1 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 21 Mar 2024 10:21:33 +0530 Subject: [PATCH 1340/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index b80891868..de739f027 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2237,9 +2237,11 @@ ReportDefinitions: MAX(CASE WHEN charge_category = 'Current Charges' AND row_num = 1 THEN UsageType else 'NA' END) AS current_charges_usage_type FROM - quarterly_data - groupby: group by consumercode - orderby: order by consumercode + quarterly_data + GROUP BY + consumercode + ORDER BY + consumercode; - reportName: SwDefaulterReport From 782f7119d18dcc33c1d0ceb1cc548764ab131d25 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 21 Mar 2024 10:31:47 +0530 Subject: [PATCH 1341/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index de739f027..caefbbaa2 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2241,9 +2241,7 @@ ReportDefinitions: GROUP BY consumercode ORDER BY - consumercode; - - + consumercode; - reportName: SwDefaulterReport summary: Sw Defaulter Report version: 1.0.0 @@ -2322,7 +2320,10 @@ ReportDefinitions: FROM quarterly_data - groupby: group by consumercode + GROUP BY + consumercode + ORDER BY + consumercode; From 1239087a40d045a559c9968b246264091ba0db74 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 26 Mar 2024 09:53:15 +0530 Subject: [PATCH 1342/1630] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 40 ++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 5959a2c41..277e90b63 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9809,5 +9809,45 @@ ReportDefinitions: INNER JOIN egcl_payment as payment on pd.paymentid=payment.id WHERE b.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' orderby: ORDER BY pd.receiptdate + +- reportName: CountPTReport + summary: PT Count Report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertyid + label: reports.pt.propertyid + type: string + source: pt + total: false + - name: receipt + label: reports.pt.receipt + type: string + source: pt + total: false + + 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: | + select count(distinct ep.propertyid) as propertyid , count(distinct pd.receiptnumber) as receipt + from egcl_paymentdetail pd, egcl_bill bill , eg_pt_property ep ,egcl_payment p + where bill.id=pd.billid + and ep.propertyid = bill.consumercode + and pd.paymentid=p.id + and bill.businessservice = 'PT' + and bill.tenantid = $tenantid + and p.instrumentstatus != 'CANCELLED' + and p.paymentstatus != 'CANCELLED' From de11adb1e4e66bdcc9ccb825a141b95903d842bf Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 26 Mar 2024 14:56:37 +0530 Subject: [PATCH 1343/1630] Update ws-reports.yml SW REPORT --- configs/reports/configs/ws-reports.yml | 49 +++++++++++--------------- 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index caefbbaa2..e4f836971 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2274,56 +2274,47 @@ ReportDefinitions: label: reports.ws.current_charges_usage_type type: string source: ws - total: false - + total: false searchParams: - name: fromDate label: reports.pt.fromDate type: epoch source: pt isMandatory: false - searchClause: AND ws.createdtime>= $fromDate + searchClause: AND 1=1 - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: false - searchClause: AND ws.createdtime<= $toDate + searchClause: AND 1=1 query: | WITH quarterly_data AS ( SELECT - d1.consumercode, - CASE - WHEN to_timestamp(d1.taxperiodfrom / 1000) < '2023-10-01'::timestamp THEN 'Arrear' - ELSE 'Current Charges' - END AS charge_category, + d1.consumercode, + CASE WHEN to_timestamp(d1.taxperiodfrom / 1000) < '2023-10-01'::timestamp THEN 'Arrear' ELSE 'Current Charges' END AS charge_category, to_char(to_timestamp(d1.taxperiodfrom / 1000), 'YYYY-MM-DD') AS tax_period_from_date, - d2.taxamount AS demand_amount, - d2.collectionamount AS collected_amount, - d5.usagecategory AS UsageType, - ROW_NUMBER() OVER (PARTITION BY d1.consumercode ORDER BY to_timestamp(d1.taxperiodfrom / 1000) DESC) AS row_num - FROM - egbs_demand_v1 d1 - LEFT JOIN egbs_demanddetail_v1 d2 ON d1.id = d2.demandid - LEFT JOIN eg_sw_connection d4 ON d4.connectionno = d1.consumercode - LEFT JOIN eg_pt_property d5 ON d4.property_id = d5.propertyid + d2.taxamount AS demand_amount, + d2.collectionamount AS collected_amount, + d5.usagecategory AS UsageType, + ROW_NUMBER() OVER (PARTITION BY d1.consumercode ORDER BY to_timestamp(d1.taxperiodfrom / 1000) DESC) AS row_num + FROM egbs_demand_v1 d1 + LEFT JOIN egbs_demanddetail_v1 d2 ON d1.id = d2.demandid + LEFT JOIN eg_sw_connection d4 ON d4.connectionno = d1.consumercode + LEFT JOIN eg_pt_property d5 ON d4.property_id = d5.propertyid WHERE d1.taxperiodfrom >= '1672531200000' AND d1.businessservice = 'SW' AND d1.tenantid = $tenantid AND (d2.collectionamount IS NULL OR d2.collectionamount = 0)) -- Include only pending amounts) SELECT consumercode, - SUM(CASE WHEN charge_category = 'Arrear' THEN demand_amount ELSE 0 END) AS total_arrear_demand_amount, - MAX(CASE WHEN charge_category = 'Current Charges' THEN demand_amount else 0 END) AS current_charges_demand_amount, - MAX(CASE WHEN charge_category = 'Arrear' AND row_num = 1 THEN UsageType else 'NA' END) AS arrear_usage_type, - MAX(CASE WHEN charge_category = 'Current Charges' AND row_num = 1 THEN UsageType else 'NA' END) AS current_charges_usage_type - FROM - - quarterly_data - GROUP BY - consumercode - ORDER BY - consumercode; + SUM(CASE WHEN charge_category = 'Arrear' THEN demand_amount ELSE 0 END) AS total_arrear_demand_amount, + MAX(CASE WHEN charge_category = 'Current Charges' THEN demand_amount else 0 END) AS current_charges_demand_amount, + MAX(CASE WHEN charge_category = 'Arrear' AND row_num = 1 THEN UsageType else 'NA' END) AS arrear_usage_type, + MAX(CASE WHEN charge_category = 'Current Charges' AND row_num = 1 THEN UsageType else 'NA' END) AS current_charges_usage_type + FROM quarterly_data + groupby: GROUP BY consumercode + orderby: ORDER BY consumercode From c67a6c17ff38f576e7f8726cbbbd564e2761370b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 26 Mar 2024 15:17:42 +0530 Subject: [PATCH 1344/1630] Update ws-reports.yml sw rp --- configs/reports/configs/ws-reports.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index e4f836971..c2eabe796 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2274,20 +2274,7 @@ ReportDefinitions: label: reports.ws.current_charges_usage_type type: string source: ws - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND 1=1 - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND 1=1 + total: false query: | WITH quarterly_data AS ( SELECT From ca189c17123755e9a3548c86fa17aad4faacbd3f Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Tue, 16 Apr 2024 16:52:33 +0530 Subject: [PATCH 1345/1630] Update usagestype address --- .../pdf-service/data-config/ws-onetime-receipt.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index 16e87d973..df3c7c980 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -18,6 +18,18 @@ "value": { "path": "$.payerName" } + }, + { + "variable": "UsageCategory", + "value": { + "path": "$.usageCategory" + } + }, + { + "variable": "ADdress", + "value": { + "path": "$.address" + } }, { "variable": "user-name", From a78d1492d0d3643e1065667b784103f357241fa9 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Tue, 16 Apr 2024 16:55:24 +0530 Subject: [PATCH 1346/1630] Update ws-onetime-receipt.json --- .../format-config/ws-onetime-receipt.json | 88 ++++++++++++++++++- 1 file changed, 87 insertions(+), 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 bdff324dc..9f937671d 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -229,6 +229,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" + } ], [ @@ -582,7 +625,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", From 51360ed52988b9a40a236cc9eb1eab952a07dc4f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 22 Apr 2024 15:42:43 +0530 Subject: [PATCH 1347/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 70 ++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index c2eabe796..68254eda6 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2303,6 +2303,70 @@ ReportDefinitions: groupby: GROUP BY consumercode orderby: ORDER BY consumercode - - - +- reportName: WsandSwDumpReport + summary: Ws and Sw Dump 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: total_arrear_demand_amount + label: reports.ws.total_arrear_demand_amount + type: string + source: ws + total: false + - name: current_charges_demand_amount + label: reports.ws.current_charges_demand_amount + type: string + source: ws + total: true + - name: arrear_usage_type + label: reports.ws.arrear_usage_type + type: string + source: ws + total: false + - name: current_charges_usage_type + label: reports.ws.current_charges_usage_type + type: string + source: ws + total: false + query: | + with OwnerInfo AS ( + select split_part(string_agg(userid, ','), ',', 1) AS owneruserid, + propertyid + from eg_pt_owner + where tenantid = $tenantid AND status = 'ACTIVE' + group by propertyid + ), + AddressInfo 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 wsconnection.connectionno, + pt.landarea AS plotsize, + oldconnectionno, + applicationno, + pt.propertyid, + ch.connectionholdertype, + wsconnection.applicationstatus, + users.name AS connectionHolder, + userowner.name AS name, + userowner.guardian AS guardian, + concat(ai.address, ' ', ai.locality) AS address + from eg_ws_connection wsconnection + inner JOIN eg_pt_property pt ON pt.propertyid = wsconnection.property_id + inner JOIN eg_ws_connectionholder ch ON ch.connectionid = wsconnection.id + inner JOIN eg_user users ON ch.userid = users.uuid + inner JOIN OwnerInfo oi ON oi.propertyid = pt.id + inner JOIN eg_user userowner ON oi.owneruserid = userowner.uuid + inner JOIN AddressInfo ai ON ai.propertyid = pt.id; From 855f65a661f224883c51a54017c54dc857cf6619 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 23 Apr 2024 09:58:05 +0530 Subject: [PATCH 1348/1630] Update ws-reports.yml ws and sw dump --- configs/reports/configs/ws-reports.yml | 100 ++++++++++++++++--------- 1 file changed, 65 insertions(+), 35 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 68254eda6..ece591936 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2311,62 +2311,92 @@ ReportDefinitions: print: pdfPageSize: A1 sourceColumns: - - name: consumercode - label: reports.ws.consumercode + - name: connectionno + label: reports.ws.connectionno type: string source: ws total: false - - name: total_arrear_demand_amount - label: reports.ws.total_arrear_demand_amount + - name: plotsize + label: reports.ws.plotsize type: string source: ws total: false - - name: current_charges_demand_amount - label: reports.ws.current_charges_demand_amount + - name: oldconnectionno + label: reports.ws.oldconnectionno type: string source: ws - total: true - - name: arrear_usage_type - label: reports.ws.arrear_usage_type + total: false + - name: applicationno + label: reports.ws.applicationno type: string source: ws total: false - - name: current_charges_usage_type - label: reports.ws.current_charges_usage_type + - 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.name + type: string + source: ws + total: false + - name: guardian + label: reports.ws.guardian + type: string + source: ws + total: false + - name: address + label: reports.ws.address type: string source: ws total: false query: | with OwnerInfo AS ( select split_part(string_agg(userid, ','), ',', 1) AS owneruserid, - propertyid + propertyid from eg_pt_owner - where tenantid = $tenantid AND status = 'ACTIVE' + where tenantid = $tenantid AND status = 'ACTIVE' group by propertyid ), - AddressInfo AS ( - select split_part(string_agg(locality, ','), ',', 1) AS locality, - split_part(string_agg(concat(doorno, ' ', plotno, ' ', buildingname, ' ', street, ' ', city), '|'), '|', 1) AS address, - propertyid + AddressInfo 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 + where tenantid = $tenantid group by propertyid ) select wsconnection.connectionno, - pt.landarea AS plotsize, - oldconnectionno, - applicationno, - pt.propertyid, - ch.connectionholdertype, - wsconnection.applicationstatus, - users.name AS connectionHolder, - userowner.name AS name, - userowner.guardian AS guardian, - concat(ai.address, ' ', ai.locality) AS address - from eg_ws_connection wsconnection - inner JOIN eg_pt_property pt ON pt.propertyid = wsconnection.property_id - inner JOIN eg_ws_connectionholder ch ON ch.connectionid = wsconnection.id - inner JOIN eg_user users ON ch.userid = users.uuid - inner JOIN OwnerInfo oi ON oi.propertyid = pt.id - inner JOIN eg_user userowner ON oi.owneruserid = userowner.uuid - inner JOIN AddressInfo ai ON ai.propertyid = pt.id; + pt.landarea AS plotsize, + oldconnectionno, + applicationno, + pt.propertyid as propertyid, + ch.connectionholdertype as connectionholdertype, + wsconnection.applicationstatus as applicationstatus, + users.name AS connectionholder, + userowner.name AS name, + userowner.guardian AS guardian, + concat(ai.address, ' ', ai.locality) AS address + from eg_ws_connection wsconnection + inner JOIN eg_pt_property pt ON pt.propertyid = wsconnection.property_id + inner JOIN eg_ws_connectionholder ch ON ch.connectionid = wsconnection.id + inner JOIN eg_user users ON ch.userid = users.uuid + inner JOIN OwnerInfo oi ON oi.propertyid = pt.id + inner JOIN eg_user userowner ON oi.owneruserid = userowner.uuid + inner JOIN AddressInfo ai ON ai.propertyid = pt.id; From c098d8e1b5aec41a40e1dd7bf883c9b05b335cac Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 25 Apr 2024 09:35:19 +0530 Subject: [PATCH 1349/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index ece591936..1684fa85d 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2304,6 +2304,7 @@ ReportDefinitions: orderby: ORDER BY consumercode - reportName: WsandSwDumpReport + decryptionPathId: ReceiptRegisterShort_V2 summary: Ws and Sw Dump Report version: 1.0.0 moduleName: rainmaker-ws From e274bfd29ea7850379a305989356b4f36d9f1c70 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 25 Apr 2024 09:42:48 +0530 Subject: [PATCH 1350/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 1684fa85d..0df1a663d 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2304,7 +2304,7 @@ ReportDefinitions: orderby: ORDER BY consumercode - reportName: WsandSwDumpReport - decryptionPathId: ReceiptRegisterShort_V2 + decryptionPathId: ULBPTDataDumpReport_V2 summary: Ws and Sw Dump Report version: 1.0.0 moduleName: rainmaker-ws @@ -2352,8 +2352,8 @@ ReportDefinitions: type: string source: ws total: false - - name: name - label: reports.ws.name + - name: ownername + label: reports.ws.ownername type: string source: ws total: false @@ -2391,7 +2391,7 @@ ReportDefinitions: ch.connectionholdertype as connectionholdertype, wsconnection.applicationstatus as applicationstatus, users.name AS connectionholder, - userowner.name AS name, + userowner.name AS ownername, userowner.guardian AS guardian, concat(ai.address, ' ', ai.locality) AS address from eg_ws_connection wsconnection From 16c406d5a162dd56361850d866217a3e22ce7fd8 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Thu, 25 Apr 2024 16:57:54 +0530 Subject: [PATCH 1351/1630] Update ws-applicationsewerage.json --- configs/pdf-service/format-config/ws-applicationsewerage.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/ws-applicationsewerage.json b/configs/pdf-service/format-config/ws-applicationsewerage.json index 63f1ffc1b..c52a1d4f5 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}} {{mcGrade}}", + "text": " {{mcGrade}}", "style": "receipt-logo-header" }, { From 217a4e4d0b247235caeb232c5bdfc07bf8c7c17d Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Thu, 25 Apr 2024 17:03:19 +0530 Subject: [PATCH 1352/1630] Update ws-applicationsewerage.json --- configs/pdf-service/format-config/ws-applicationsewerage.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/ws-applicationsewerage.json b/configs/pdf-service/format-config/ws-applicationsewerage.json index c52a1d4f5..63f1ffc1b 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": " {{mcGrade}}", + "text": "{{logo_header}} {{mcGrade}}", "style": "receipt-logo-header" }, { From deaecc910faf90d185089cac85c7283e5c981e44 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 26 Apr 2024 09:45:33 +0530 Subject: [PATCH 1353/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 0df1a663d..00480389d 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2337,8 +2337,8 @@ ReportDefinitions: type: string source: ws total: false - - name: connectionholdertype - label: reports.ws.connectionholdertype + - name: ownername + label: reports.ws.ownername type: string source: ws total: false @@ -2357,8 +2357,8 @@ ReportDefinitions: type: string source: ws total: false - - name: guardian - label: reports.ws.guardian + - name: guardianname + label: reports.ws.guardianname type: string source: ws total: false @@ -2388,11 +2388,11 @@ ReportDefinitions: oldconnectionno, applicationno, pt.propertyid as propertyid, - ch.connectionholdertype as connectionholdertype, + ch.connectionholdertype as ownername, wsconnection.applicationstatus as applicationstatus, users.name AS connectionholder, userowner.name AS ownername, - userowner.guardian AS guardian, + userowner.guardian AS guardianname, concat(ai.address, ' ', ai.locality) AS address from eg_ws_connection wsconnection inner JOIN eg_pt_property pt ON pt.propertyid = wsconnection.property_id From 7816391ea6db87f19d965cc486f149adf14706da Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 26 Apr 2024 15:56:18 +0530 Subject: [PATCH 1354/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 00480389d..286668976 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1189,7 +1189,7 @@ ReportDefinitions: 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 + and pd.businessservice in ('WS','SW','WS.ONE_TIME_FEE','SW.ONE_TIME_FEE') where payment.tenantid=$tenantid orderby: ORDER BY pd.receiptdate DESC - reportName: CollectionsSummaryHeadwiseReport From a741ce9da482c6220e7f109d391c0864011541e7 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 26 Apr 2024 15:58:28 +0530 Subject: [PATCH 1355/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 286668976..e9710daa2 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1086,6 +1086,7 @@ ReportDefinitions: 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' + and pd.businessservice in ('WS','SW','WS.ONE_TIME_FEE','SW.ONE_TIME_FEE') where pd.tenantid=$tenantid orderby: ORDER BY pd.receiptdate DESC From 8c5cc11ddd3449ef581108544215c99fa9ddba3c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:08:20 +0530 Subject: [PATCH 1356/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index e9710daa2..80624f9ab 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2338,8 +2338,8 @@ ReportDefinitions: type: string source: ws total: false - - name: ownername - label: reports.ws.ownername + - name: connectionholdertype + label: reports.ws.connectionholdertype type: string source: ws total: false @@ -2389,7 +2389,7 @@ ReportDefinitions: oldconnectionno, applicationno, pt.propertyid as propertyid, - ch.connectionholdertype as ownername, + ch.connectionholdertype as connectionholdertype, wsconnection.applicationstatus as applicationstatus, users.name AS connectionholder, userowner.name AS ownername, From 7591311a3a64eb246108ae82b0e8bd181a3502fc Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 29 Apr 2024 09:34:14 +0530 Subject: [PATCH 1357/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 80624f9ab..25754ee1f 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2397,8 +2397,8 @@ ReportDefinitions: concat(ai.address, ' ', ai.locality) AS address from eg_ws_connection wsconnection inner JOIN eg_pt_property pt ON pt.propertyid = wsconnection.property_id - inner JOIN eg_ws_connectionholder ch ON ch.connectionid = wsconnection.id - inner JOIN eg_user users ON ch.userid = users.uuid + left OUTER JOIN eg_ws_connectionholder ch ON ch.connectionid = wsconnection.id + left OUTER JOIN eg_user users ON ch.userid = users.uuid inner JOIN OwnerInfo oi ON oi.propertyid = pt.id - inner JOIN eg_user userowner ON oi.owneruserid = userowner.uuid + left OUTER JOIN eg_user userowner ON oi.owneruserid = userowner.uuid inner JOIN AddressInfo ai ON ai.propertyid = pt.id; From 729fb4ea2f761de65c1fb9caec41d88ba913b549 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 30 Apr 2024 16:38:21 +0530 Subject: [PATCH 1358/1630] Update uc-reports.yml --- configs/reports/configs/uc-reports.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index d4c6b7663..c3f33cb57 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1860,6 +1860,11 @@ ReportDefinitions: label: reports.uc.paymentmode type: string source: uc + total: false + - name: payername + label: reports.uc.payername + type: string + source: uc total: false - name: comments label: reports.uc.comments @@ -1940,6 +1945,7 @@ ReportDefinitions: 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 payment.payername,',') as payername, string_agg(distinct eg_user.name,',') as collectorname, 'System' as collectiontype, To_char((To_timestamp(egcl_paymentdetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate From fa94170808537d6fefb85fa24bc9b51fd4e93bf1 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Tue, 7 May 2024 11:51:39 +0530 Subject: [PATCH 1359/1630] Update ws-bill.json --- 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 2a99d0aa9..dfa90aa1a 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -1179,7 +1179,7 @@ }, "amount-due": { "fontSize": 20, - "color": "#FC8019", + "color": "#000000", "bold": true, "fontWeight": 700 }, From 37a80b14deb84d52fbd10e919ce530cbd3b9d56a Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Tue, 7 May 2024 11:52:31 +0530 Subject: [PATCH 1360/1630] Update sw-bill.json --- configs/pdf-service/format-config/sw-bill.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/sw-bill.json b/configs/pdf-service/format-config/sw-bill.json index 27064b85c..78f891a75 100644 --- a/configs/pdf-service/format-config/sw-bill.json +++ b/configs/pdf-service/format-config/sw-bill.json @@ -1162,7 +1162,7 @@ }, "amount-due": { "fontSize": 20, - "color": "#FC8019", + "color": "#000000", "bold": true, "fontWeight": 700 }, From 574652a80e719aeb02e51d063542c1885c927cb6 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Wed, 8 May 2024 16:13:07 +0530 Subject: [PATCH 1361/1630] Update ws-onetime-receipt.json --- configs/pdf-service/data-config/ws-onetime-receipt.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index df3c7c980..a98c62f09 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -25,6 +25,12 @@ "path": "$.usageCategory" } }, + { + "variable": "proPertyid", + "value": { + "path": "$.propertyid" + } + }, { "variable": "ADdress", "value": { From 516e99e4cca51f21e48d70fdaa2ed8826b779f1c Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Wed, 8 May 2024 16:15:33 +0530 Subject: [PATCH 1362/1630] Update ws-onetime-receipt.json --- configs/pdf-service/format-config/ws-onetime-receipt.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 9f937671d..3da30f881 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -190,7 +190,7 @@ ], [ { - "text": "Chq/DD/PO/Txn Date", + "text": "Chq/DD/PO/Txn No", "border": [ true, false, @@ -276,7 +276,7 @@ ], [ { - "text": "Bank Name", + "text": "Property ID", "border": [ true, false, @@ -286,7 +286,7 @@ "style": "receipt-table-value" }, { - "text": "{{bankName}},{{branchName}}", + "text": "{{proPertyid}}", "border": [ false, false, From 7268540bf01c046ba2bcc190f7d19b80558faa96 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Wed, 8 May 2024 16:28:27 +0530 Subject: [PATCH 1363/1630] Update ws-onetime-receipt.json --- configs/pdf-service/format-config/ws-onetime-receipt.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 3da30f881..fbe2c1a41 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -585,7 +585,7 @@ ], [ { - "text": "Chq/DD/PO/Txn Date", + "text": "Chq/DD/PO/Txn No", "border": [ true, false, @@ -671,7 +671,7 @@ ], [ { - "text": "Bank Name", + "text": "Property ID", "border": [ true, false, @@ -681,7 +681,7 @@ "style": "receipt-table-value" }, { - "text": "{{bankName}},{{branchName}}", + "text": "{{proPertyid}}", "border": [ false, false, From 36bb0da77cff85abd0797b756d5fb65cfe42cb59 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 23 May 2024 12:17:54 +0530 Subject: [PATCH 1364/1630] ReceiptRegisterSW changes --- configs/reports/configs/ws-reports.yml | 28 ++++++++++++++++---------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 25754ee1f..d549d2983 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -34,18 +34,23 @@ ReportDefinitions: type: string source: ws total: false - - name: billnumber - label: reports.ws.billnumber + - name: collectedby + label: reports.ws.collectedby type: string source: ws total: false - - name: billdate1 - label: reports.ws.billdate + - name: instrumentdate + label: reports.ws.instrumentdate type: string source: ws total: false - - name: paidby - label: reports.ws.paidby + - name: instrumentnumber + label: reports.ws.instrumentnumber + type: string + source: ws + total: false + - name: payername + label: reports.ws.payername type: string source: ws total: false @@ -116,13 +121,14 @@ ReportDefinitions: 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, + bill.businessservice as service, + paidby as payername, amountpaid, paymentmode, - paymentstatus, + paymentstatus, + instrumentnumber, + instrumentdate, + usr.username as collectedby, payername as ownername1 from egcl_paymentdetail pd inner join egcl_bill as bill on bill.id=pd.billid From 87f5d94dadc4b61ac0f364898514b4088b94f611 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 23 May 2024 14:47:15 +0530 Subject: [PATCH 1365/1630] Update ws-reports.yml ws dump report --- configs/reports/configs/ws-reports.yml | 89 ++++++++++++++------------ 1 file changed, 48 insertions(+), 41 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index d549d2983..78548a7f8 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2344,28 +2344,18 @@ ReportDefinitions: 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: ownername label: reports.ws.ownername type: string source: ws total: false - - name: guardianname - label: reports.ws.guardianname + - name: guardian + label: reports.ws.guardian type: string source: ws total: false @@ -2374,37 +2364,54 @@ ReportDefinitions: type: string source: ws total: false + - name: connectionstatus + label: reports.ws.connectionstatus + type: string + source: ws + total: false + - name: connectiontype + label: reports.ws.connectiontype + type: string + source: ws + total: false + - name: usage + label: reports.ws.usage + type: string + source: ws + total: false + - name: subusage + label: reports.ws.subusage + type: string + source: ws + total: false + - name: connectionexecutiondate + label: reports.ws.connectionexecutiondate + type: string + source: ws + total: false + - name: connectionholdername + label: reports.ws.connectionholdername + type: string + source: ws + total: false query: | - with OwnerInfo AS ( - select split_part(string_agg(userid, ','), ',', 1) AS owneruserid, - propertyid - from eg_pt_owner - where tenantid = $tenantid AND status = 'ACTIVE' - group by propertyid - ), - AddressInfo 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 wsconnection.connectionno, - pt.landarea AS plotsize, + with OwnerInfo AS (with OwnerInfo AS ( select split_part(string_agg(userid, ','), ',', 1) AS owneruserid, + propertyid from eg_pt_owner where tenantid = $tenantid AND status = 'ACTIVE' + group by propertyid)select + wsconnection.connectionno as connectionno, + pt.propertyid as propertyid, + pt.plotsize AS plotsize, oldconnectionno, applicationno, - pt.propertyid as propertyid, - ch.connectionholdertype as connectionholdertype, wsconnection.applicationstatus as applicationstatus, - users.name AS connectionholder, + wsconnection.status as connectionstatus, + ws.connectiontype as connectiontype, + ws.connectionexecutiondate as connectionexecutiondate, + pt.propertystatus as propertystatus, + pt.propertyusagetype as usage, + wsconnection.additionaldetails->>'waterSubUsageType' as subusage, + users.name AS connectionholdername, userowner.name AS ownername, - userowner.guardian AS guardianname, - concat(ai.address, ' ', ai.locality) AS address - from eg_ws_connection wsconnection - inner JOIN eg_pt_property pt ON pt.propertyid = wsconnection.property_id - left OUTER JOIN eg_ws_connectionholder ch ON ch.connectionid = wsconnection.id - left OUTER JOIN eg_user users ON ch.userid = users.uuid - inner JOIN OwnerInfo oi ON oi.propertyid = pt.id - left OUTER JOIN eg_user userowner ON oi.owneruserid = userowner.uuid - inner JOIN AddressInfo ai ON ai.propertyid = pt.id; + userowner.guardian AS guardian, + concat(pt.address, ' ', pt.localityname) AS address from + eg_ws_connection wsconnectioninner JOIN eg_ws_service ws ON wsconnection.id = ws.connection_idinner JOIN report_properties pt ON pt.propertyid = wsconnection.property_idleft OUTER JOIN eg_ws_connectionholder ch ON ch.connectionid = wsconnection.idleft OUTER JOIN eg_user users ON ch.userid = users.uuidinner JOIN OwnerInfo oi ON oi.propertyid = pt.pt_uuidleft OUTER JOIN eg_user userowner ON oi.owneruserid = userowner.uuidwhere wsconnection.tenantid = $tenantid and wsconnection.connectionno is not null and wsconnection.status = 'Active'; From 2fffd64a0dd55860e417970b30a2ecdbf90bacf3 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 23 May 2024 14:57:29 +0530 Subject: [PATCH 1366/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 78548a7f8..436f6a1a2 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2414,4 +2414,4 @@ ReportDefinitions: userowner.name AS ownername, userowner.guardian AS guardian, concat(pt.address, ' ', pt.localityname) AS address from - eg_ws_connection wsconnectioninner JOIN eg_ws_service ws ON wsconnection.id = ws.connection_idinner JOIN report_properties pt ON pt.propertyid = wsconnection.property_idleft OUTER JOIN eg_ws_connectionholder ch ON ch.connectionid = wsconnection.idleft OUTER JOIN eg_user users ON ch.userid = users.uuidinner JOIN OwnerInfo oi ON oi.propertyid = pt.pt_uuidleft OUTER JOIN eg_user userowner ON oi.owneruserid = userowner.uuidwhere wsconnection.tenantid = $tenantid and wsconnection.connectionno is not null and wsconnection.status = 'Active'; + eg_ws_connection wsconnection inner JOIN eg_ws_service ws ON wsconnection.id = ws.connection_id inner JOIN report_properties pt ON pt.propertyid = wsconnection.property_id left OUTER JOIN eg_ws_connectionholder ch ON ch.connectionid = wsconnection.id left OUTER JOIN eg_user users ON ch.userid = users.uuid inner JOIN OwnerInfo oi ON oi.propertyid = pt.pt_uuid left OUTER JOIN eg_user userowner ON oi.owneruserid = userowner.uuid where wsconnection.tenantid =$tenantid and wsconnection.connectionno is not null and wsconnection.status = 'Active' From 59524954660374c38fc8052c35139732a5692a62 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 23 May 2024 15:07:31 +0530 Subject: [PATCH 1367/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 436f6a1a2..5a3bd2513 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2395,7 +2395,7 @@ ReportDefinitions: source: ws total: false query: | - with OwnerInfo AS (with OwnerInfo AS ( select split_part(string_agg(userid, ','), ',', 1) AS owneruserid, + with OwnerInfo AS ( select split_part(string_agg(userid, ','), ',', 1) AS owneruserid, propertyid from eg_pt_owner where tenantid = $tenantid AND status = 'ACTIVE' group by propertyid)select wsconnection.connectionno as connectionno, From 0af31ab27e38bf1eb10cac03d46c4ca85538dbac Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 23 May 2024 15:18:26 +0530 Subject: [PATCH 1368/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 5a3bd2513..69548d5b6 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -34,8 +34,8 @@ ReportDefinitions: type: string source: ws total: false - - name: collectedby - label: reports.ws.collectedby + - name: collectorname + label: reports.ws.collectorname type: string source: ws total: false @@ -128,7 +128,7 @@ ReportDefinitions: paymentstatus, instrumentnumber, instrumentdate, - usr.username as collectedby, + usr.username as collectorname, payername as ownername1 from egcl_paymentdetail pd inner join egcl_bill as bill on bill.id=pd.billid From 2b01341dbfdfd992f121225588e36c598e541835 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 24 May 2024 09:41:39 +0530 Subject: [PATCH 1369/1630] Update sw-reports.yml --- configs/reports/configs/ws-reports.yml | 105 +++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 69548d5b6..6b24b18c1 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2415,3 +2415,108 @@ ReportDefinitions: userowner.guardian AS guardian, concat(pt.address, ' ', pt.localityname) AS address from eg_ws_connection wsconnection inner JOIN eg_ws_service ws ON wsconnection.id = ws.connection_id inner JOIN report_properties pt ON pt.propertyid = wsconnection.property_id left OUTER JOIN eg_ws_connectionholder ch ON ch.connectionid = wsconnection.id left OUTER JOIN eg_user users ON ch.userid = users.uuid inner JOIN OwnerInfo oi ON oi.propertyid = pt.pt_uuid left OUTER JOIN eg_user userowner ON oi.owneruserid = userowner.uuid where wsconnection.tenantid =$tenantid and wsconnection.connectionno is not null and wsconnection.status = 'Active' +- reportName: SwDumpReport + decryptionPathId: ULBPTDataDumpReport_V2 + summary: Sw Dump 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: plotsize + label: reports.ws.plotsize + type: string + source: ws + total: false + - name: oldconnectionno + label: reports.ws.oldconnectionno + 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: applicationstatus + label: reports.ws.applicationstatus + type: string + source: ws + total: false + - name: ownername + label: reports.ws.ownername + type: string + source: ws + total: false + - name: guardian + label: reports.ws.guardian + type: string + source: ws + total: false + - name: address + label: reports.ws.address + type: string + source: ws + total: false + - name: connectionstatus + label: reports.ws.connectionstatus + type: string + source: ws + total: false + - name: connectiontype + label: reports.ws.connectiontype + type: string + source: ws + total: false + - name: usage + label: reports.ws.usage + type: string + source: ws + total: false + - name: subusage + label: reports.ws.subusage + type: string + source: ws + total: false + - name: connectionexecutiondate + label: reports.ws.connectionexecutiondate + type: string + source: ws + total: false + - name: connectionholdername + label: reports.ws.connectionholdername + type: string + source: ws + total: false + query: | + with OwnerInfo AS ( select split_part(string_agg(userid, ','), ',', 1) AS owneruserid, + propertyid from eg_pt_owner where tenantid =$tenantid AND status = 'ACTIVE' + group by propertyid)select + swconnection.connectionno as connectionno, + pt.propertyid as propertyid, + pt.plotsize AS plotsize, + oldconnectionno, + applicationno, + swconnection.applicationstatus as applicationstatus, + swconnection.status as connectionstatus, + sw.connectiontype as connectiontype, + sw.connectionexecutiondate as connectionexecutiondate, + pt.propertystatus as propertystatus, + pt.propertyusagetype as usage, + swconnection.additionaldetails->>'waterSubUsageType' as subusage, + users.name AS connectionholdername, + userowner.name AS ownername, + userowner.guardian AS guardian, + concat(pt.address, ' ', pt.localityname) AS address from + eg_sw_connection swconnection inner JOIN eg_sw_service sw ON swconnection.id = sw.connection_id inner JOIN report_properties pt ON pt.propertyid = swconnection.property_id left OUTER JOIN eg_sw_connectionholder ch ON ch.connectionid = swconnection.id left OUTER JOIN eg_user users ON ch.userid = users.uuid inner JOIN OwnerInfo oi ON oi.propertyid = pt.pt_uuid left OUTER JOIN eg_user userowner ON oi.owneruserid = userowner.uuid where swconnection.tenantid =$tenantid and swconnection.connectionno is not null and swconnection.status = 'Active' From 37887dfec98f259e6b339d33f9f17e2dc6e49ab0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 24 May 2024 10:05:17 +0530 Subject: [PATCH 1370/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 6b24b18c1..0a08e2d02 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2354,8 +2354,8 @@ ReportDefinitions: type: string source: ws total: false - - name: guardian - label: reports.ws.guardian + - name: guardianname + label: reports.ws.guardianname type: string source: ws total: false @@ -2412,7 +2412,7 @@ ReportDefinitions: wsconnection.additionaldetails->>'waterSubUsageType' as subusage, users.name AS connectionholdername, userowner.name AS ownername, - userowner.guardian AS guardian, + userowner.guardian AS guardianname, concat(pt.address, ' ', pt.localityname) AS address from eg_ws_connection wsconnection inner JOIN eg_ws_service ws ON wsconnection.id = ws.connection_id inner JOIN report_properties pt ON pt.propertyid = wsconnection.property_id left OUTER JOIN eg_ws_connectionholder ch ON ch.connectionid = wsconnection.id left OUTER JOIN eg_user users ON ch.userid = users.uuid inner JOIN OwnerInfo oi ON oi.propertyid = pt.pt_uuid left OUTER JOIN eg_user userowner ON oi.owneruserid = userowner.uuid where wsconnection.tenantid =$tenantid and wsconnection.connectionno is not null and wsconnection.status = 'Active' - reportName: SwDumpReport @@ -2459,8 +2459,8 @@ ReportDefinitions: type: string source: ws total: false - - name: guardian - label: reports.ws.guardian + - name: guardianname + label: reports.ws.guardianname type: string source: ws total: false @@ -2517,6 +2517,6 @@ ReportDefinitions: swconnection.additionaldetails->>'waterSubUsageType' as subusage, users.name AS connectionholdername, userowner.name AS ownername, - userowner.guardian AS guardian, + userowner.guardian AS guardianname, concat(pt.address, ' ', pt.localityname) AS address from eg_sw_connection swconnection inner JOIN eg_sw_service sw ON swconnection.id = sw.connection_id inner JOIN report_properties pt ON pt.propertyid = swconnection.property_id left OUTER JOIN eg_sw_connectionholder ch ON ch.connectionid = swconnection.id left OUTER JOIN eg_user users ON ch.userid = users.uuid inner JOIN OwnerInfo oi ON oi.propertyid = pt.pt_uuid left OUTER JOIN eg_user userowner ON oi.owneruserid = userowner.uuid where swconnection.tenantid =$tenantid and swconnection.connectionno is not null and swconnection.status = 'Active' From 997f49ba7194eb51c2b45cba1666dc66e85cda38 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 24 May 2024 11:13:13 +0530 Subject: [PATCH 1371/1630] Update meter reading report --- configs/reports/configs/ws-reports.yml | 187 +++++++++++++++++++++++++ 1 file changed, 187 insertions(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 0a08e2d02..6c557f4ce 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2520,3 +2520,190 @@ ReportDefinitions: userowner.guardian AS guardianname, concat(pt.address, ' ', pt.localityname) AS address from eg_sw_connection swconnection inner JOIN eg_sw_service sw ON swconnection.id = sw.connection_id inner JOIN report_properties pt ON pt.propertyid = swconnection.property_id left OUTER JOIN eg_sw_connectionholder ch ON ch.connectionid = swconnection.id left OUTER JOIN eg_user users ON ch.userid = users.uuid inner JOIN OwnerInfo oi ON oi.propertyid = pt.pt_uuid left OUTER JOIN eg_user userowner ON oi.owneruserid = userowner.uuid where swconnection.tenantid =$tenantid and swconnection.connectionno is not null and swconnection.status = 'Active' +- reportName: SwDumpReport + decryptionPathId: ULBPTDataDumpReport_V2 + summary: Sw Dump 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: plotsize + label: reports.ws.plotsize + type: string + source: ws + total: false + - name: oldconnectionno + label: reports.ws.oldconnectionno + 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: applicationstatus + label: reports.ws.applicationstatus + type: string + source: ws + total: false + - name: ownername + label: reports.ws.ownername + type: string + source: ws + total: false + - name: guardianname + label: reports.ws.guardianname + type: string + source: ws + total: false + - name: address + label: reports.ws.address + type: string + source: ws + total: false + - name: connectionstatus + label: reports.ws.connectionstatus + type: string + source: ws + total: false + - name: connectiontype + label: reports.ws.connectiontype + type: string + source: ws + total: false + - name: usage + label: reports.ws.usage + type: string + source: ws + total: false + - name: subusage + label: reports.ws.subusage + type: string + source: ws + total: false + - name: connectionexecutiondate + label: reports.ws.connectionexecutiondate + type: string + source: ws + total: false + - name: connectionholdername + label: reports.ws.connectionholdername + type: string + source: ws + total: false + query: | + with OwnerInfo AS ( select split_part(string_agg(userid, ','), ',', 1) AS owneruserid, + propertyid from eg_pt_owner where tenantid =$tenantid AND status = 'ACTIVE' + group by propertyid)select + swconnection.connectionno as connectionno, + pt.propertyid as propertyid, + pt.plotsize AS plotsize, + oldconnectionno, + applicationno, + swconnection.applicationstatus as applicationstatus, + swconnection.status as connectionstatus, + sw.connectiontype as connectiontype, + sw.connectionexecutiondate as connectionexecutiondate, + pt.propertystatus as propertystatus, + pt.propertyusagetype as usage, + swconnection.additionaldetails->>'waterSubUsageType' as subusage, + users.name AS connectionholdername, + userowner.name AS ownername, + userowner.guardian AS guardianname, + concat(pt.address, ' ', pt.localityname) AS address from + eg_sw_connection swconnection inner JOIN eg_sw_service sw ON swconnection.id = sw.connection_id inner JOIN report_properties pt ON pt.propertyid = swconnection.property_id left OUTER JOIN eg_sw_connectionholder ch ON ch.connectionid = swconnection.id left OUTER JOIN eg_user users ON ch.userid = users.uuid inner JOIN OwnerInfo oi ON oi.propertyid = pt.pt_uuid left OUTER JOIN eg_user userowner ON oi.owneruserid = userowner.uuid where swconnection.tenantid =$tenantid and swconnection.connectionno is not null and swconnection.status = 'Active' + +- reportName: MeterReadingReport + decryptionPathId: ULBPTDataDumpReport_V2 + summary: Meter Reading 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: propertyuid + label: reports.ws.propertyuid + type: string + source: ws + total: false + - name: propertyusagetype + label: reports.ws.propertyusagetype + type: string + source: ws + total: false + - name: meterstatus + label: reports.ws.meterstatus + type: string + source: ws + total: false + - name: lastreading + label: reports.ws.lastreading + type: string + source: ws + total: false + - name: lastreadingdate + label: reports.ws.lastreadingdate + type: string + source: ws + total: false + - name: ownername + label: reports.ws.ownername + type: string + source: ws + total: false + - name: mobileno + label: reports.ws.mobileno + type: string + source: ws + total: false + - name: locality + label: reports.ws.locality + type: string + source: ws + total: false + - name: ward + label: reports.ws.ward + type: string + source: ws + total: false + - name: address + label: reports.ws.address + type: string + source: ws + total: false + query: | + WITH latest_readings AS (SELECT connectionno, MAX(currentreadingdate) AS latest_reading_date FROM + eg_ws_meterreading WHERE tenantid = $tenantid GROUP BY + connectionno),connection_details AS ( SELECT b1.connectionno, + b1.property_id, b4.currentreading as lastreading, + b4.currentreadingdate as lastReadingDate, + b4.meterstatus FROM eg_ws_connection b1 JOIN + eg_pt_property b2 ON b1.property_id = b2.propertyid JOIN + eg_ws_service b3 ON b1.id = b3.connection_id JOIN + eg_ws_meterreading b4 ON b1.connectionno = b4.connectionno JOIN + latest_readings lr ON b4.connectionno = lr.connectionno + AND b4.currentreadingdate = lr.latest_reading_date WHERE + b1.tenantid = 'pb.amritsar' AND b2.tenantid = $tenantid + AND b3.connectiontype = 'Metered' AND b1.status = 'Active')SELECT + c.connectionno,p.propertyid AS propertyuid, p.propertyusagetype, c.meterstatus, + c.lastreading,c.lastReadingDate, split_part(string_agg(u.name, ','), ',', 1) AS ownername, + split_part(string_agg(u.mobilenumber, ','), ',', 1) AS mobileno, split_part(string_agg(p.localityname, ','), ',', 1) AS locality, split_part(string_agg (p.blockname, ','), ',', 1) AS ward, split_part(string_agg(p.address, ','), ',', 1) AS address FROM report_properties p INNER JOIN connection_details c ON c.property_id = p.propertyid INNER JOIN eg_pt_owner o ON o.propertyid = p.pt_uuid INNER JOIN eg_user u ON u.uuid = o.userid WHERE p.tenantid = $tenantid AND p.propertystatus = 'ACTIVE' GROUP BY p.propertyid,c.connectionno,c.lastreading,c.lastReadingDate,p.propertyusagetype, c.meterstatus; From 8c2f83738a90e3bdb95a21795c4c6f4f4a02fb7e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 24 May 2024 12:06:52 +0530 Subject: [PATCH 1372/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 89 ++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 6c557f4ce..91b3a1dc0 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2707,3 +2707,92 @@ ReportDefinitions: c.connectionno,p.propertyid AS propertyuid, p.propertyusagetype, c.meterstatus, c.lastreading,c.lastReadingDate, split_part(string_agg(u.name, ','), ',', 1) AS ownername, split_part(string_agg(u.mobilenumber, ','), ',', 1) AS mobileno, split_part(string_agg(p.localityname, ','), ',', 1) AS locality, split_part(string_agg (p.blockname, ','), ',', 1) AS ward, split_part(string_agg(p.address, ','), ',', 1) AS address FROM report_properties p INNER JOIN connection_details c ON c.property_id = p.propertyid INNER JOIN eg_pt_owner o ON o.propertyid = p.pt_uuid INNER JOIN eg_user u ON u.uuid = o.userid WHERE p.tenantid = $tenantid AND p.propertystatus = 'ACTIVE' GROUP BY p.propertyid,c.connectionno,c.lastreading,c.lastReadingDate,p.propertyusagetype, c.meterstatus; + +- reportName: BillSchedulerReport + decryptionPathId: ULBPTDataDumpReport_V2 + summary: Bill Scheduler Report + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: locality + label: reports.ws.locality + type: string + source: ws + total: false + - name: status + label: reports.ws.status + type: string + source: ws + total: false + - name: service_type + label: reports.ws.service_type + type: string + source: ws + total: false + - name: billingcyclestartdate + label: reports.ws.billingcyclestartdate + type: string + source: ws + total: false + - name: billingcycleenddate + label: reports.ws.billingcycleenddate + type: string + source: ws + total: false + - name: createddate + label: reports.ws.createddate + type: string + source: ws + total: false + query: | + WITH LatestWaterBill AS (SELECT 'Water' AS + service_type, + s1.locality, + MAX(s1.billingcyclestartdate) AS billingcyclestartdate, + MAX(s1.billingcycleenddate) AS billingcycleenddate, + MAX(s1.createdtime) AS createddate + FROM + eg_ws_scheduler s1 + WHERE s1.tenantid = $tenantid + GROUP BY + s1.locality + ), + LatestSewerageBill AS (SELECT + 'Sewerage' AS service_type, + s2.locality, + MAX(s2.billingcyclestartdate) AS billingcyclestartdate, + MAX(s2.billingcycleenddate) AS billingcycleenddate, + MAX(s2.createdtime) AS createddate + FROM eg_sw_scheduler s2 WHERE s2.tenantid = $tenantid + GROUP BY + s2.locality), + CombinedLatestBill AS ( + SELECT * FROM LatestWaterBill + UNION ALL + SELECT * FROM LatestSewerageBill + ) + SELECT + s1.locality, + s1.status, + b1.service_type, + b1.billingcyclestartdate, + b1.billingcycleenddate, + b1.createddate + FROM + eg_ws_scheduler s1 + INNER JOIN CombinedLatestBill b1 ON s1.locality = b1.locality AND s1.billingcyclestartdate = b1.billingcyclestartdate AND s1.billingcycleenddate = b1.billingcycleenddate + AND s1.createdtime = b1.createddate WHERE s1.tenantid = $tenantid AND b1.service_type = 'Water' + UNION ALL + SELECT + s2.locality, + s2.status, + b1.service_type, + b1.billingcyclestartdate, + b1.billingcycleenddate, + b1.createddate + FROM eg_sw_scheduler s2 INNER JOIN CombinedLatestBill b1 ON s2.locality = b1.locality AND s2.billingcyclestartdate = b1.billingcyclestartdate + AND s2.billingcycleenddate = b1.billingcycleenddate AND s2.createdtime = b1.createddate WHERE s2.tenantid = $tenantid AND b1.service_type = 'Sewerage' + ORDER BY locality, service_type; From 110aaa9d89784d98e5906391d770ea79e0751b98 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 24 May 2024 12:30:15 +0530 Subject: [PATCH 1373/1630] Update ws-reports.yml sw demand --- configs/reports/configs/ws-reports.yml | 76 +++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 91b3a1dc0..1e9e02d81 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2702,7 +2702,7 @@ ReportDefinitions: eg_ws_meterreading b4 ON b1.connectionno = b4.connectionno JOIN latest_readings lr ON b4.connectionno = lr.connectionno AND b4.currentreadingdate = lr.latest_reading_date WHERE - b1.tenantid = 'pb.amritsar' AND b2.tenantid = $tenantid + b1.tenantid = $tenantid AND b2.tenantid = $tenantid AND b3.connectiontype = 'Metered' AND b1.status = 'Active')SELECT c.connectionno,p.propertyid AS propertyuid, p.propertyusagetype, c.meterstatus, c.lastreading,c.lastReadingDate, split_part(string_agg(u.name, ','), ',', 1) AS ownername, @@ -2796,3 +2796,77 @@ ReportDefinitions: FROM eg_sw_scheduler s2 INNER JOIN CombinedLatestBill b1 ON s2.locality = b1.locality AND s2.billingcyclestartdate = b1.billingcyclestartdate AND s2.billingcycleenddate = b1.billingcycleenddate AND s2.createdtime = b1.createddate WHERE s2.tenantid = $tenantid AND b1.service_type = 'Sewerage' ORDER BY locality, service_type; + +- reportName: SWDemandDetailReport + decryptionPathId: ULBPTDataDumpReport_V2 + summary: SW Demand Detail 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: finyear + label: reports.ws.finyear + type: string + source: ws + total: false + - name: status + label: reports.ws.status + type: string + source: ws + total: false + - name: demandupdateddate + label: reports.ws.demandupdateddate + type: string + source: ws + total: false + - name: taxhead + label: reports.ws.taxhead + type: string + source: ws + total: false + - name: taxamt + label: reports.ws.taxamt + type: string + source: ws + total: false + - name: taxamt + label: reports.ws.taxamt + type: string + source: ws + total: false + - name: taxcoll + label: reports.ws.taxcoll + type: string + source: ws + total: false + - name: balance + label: reports.ws.balance + type: string + source: ws + total: false + - name: ispaymentcompleted + label: reports.ws.ispaymentcompleted + type: string + source: ws + total: false + query: | + SELECT + sw.connectionno, + COALESCE(to_char((to_timestamp(d.taxperiodfrom/1000) at time zone 'Asia/Kolkata'),'YYYY-MM') || '-' || to_char((to_timestamp(d.taxperiodto/1000) at time zone 'Asia/Kolkata'),'YYYY-MM'), 'N/A') AS Finyear, + d.status, + to_timestamp(dd.createdtime/1000) at time zone 'Asia/Kolkata' AS DemandUpdateddate, + dd.taxheadcode AS taxHead, + dd.taxamount AS taxamt, + dd.collectionamount AS taxcoll, + (dd.taxamount - dd.collectionamount) AS balance, + d.ispaymentcompleted + FROM eg_sw_connection sw LEFT JOIN egbs_demand_v1 d ON sw.connectionno = d.consumercode AND d.tenantid = $tenantid AND d.businessservice = 'SW' AND d.taxperiodfrom >= '1704000082000' AND d.status != 'CANCELLED' + LEFT JOIN egbs_demanddetail_v1 dd ON dd.demandid = d.id WHERE sw.tenantid = $tenantid + ORDER BY sw.connectionno; From 5f00144ca22e9bd63eb1faea98d559fac074c423 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 24 May 2024 13:12:28 +0530 Subject: [PATCH 1374/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 1e9e02d81..b40502b04 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -39,8 +39,8 @@ ReportDefinitions: type: string source: ws total: false - - name: instrumentdate - label: reports.ws.instrumentdate + - name: transactiondate + label: reports.ws.transactiondate type: string source: ws total: false @@ -127,8 +127,8 @@ ReportDefinitions: paymentmode, paymentstatus, instrumentnumber, - instrumentdate, - usr.username as collectorname, + to_char((To_timestamp(payment.instrumentdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + (case when usr.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else usr.name end) as collectorname, payername as ownername1 from egcl_paymentdetail pd inner join egcl_bill as bill on bill.id=pd.billid From 29a57665e70f76242c7a7b929999644a845a3664 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 24 May 2024 14:40:35 +0530 Subject: [PATCH 1375/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index b40502b04..03db5abd6 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1,7 +1,7 @@ --- ReportDefinitions: - reportName: ReceiptRegisterSW - decryptionPathId: ULBPTDataDumpReport_V2 + decryptionPathId: MiscReceiptULB_v2 summary: Receipt Register version: 1.0.0 moduleName: rainmaker-ws @@ -19,8 +19,8 @@ ReportDefinitions: type: string source: ws total: false - - name: mobileno - label: reports.ws.mobileno + - name: mobilenumber + label: reports.ws.mobilenumber type: string source: ws total: false @@ -128,7 +128,7 @@ ReportDefinitions: paymentstatus, instrumentnumber, to_char((To_timestamp(payment.instrumentdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - (case when usr.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else usr.name end) as collectorname, + usr.name as collectorname, payername as ownername1 from egcl_paymentdetail pd inner join egcl_bill as bill on bill.id=pd.billid From 7fefb387c8214c5544c2d37f33875fae790bd2bc Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 24 May 2024 14:50:31 +0530 Subject: [PATCH 1376/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 03db5abd6..0eb2e70df 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -119,7 +119,7 @@ ReportDefinitions: select receiptnumber as receiptno, bill.consumercode as connectionno, - usr.mobilenumber as mobileno, + usr.mobilenumber as mobilenumber, to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as receiptdate1, bill.businessservice as service, paidby as payername, From 3acd1e649b7714ab92a30db212b2b5557558a680 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 24 May 2024 14:57:40 +0530 Subject: [PATCH 1377/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 0eb2e70df..7684d9212 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1,7 +1,7 @@ --- ReportDefinitions: - reportName: ReceiptRegisterSW - decryptionPathId: MiscReceiptULB_v2 + decryptionPathId: ULBPTDataDumpReport_V2 summary: Receipt Register version: 1.0.0 moduleName: rainmaker-ws @@ -19,8 +19,8 @@ ReportDefinitions: type: string source: ws total: false - - name: mobilenumber - label: reports.ws.mobilenumber + - name: mobileno + label: reports.ws.mobileno type: string source: ws total: false @@ -119,7 +119,7 @@ ReportDefinitions: select receiptnumber as receiptno, bill.consumercode as connectionno, - usr.mobilenumber as mobilenumber, + 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, paidby as payername, From 918335a498b3e8799fa46984786e0e95791b96a5 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 27 May 2024 11:08:08 +0530 Subject: [PATCH 1378/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 7684d9212..b06d7cc2d 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -18,12 +18,7 @@ ReportDefinitions: label: reports.ws.connectionno type: string source: ws - total: false - - name: mobileno - label: reports.ws.mobileno - type: string - source: ws - total: false + total: false - name: receiptdate1 label: reports.ws.receiptdate type: string @@ -118,8 +113,7 @@ ReportDefinitions: -- Use CTE to force query plan, compute & use CTE later select receiptnumber as receiptno, - bill.consumercode as connectionno, - usr.mobilenumber as mobileno, + bill.consumercode as connectionno, to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as receiptdate1, bill.businessservice as service, paidby as payername, From 257ddd1e433cf4a076e4741bb37bd0f6e8013162 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 27 May 2024 14:46:44 +0530 Subject: [PATCH 1379/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index b06d7cc2d..505adf666 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1,7 +1,7 @@ --- ReportDefinitions: - reportName: ReceiptRegisterSW - decryptionPathId: ULBPTDataDumpReport_V2 + decryptionPathId: MiscReceiptULB_v2 summary: Receipt Register version: 1.0.0 moduleName: rainmaker-ws From e627693ec4a78e5004616584c04f1be53bee1e8f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 28 May 2024 09:52:14 +0530 Subject: [PATCH 1380/1630] Update ws-reports.yml sw --- configs/reports/configs/ws-reports.yml | 34 +++++++++++--------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 505adf666..3285cef6f 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2524,77 +2524,72 @@ ReportDefinitions: pdfPageSize: A1 sourceColumns: - name: connectionno - label: reports.ws.connectionno + label: reports.sw.connectionno type: string source: ws total: false - name: plotsize - label: reports.ws.plotsize + label: reports.sw.plotsize type: string source: ws total: false - name: oldconnectionno - label: reports.ws.oldconnectionno + label: reports.sw.oldconnectionno type: string source: ws total: false - name: applicationno - label: reports.ws.applicationno + label: reports.sw.applicationno type: string source: ws total: false - name: propertyid - label: reports.ws.propertyid + label: reports.sw.propertyid type: string source: ws total: false - name: applicationstatus - label: reports.ws.applicationstatus + label: reports.sw.applicationstatus type: string source: ws total: false - name: ownername - label: reports.ws.ownername + label: reports.sw.ownername type: string source: ws total: false - name: guardianname - label: reports.ws.guardianname + label: reports.sw.guardianname type: string source: ws total: false - name: address - label: reports.ws.address + label: reports.sw.address type: string source: ws total: false - name: connectionstatus - label: reports.ws.connectionstatus - type: string - source: ws - total: false - - name: connectiontype - label: reports.ws.connectiontype + label: reports.sw.connectionstatus type: string source: ws total: false - name: usage - label: reports.ws.usage + label: reports.sw.usage type: string source: ws total: false - name: subusage - label: reports.ws.subusage + label: reports.sw.subusage type: string source: ws total: false - name: connectionexecutiondate - label: reports.ws.connectionexecutiondate + label: reports.sw.connectionexecutiondate type: string source: ws total: false - name: connectionholdername - label: reports.ws.connectionholdername + label: reports.sw.connectionholdername type: string source: ws total: false @@ -2609,7 +2604,6 @@ ReportDefinitions: applicationno, swconnection.applicationstatus as applicationstatus, swconnection.status as connectionstatus, - sw.connectiontype as connectiontype, sw.connectionexecutiondate as connectionexecutiondate, pt.propertystatus as propertystatus, pt.propertyusagetype as usage, From b3a0a894b5ecc00fb96e4fa94d24d9c7d253eefd Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 31 May 2024 09:32:56 +0530 Subject: [PATCH 1381/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 43 ++++++++++++++++---------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 3285cef6f..f9591c9d1 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2679,22 +2679,33 @@ ReportDefinitions: source: ws total: false query: | - WITH latest_readings AS (SELECT connectionno, MAX(currentreadingdate) AS latest_reading_date FROM - eg_ws_meterreading WHERE tenantid = $tenantid GROUP BY - connectionno),connection_details AS ( SELECT b1.connectionno, - b1.property_id, b4.currentreading as lastreading, - b4.currentreadingdate as lastReadingDate, - b4.meterstatus FROM eg_ws_connection b1 JOIN - eg_pt_property b2 ON b1.property_id = b2.propertyid JOIN - eg_ws_service b3 ON b1.id = b3.connection_id JOIN - eg_ws_meterreading b4 ON b1.connectionno = b4.connectionno JOIN - latest_readings lr ON b4.connectionno = lr.connectionno - AND b4.currentreadingdate = lr.latest_reading_date WHERE - b1.tenantid = $tenantid AND b2.tenantid = $tenantid - AND b3.connectiontype = 'Metered' AND b1.status = 'Active')SELECT - c.connectionno,p.propertyid AS propertyuid, p.propertyusagetype, c.meterstatus, - c.lastreading,c.lastReadingDate, split_part(string_agg(u.name, ','), ',', 1) AS ownername, - split_part(string_agg(u.mobilenumber, ','), ',', 1) AS mobileno, split_part(string_agg(p.localityname, ','), ',', 1) AS locality, split_part(string_agg (p.blockname, ','), ',', 1) AS ward, split_part(string_agg(p.address, ','), ',', 1) AS address FROM report_properties p INNER JOIN connection_details c ON c.property_id = p.propertyid INNER JOIN eg_pt_owner o ON o.propertyid = p.pt_uuid INNER JOIN eg_user u ON u.uuid = o.userid WHERE p.tenantid = $tenantid AND p.propertystatus = 'ACTIVE' GROUP BY p.propertyid,c.connectionno,c.lastreading,c.lastReadingDate,p.propertyusagetype, c.meterstatus; + WITH connection_details AS (SELECT b1.connectionno, b1.property_id,b4.currentreading, b4.currentreadingdate + FROM eg_ws_connection b1 JOIN eg_pt_property b2 ON b1.property_id = b2.propertyid + JOIN eg_ws_service b3 ON b1.id = b3.connection_id + JOIN eg_ws_meterreading b4 ON b1.connectionno = b4.connectionno + JOIN ( + SELECT + connectionno, + MAX(currentreadingdate) AS latest_reading_date FROM eg_ws_meterreading WHERE tenantid = $tenantid + GROUP BY connectionno + ) AS latest_readings ON b4.connectionno = latest_readings.connectionno + AND b4.currentreadingdate = latest_readings.latest_reading_date WHERE b1.tenantid = $tenantid AND b2.tenantid = $tenantid AND b3.connectiontype = 'Metered' AND + b1.status = 'Active' + ) SELECT + c.connectionno ,p.propertyid AS propertyuid,p.usagecategory, c.currentreading, c.currentreadingdate, + split_part(string_agg(u.name, ','), ',', 1) AS ownername, + split_part(string_agg(u.mobilenumber, ','), ',', 1) AS mobilenumber, + split_part(string_agg(a.locality, ','), ',', 1) AS locality, + split_part(string_agg(a.doorno, ','), ',', 1) AS doorno, + split_part(string_agg(a.buildingname, ','), ',', 1) AS buildingname + FROM eg_pt_property p + LEFT JOIN eg_pt_document d ON d.entityid = p.id AND d.tenantid = $tenantid + INNER JOIN eg_pt_owner o ON o.propertyid = p.id + INNER JOIN eg_user u ON u.uuid = o.userid + INNER JOIN eg_pt_address a ON a.propertyid = p.id + JOIN connection_details c ON c.property_id = p.propertyid + WHERE p.tenantid = $tenantid AND p.status = 'ACTIVE' + GROUP BY p.propertyid, c.connectionno , c.currentreading, c.currentreadingdate,p.usagecategory - reportName: BillSchedulerReport decryptionPathId: ULBPTDataDumpReport_V2 From cb50699f1ea0aa66df7bf9665aad52d51914679b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 31 May 2024 09:38:44 +0530 Subject: [PATCH 1382/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 29 +++++++++++--------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index f9591c9d1..45d8970d2 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2633,23 +2633,18 @@ ReportDefinitions: type: string source: ws total: false - - name: propertyusagetype - label: reports.ws.propertyusagetype + - name: usagecategory + label: reports.ws.usagecategory type: string source: ws total: false - - name: meterstatus - label: reports.ws.meterstatus + - name: currentreading + label: reports.ws.currentreading type: string source: ws total: false - - name: lastreading - label: reports.ws.lastreading - type: string - source: ws - total: false - - name: lastreadingdate - label: reports.ws.lastreadingdate + - name: currentreadingdate + label: reports.ws.currentreadingdate type: string source: ws total: false @@ -2658,8 +2653,8 @@ ReportDefinitions: type: string source: ws total: false - - name: mobileno - label: reports.ws.mobileno + - name: mobilenumber + label: reports.ws.mobilenumber type: string source: ws total: false @@ -2668,13 +2663,13 @@ ReportDefinitions: type: string source: ws total: false - - name: ward - label: reports.ws.ward + - name: doorno + label: reports.ws.doorno type: string source: ws total: false - - name: address - label: reports.ws.address + - name: buildingname + label: reports.ws.buildingname type: string source: ws total: false From da144380f40b0eb240f265d46a3044b4217c73f6 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 31 May 2024 10:06:18 +0530 Subject: [PATCH 1383/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 68 ++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 45d8970d2..3f12d1b4b 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2864,3 +2864,71 @@ ReportDefinitions: FROM eg_sw_connection sw LEFT JOIN egbs_demand_v1 d ON sw.connectionno = d.consumercode AND d.tenantid = $tenantid AND d.businessservice = 'SW' AND d.taxperiodfrom >= '1704000082000' AND d.status != 'CANCELLED' LEFT JOIN egbs_demanddetail_v1 dd ON dd.demandid = d.id WHERE sw.tenantid = $tenantid ORDER BY sw.connectionno; + + +- reportName: CollectionSummaryReport + decryptionPathId: ULBPTDataDumpReport_V2 + summary: Collection Summary Report + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: usage + label: reports.ws.usage + type: string + source: ws + total: false + - name: service + label: reports.ws.service + type: string + source: ws + total: false + - name: noofreceipts + label: reports.ws.noofreceipts + type: string + source: ws + total: false + - name: collected + label: reports.ws.collected + type: string + source: ws + total: false + - name: paymentmode + label: reports.ws.paymentmode + type: string + source: ws + total: false + query: | + WITH connection_data AS (SELECT + wc.connectionno, + pt.propertyid, + CASE WHEN pt.usagecategory LIKE 'NONRESIDENTIAL%' THEN 'NONRESIDENTIAL' ELSE pt.usagecategory END AS usage + FROM eg_ws_connection wc + INNER JOIN eg_pt_property pt ON wc.property_id = pt.propertyid + AND wc.tenantid = pt.tenantid WHERE wc.tenantid =$tenantid AND wc.status = 'Active' + UNION SELECT + sc.connectionno, + pt.propertyid, + CASE WHEN pt.usagecategory LIKE 'NONRESIDENTIAL%' THEN 'NONRESIDENTIAL' + ELSE pt.usagecategory END AS usage FROM eg_sw_connection sc + INNER JOIN eg_pt_property pt ON sc.property_id = pt.propertyid AND sc.tenantid = pt.tenantid WHERE sc.tenantid =$tenantid + AND sc.status = 'Active')SELECT + cd.usage as usage, + bill.businessservice AS service, + COUNT(receiptnumber) AS NoOfReceipts, + SUM(amountpaid) AS collected, + payment.paymentmode 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 connection_data AS cd ON bill.consumercode = cd.connectionno + AND payment.paymentstatus != 'CANCELLED' WHERE payment.tenantid =$tenantid AND pd.businessservice IN ('WS','SW') + AND bill.status = 'ACTIVE' AND pd.receiptdate > '1711929599000' + GROUP BY cd.usage,bill.businessservice,payment.paymentmode + ORDER BY cd.usage,bill.businessservice,payment.paymentmode + + + + + From 37879d20a3f9560648d8252cd3f432d60cc8661c Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Wed, 5 Jun 2024 15:09:12 +0530 Subject: [PATCH 1384/1630] Fixed Bill for Period sw-bill.json --- configs/pdf-service/data-config/sw-bill.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/sw-bill.json b/configs/pdf-service/data-config/sw-bill.json index 8b991a9a1..97281503c 100644 --- a/configs/pdf-service/data-config/sw-bill.json +++ b/configs/pdf-service/data-config/sw-bill.json @@ -500,14 +500,14 @@ { "variable": "fromPeriod", "value": { - "path": "$.billDetails[0].fromPeriod" + "path": "$.billDetails.filter((ele) => ele.amount > 0)[0].fromPeriod" }, "type": "date" }, { "variable": "toPeriod", "value": { - "path": "$.billDetails[0].toPeriod" + "path": "$.billDetails[0].filter((ele) => ele.amount > 0)[0].toPeriod" }, "type": "date" }, From 6b61e5b5b65f2a9c440db39a7ab731456fdf3eb1 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Wed, 5 Jun 2024 15:22:42 +0530 Subject: [PATCH 1385/1630] Fixed issues sw-bill.json --- configs/pdf-service/data-config/sw-bill.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/sw-bill.json b/configs/pdf-service/data-config/sw-bill.json index 97281503c..4f1123d33 100644 --- a/configs/pdf-service/data-config/sw-bill.json +++ b/configs/pdf-service/data-config/sw-bill.json @@ -500,14 +500,14 @@ { "variable": "fromPeriod", "value": { - "path": "$.billDetails.filter((ele) => ele.amount > 0)[0].fromPeriod" + "path": "$.billDetails[$.billDetails.length -1].fromPeriod" }, "type": "date" }, { "variable": "toPeriod", "value": { - "path": "$.billDetails[0].filter((ele) => ele.amount > 0)[0].toPeriod" + "path": "$.billDetails[$.billDetails.length -1].toPeriod" }, "type": "date" }, From 8ca031794b5b2168da5df5302efd89b665e976bf Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Wed, 5 Jun 2024 15:38:50 +0530 Subject: [PATCH 1386/1630] Fixed issues date sw-bill.json --- configs/pdf-service/data-config/sw-bill.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/sw-bill.json b/configs/pdf-service/data-config/sw-bill.json index 4f1123d33..3ce11c202 100644 --- a/configs/pdf-service/data-config/sw-bill.json +++ b/configs/pdf-service/data-config/sw-bill.json @@ -500,14 +500,14 @@ { "variable": "fromPeriod", "value": { - "path": "$.billDetails[$.billDetails.length -1].fromPeriod" + "path": "$.billDetails[?(@.amount > 0)].fromPeriod" }, "type": "date" }, { "variable": "toPeriod", "value": { - "path": "$.billDetails[$.billDetails.length -1].toPeriod" + "path": "$.billDetails[?(@.amount > 0)].toPeriod" }, "type": "date" }, From 9b317b553ad8248a55861058a6348643a96f640a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 13 Jun 2024 10:26:45 +0530 Subject: [PATCH 1387/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 3f12d1b4b..7794637de 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2673,6 +2673,24 @@ ReportDefinitions: type: string source: ws total: false + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND c.currentreadingdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND c.currentreadingdate <= $toDate + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND a.locality IN ($localityArray) query: | WITH connection_details AS (SELECT b1.connectionno, b1.property_id,b4.currentreading, b4.currentreadingdate FROM eg_ws_connection b1 JOIN eg_pt_property b2 ON b1.property_id = b2.propertyid From ddad2f41463f01317473b3fcb0ce5fd625f4eece Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 13 Jun 2024 11:10:32 +0530 Subject: [PATCH 1388/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 7794637de..04758744a 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2673,6 +2673,7 @@ ReportDefinitions: type: string source: ws total: false + searchParams: - name: fromDate label: reports.pt.fromDate type: epoch @@ -2690,7 +2691,7 @@ ReportDefinitions: type: boundarylist source: pt isMandatory: false - searchClause: AND a.locality IN ($localityArray) + searchClause: AND a.locality IN ($localityArray) query: | WITH connection_details AS (SELECT b1.connectionno, b1.property_id,b4.currentreading, b4.currentreadingdate FROM eg_ws_connection b1 JOIN eg_pt_property b2 ON b1.property_id = b2.propertyid From 4cfe49d8667ee97e77d41ff93d90c5538a9cb85f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 13 Jun 2024 11:33:46 +0530 Subject: [PATCH 1389/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 04758744a..dddcad0ab 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2719,7 +2719,7 @@ ReportDefinitions: INNER JOIN eg_pt_address a ON a.propertyid = p.id JOIN connection_details c ON c.property_id = p.propertyid WHERE p.tenantid = $tenantid AND p.status = 'ACTIVE' - GROUP BY p.propertyid, c.connectionno , c.currentreading, c.currentreadingdate,p.usagecategory + groupby: GROUP BY p.propertyid, c.connectionno , c.currentreading, c.currentreadingdate,p.usagecategory - reportName: BillSchedulerReport decryptionPathId: ULBPTDataDumpReport_V2 From 1dc09f2941dc6a7321e233fa55be6a612d20fcef Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 13 Jun 2024 11:48:25 +0530 Subject: [PATCH 1390/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index dddcad0ab..9ddf01009 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2706,7 +2706,8 @@ ReportDefinitions: AND b4.currentreadingdate = latest_readings.latest_reading_date WHERE b1.tenantid = $tenantid AND b2.tenantid = $tenantid AND b3.connectiontype = 'Metered' AND b1.status = 'Active' ) SELECT - c.connectionno ,p.propertyid AS propertyuid,p.usagecategory, c.currentreading, c.currentreadingdate, + c.connectionno ,p.propertyid AS propertyuid,p.usagecategory, c.currentreading, + to_char((To_timestamp(c.currentreadingdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS currentreadingdate, split_part(string_agg(u.name, ','), ',', 1) AS ownername, split_part(string_agg(u.mobilenumber, ','), ',', 1) AS mobilenumber, split_part(string_agg(a.locality, ','), ',', 1) AS locality, From 37b207c05292bcc37e99f8edfdda11a1830aacfb Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 13 Jun 2024 12:09:13 +0530 Subject: [PATCH 1391/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 9ddf01009..3045f9d4f 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2678,13 +2678,13 @@ ReportDefinitions: label: reports.pt.fromDate type: epoch source: pt - isMandatory: true + isMandatory: false searchClause: AND c.currentreadingdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt - isMandatory: true + isMandatory: false searchClause: AND c.currentreadingdate <= $toDate - name: localityArray label: reports.pt.zoneList From 84c4c6cc145722a78a5211416e3f1b80ab747df6 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 13 Jun 2024 12:17:44 +0530 Subject: [PATCH 1392/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 3045f9d4f..9714ff5b9 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2653,8 +2653,8 @@ ReportDefinitions: type: string source: ws total: false - - name: mobilenumber - label: reports.ws.mobilenumber + - name: mobileno + label: reports.ws.mobileno type: string source: ws total: false @@ -2709,7 +2709,7 @@ ReportDefinitions: c.connectionno ,p.propertyid AS propertyuid,p.usagecategory, c.currentreading, to_char((To_timestamp(c.currentreadingdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS currentreadingdate, split_part(string_agg(u.name, ','), ',', 1) AS ownername, - split_part(string_agg(u.mobilenumber, ','), ',', 1) AS mobilenumber, + split_part(string_agg(u.mobilenumber, ','), ',', 1) AS mobileno, split_part(string_agg(a.locality, ','), ',', 1) AS locality, split_part(string_agg(a.doorno, ','), ',', 1) AS doorno, split_part(string_agg(a.buildingname, ','), ',', 1) AS buildingname From 8836c23c3826f06929e2c5ec9ad99de2c7615b00 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 13 Jun 2024 13:13:37 +0530 Subject: [PATCH 1393/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 48 ++++++++++++++------------ 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 9714ff5b9..3882ddf84 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2693,34 +2693,36 @@ ReportDefinitions: isMandatory: false searchClause: AND a.locality IN ($localityArray) query: | - WITH connection_details AS (SELECT b1.connectionno, b1.property_id,b4.currentreading, b4.currentreadingdate + WITH latest_readings AS (SELECT connectionno, MAX(currentreadingdate) AS latest_reading_date FROM eg_ws_meterreading WHERE tenantid = $tenantid + GROUP BY connectionno), + connection_details AS ( SELECT b1.connectionno,b1.property_id, b4.currentreading as lastreading, b4.currentreadingdate as lastReadingDate, b4.meterstatus FROM eg_ws_connection b1 JOIN eg_pt_property b2 ON b1.property_id = b2.propertyid JOIN eg_ws_service b3 ON b1.id = b3.connection_id JOIN eg_ws_meterreading b4 ON b1.connectionno = b4.connectionno - JOIN ( - SELECT - connectionno, - MAX(currentreadingdate) AS latest_reading_date FROM eg_ws_meterreading WHERE tenantid = $tenantid - GROUP BY connectionno - ) AS latest_readings ON b4.connectionno = latest_readings.connectionno - AND b4.currentreadingdate = latest_readings.latest_reading_date WHERE b1.tenantid = $tenantid AND b2.tenantid = $tenantid AND b3.connectiontype = 'Metered' AND - b1.status = 'Active' - ) SELECT - c.connectionno ,p.propertyid AS propertyuid,p.usagecategory, c.currentreading, - to_char((To_timestamp(c.currentreadingdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS currentreadingdate, + JOIN latest_readings lr ON b4.connectionno = lr.connectionno + AND b4.currentreadingdate = lr.latest_reading_date + WHERE b1.tenantid = $tenantid AND b2.tenantid = $tenantid + AND b3.connectiontype = 'Metered' AND b1.status = 'Active')SELECT + c.connectionno, + p.propertyid AS propertyuid, + p.propertyusagetype, + c.meterstatus, + c.lastreading, + c.lastReadingDate, split_part(string_agg(u.name, ','), ',', 1) AS ownername, split_part(string_agg(u.mobilenumber, ','), ',', 1) AS mobileno, - split_part(string_agg(a.locality, ','), ',', 1) AS locality, - split_part(string_agg(a.doorno, ','), ',', 1) AS doorno, - split_part(string_agg(a.buildingname, ','), ',', 1) AS buildingname - FROM eg_pt_property p - LEFT JOIN eg_pt_document d ON d.entityid = p.id AND d.tenantid = $tenantid - INNER JOIN eg_pt_owner o ON o.propertyid = p.id - INNER JOIN eg_user u ON u.uuid = o.userid - INNER JOIN eg_pt_address a ON a.propertyid = p.id - JOIN connection_details c ON c.property_id = p.propertyid - WHERE p.tenantid = $tenantid AND p.status = 'ACTIVE' - groupby: GROUP BY p.propertyid, c.connectionno , c.currentreading, c.currentreadingdate,p.usagecategory + split_part(string_agg(p.localityname, ','), ',', 1) AS locality, + split_part(string_agg(p.blockname, ','), ',', 1) AS ward, + split_part(string_agg(p.address, ','), ',', 1) AS address, + NULL as CurrentMeterStatus, NULL as CurrentReading, + NULL as CurrentReadingDate + FROM report_properties p INNER JOIN connection_details c ON c.property_id = p.propertyid + INNER JOIN eg_pt_owner o ON o.propertyid = p.pt_uuid + INNER JOIN eg_user u ON u.uuid = o.userid + WHERE p.tenantid = $tenantid AND p.propertystatus = 'ACTIVE' + groupby: GROUP BY p.propertyid,c.connectionno,c.lastreading,c.lastReadingDate,p.propertyusagetype,c.meterstatus + + - reportName: BillSchedulerReport decryptionPathId: ULBPTDataDumpReport_V2 From 1931ddb3f6f82c3c11730a62a512df2da0e00e53 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 13 Jun 2024 13:45:16 +0530 Subject: [PATCH 1394/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 69 +++++++++++++++----------- 1 file changed, 39 insertions(+), 30 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 3882ddf84..1b8f3156f 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2633,18 +2633,23 @@ ReportDefinitions: type: string source: ws total: false - - name: usagecategory - label: reports.ws.usagecategory + - name: propertyusagetype + label: reports.ws.propertyusagetype type: string source: ws total: false - - name: currentreading - label: reports.ws.currentreading + - name: meterstatus + label: reports.ws.meterstatus type: string source: ws total: false - - name: currentreadingdate - label: reports.ws.currentreadingdate + - name: lastreading + label: reports.ws.lastreading + type: string + source: ws + total: false + - name: lastreadingdate + label: reports.ws.lastreadingdate type: string source: ws total: false @@ -2663,35 +2668,38 @@ ReportDefinitions: type: string source: ws total: false - - name: doorno - label: reports.ws.doorno + - name: ward + label: reports.ws.ward + type: string + source: ws + total: false + - name: address + label: reports.ws.address + type: string + source: ws + total: false + - name: currentmeterstatus + label: reports.ws.currentmeterstatus + type: string + source: ws + total: false + - name: currentreading + label: reports.ws.currentreading type: string source: ws total: false - - name: buildingname - label: reports.ws.buildingname + - name: currentreadingdate + label: reports.ws.currentreadingdate type: string source: ws total: false searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND c.currentreadingdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND c.currentreadingdate <= $toDate - name: localityArray label: reports.pt.zoneList type: boundarylist source: pt isMandatory: false - searchClause: AND a.locality IN ($localityArray) + searchClause: AND p.localitycode IN ($localityArray) query: | WITH latest_readings AS (SELECT connectionno, MAX(currentreadingdate) AS latest_reading_date FROM eg_ws_meterreading WHERE tenantid = $tenantid GROUP BY connectionno), @@ -2703,19 +2711,20 @@ ReportDefinitions: AND b4.currentreadingdate = lr.latest_reading_date WHERE b1.tenantid = $tenantid AND b2.tenantid = $tenantid AND b3.connectiontype = 'Metered' AND b1.status = 'Active')SELECT - c.connectionno, + c.connectionno as connectionno, p.propertyid AS propertyuid, - p.propertyusagetype, - c.meterstatus, - c.lastreading, - c.lastReadingDate, + p.propertyusagetype as propertyusagetype, + c.meterstatus as meterstatus, + c.lastreading as lastreading, + to_char((To_timestamp(c.lastReadingDate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as lastreadingdate, split_part(string_agg(u.name, ','), ',', 1) AS ownername, split_part(string_agg(u.mobilenumber, ','), ',', 1) AS mobileno, split_part(string_agg(p.localityname, ','), ',', 1) AS locality, split_part(string_agg(p.blockname, ','), ',', 1) AS ward, split_part(string_agg(p.address, ','), ',', 1) AS address, - NULL as CurrentMeterStatus, NULL as CurrentReading, - NULL as CurrentReadingDate + NULL as currentmeterstatus, + NULL as currentreading, + NULL as currentreadingdate FROM report_properties p INNER JOIN connection_details c ON c.property_id = p.propertyid INNER JOIN eg_pt_owner o ON o.propertyid = p.pt_uuid INNER JOIN eg_user u ON u.uuid = o.userid From 6c0dc9ef397cb4eaa427c62f50b67db5efb7423d Mon Sep 17 00:00:00 2001 From: vinothrallapalli-eGov Date: Mon, 8 Jul 2024 00:02:41 +0530 Subject: [PATCH 1395/1630] Remove logo --- configs/pdf-service/format-config/property-receipt.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index e9fff43b0..dd2af7d6a 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -15,11 +15,6 @@ ], "body": [ [ - { - "image": "{{logoImage}}", - "width": 50, - "height": 61.25 - }, { "stack": [ { From 740afead7bc140af2b97bd5111c4e9866fd74dae Mon Sep 17 00:00:00 2001 From: vinothrallapalli-eGov Date: Mon, 8 Jul 2024 00:06:52 +0530 Subject: [PATCH 1396/1630] Remove logo --- configs/pdf-service/data-config/property-receipt.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 79102e7a1..edbd7e142 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -753,11 +753,6 @@ "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", From 6285ee2c1de89250acb142c0f85916da6483c5ae Mon Sep 17 00:00:00 2001 From: vinothrallapalli-eGov Date: Mon, 8 Jul 2024 00:23:43 +0530 Subject: [PATCH 1397/1630] Update logo URL --- configs/pdf-service/data-config/property-receipt.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index edbd7e142..a068216a8 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -753,6 +753,11 @@ "variable":"email", "value":"$.MdmsRes.tenant.tenants[0].emailId" }, + { + "variable": "logoImage", + "value":"https://www.pngitem.com/pimgs/m/245-2458910_govt-of-punjab-india-logo-hd-png-download.png", + "type":"image" + }, { "variable": "logo-header", "value":"$.MdmsRes.tenant.tenants[0].code", From 42c57713f37750dececd8b15411e21e079f67b64 Mon Sep 17 00:00:00 2001 From: vinothrallapalli-eGov Date: Mon, 8 Jul 2024 00:24:54 +0530 Subject: [PATCH 1398/1630] Add logo --- configs/pdf-service/format-config/property-receipt.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index dd2af7d6a..dd308254d 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -15,6 +15,11 @@ ], "body": [ [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, { "stack": [ { From eff2b7d2a71ac6e9cb2bd6a384284e9c0c514b8a Mon Sep 17 00:00:00 2001 From: vinothrallapalli-eGov Date: Mon, 8 Jul 2024 00:31:37 +0530 Subject: [PATCH 1399/1630] Update logo path --- 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 a068216a8..04c3b0a10 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -755,7 +755,7 @@ }, { "variable": "logoImage", - "value":"https://www.pngitem.com/pimgs/m/245-2458910_govt-of-punjab-india-logo-hd-png-download.png", + "value":"$.MdmsRes.tenant.tenants[0].logoId", "type":"image" }, { From 655605c14132d9700ad049427b2192eedcb3dc11 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 8 Jul 2024 15:40:59 +0530 Subject: [PATCH 1400/1630] added searchGisMap for GIS integration --- .../egov-searcher/rainmaker-pt-gissearch.yml | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index fa9bf952f..b3d6f4e5e 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -155,3 +155,60 @@ SearchDefinitions: 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 propertystatus='ACTIVE' $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 reportproperties rp + inner join units ru on rp.pt_uuid=ru.propertyuui + 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 propertystatus='ACTIVE' $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 4026cc132767d1ae3566a657c66d71d3a3377c01 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 8 Jul 2024 16:16:46 +0530 Subject: [PATCH 1401/1630] syntax --- 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 b3d6f4e5e..c02439ff3 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -198,8 +198,8 @@ SearchDefinitions: 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 propertystatus='ACTIVE' $where) data - groupBy: - orderBy: + groupBy: + orderBy: searchParams: condition: AND params: From 0228a5e3f765b123767a4cb6bb3a83eb5422577b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 8 Jul 2024 16:51:39 +0530 Subject: [PATCH 1402/1630] 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 c02439ff3..64198a2b4 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -169,7 +169,7 @@ SearchDefinitions: string_agg(occupancytype,',') as occupancy, sum(builtuparea) as builtup_area from report_units - where propertyuuid in (select pt_uuid from report_properties where propertystatus='ACTIVE' $where) + where propertyuuid in (select pt_uuid from report_properties $where) group by propertyuuid ) select @@ -197,7 +197,7 @@ SearchDefinitions: inner join units ru on rp.pt_uuid=ru.propertyuui 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 propertystatus='ACTIVE' $where) data + $where) data groupBy: orderBy: searchParams: From 55343f0554bdeb9526d84e352b9a07e061ddfc0e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 8 Jul 2024 16:54:50 +0530 Subject: [PATCH 1403/1630] Update rainmaker-pt-gissearch.yml --- 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 64198a2b4..2b3187472 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -193,7 +193,7 @@ SearchDefinitions: assessmentyears as financial_year, rpay.amoutpaid as amunt_paid, rpay.receiptdate as date_of_payment - from reportproperties rp + from report_properties rp inner join units ru on rp.pt_uuid=ru.propertyuui 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) From 31339b244430ee0d9e5cd6f237feb81ac4906804 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 8 Jul 2024 16:58:13 +0530 Subject: [PATCH 1404/1630] Update rainmaker-pt-gissearch.yml --- 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 2b3187472..48941f084 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -194,7 +194,7 @@ SearchDefinitions: rpay.amoutpaid as amunt_paid, rpay.receiptdate as date_of_payment from report_properties rp - inner join units ru on rp.pt_uuid=ru.propertyuui + 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 From cb66a475609b284e2fbcde754458812648ce1650 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 15 Jul 2024 15:24:42 +0530 Subject: [PATCH 1405/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 38 ++++++++++++-------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 1b8f3156f..2b23fbbc1 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2140,26 +2140,24 @@ ReportDefinitions: total: true query: | -- Use CTE to force query plan, compute & use CTE later - select a.*, b.*,c.*, d.*,e.*,f.*,g.*,h.*,i.*, j.*,k.*,l.*,m.*, - n.*,o.*,p.*,q.*,r.*,s.* from (select count (*) as totalwaterconnections from eg_ws_connection where tenantid=$tenantid)a, - (select count (*) as totalsewerageconnections from eg_sw_connection where tenantid=$tenantid)b, - (SELECT SUM(cnt) AS bothconnection FROM ( SELECT COUNT(*) AS cnt FROM eg_ws_connection where tenantid=$tenantid UNION ALL SELECT COUNT(*) AS cnt FROM eg_sw_connection where tenantid=$tenantid) AS Both_Connection)c, - (select count(*) as totalwateractive from eg_ws_connection where status='Active' and tenantid=$tenantid)d, - (select count(*) as totalsewerageactive from eg_sw_connection where status='Active' and tenantid=$tenantid)e, - (SELECT SUM(cnt) AS bothactiveconnection FROM (SELECT COUNT(*) AS cnt FROM eg_ws_connection where tenantid=$tenantid and status='Active' UNION ALL SELECT COUNT(*) AS cnt FROM eg_sw_connection where tenantid=$tenantid and status='Active') AS "Both ACTIVE Connection")f, - (select count(*) as totalactiveresidentialinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('RESIDENTIAL')) and status='Active' and tenantid=$tenantid)g, - (select count(*) as totalactiveresidentialinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('RESIDENTIAL')) and status='Active' and tenantid=$tenantid)h, - (select count(*) as totalactivenonresidentialinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and status='Active' and tenantid=$tenantid)i, - (select count(*) as totalactivenonresidentialinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status='ACTIVE' and usagecategory in ('NONRESIDENTIAL.COMMERCIAL','NONRESIDENTIAL')) and status='Active' and tenantid=$tenantid)j, - (select count(*) as totalmeteredconnections from eg_ws_connection where tenantid=$tenantid and additionaldetails->>'meterId' is not null)k, - (select count(*) as totalexemptedinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and status='Active' and tenantid=$tenantid)l, - (select count(*) as totalexemptedinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE' and usagecategory='RESIDENTIAL')and status='Active' and tenantid=$tenantid)m, - (select count(*) as betweenfivemarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE')and status='Active' and tenantid=$tenantid)n, - (select count(*) as betweenfivemarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status='ACTIVE')and status='Active' and tenantid=$tenantid)o, - (select count(*) as betweensixmarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE')and status='Active' and tenantid=$tenantid)p, - (select count(*) as betweensixandtenmarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE')and status='Active' and tenantid=$tenantid)q, - (select count(*) as morethantenmarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status='ACTIVE')and status='Active' and tenantid=$tenantid)r, - (select count(*) as morethantenmarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status='ACTIVE') and status='Active' and tenantid=$tenantid)s; + select a.*, b.*, d.*,e.*,g.*,h.*,i.*, j.*,k.*,l.*,m.*,n.*,o.*,p.*,q.*,r.*,s.* from + (select count (*) as totalwaterconnections from eg_ws_connection where tenantid=$tenantid)a, + (select count (*) as totalsewerageconnections from eg_sw_connection where tenantid=$tenantid)b, + (select count (*) as totalwateractive from eg_ws_connection where status='Active' and tenantid=$tenantid)d, + (select count (*) as totalsewerageactive from eg_sw_connection where status='Active' and tenantid=$tenantid)e, + (select count (*) as totalactiveresidentialinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status IN('ACTIVE','PENDINGWS') and usagecategory in ('RESIDENTIAL') and tenantid=$tenantid) and status='Active' and tenantid=$tenantid)g, + (select count (*) as totalactiveresidentialinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status IN ('ACTIVE','PENDINGWS') and usagecategory in ('RESIDENTIAL') and tenantid=$tenantid ) and status='Active' and tenantid=$tenantid)h, + (select count (*) as totalactivenonresidentialinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status IN ('ACTIVE','PENDINGWS') and usagecategory like ('NONRESIDENTIAL%') and tenantid=$tenantid) and status='Active' and tenantid=$tenantid)i, + (select count (*) as totalactivenonresidentialinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status IN ('ACTIVE','PENDINGWS') and usagecategory like ('NONRESIDENTIAL%') and tenantid=$tenantid) and status='Active' and tenantid=$tenantid)j, + (select count (*) as totalmeteredconnections from eg_ws_connection , eg_ws_service where id = connection_id and connectiontype = 'Metered' and status='Active' and tenantid=$tenantid)k, + (select count (*) as totalexemptedinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status IN ('ACTIVE','PENDINGWS') and usagecategory='RESIDENTIAL' and tenantid=$tenantid)and status='Active' and tenantid=$tenantid)l, + (select count (*) as totalexemptedinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status IN ('ACTIVE','PENDINGWS') and usagecategory='RESIDENTIAL'and tenantid=$tenantid)and status='Active' and tenantid=$tenantid)m, + (select count (*) as betweenfivemarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status IN ('ACTIVE','PENDINGWS') and tenantid=$tenantid )and status='Active' and tenantid=$tenantid)n, + (select count (*) as betweenfivemarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status IN ('ACTIVE','PENDINGWS') and tenantid=$tenantid )and status='Active' and tenantid=$tenantid)o, + (select count (*) as betweensixmarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status IN ('ACTIVE','PENDINGWS') and tenantid=$tenantid)and status='Active' and tenantid=$tenantid)p, + (select count (*) as betweensixandtenmarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE' and tenantid=$tenantid)and status='Active' and tenantid=$tenantid)q, + (select count (*) as morethantenmarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status IN ('ACTIVE','PENDINGWS') and tenantid=$tenantid)and status='Active' and tenantid=$tenantid)r, + (select count (*) as morethantenmarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status IN ('ACTIVE','PENDINGWS') and tenantid=$tenantid) and status='Active' and tenantid=$tenantid)s; - reportName: WsDefaulterReport summary: Ws Defaulter Report From 355423157f0a187eb0613644ec0da202e1fb8d8c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 22 Jul 2024 12:10:17 +0530 Subject: [PATCH 1406/1630] gis search query update for NIC --- configs/egov-searcher/rainmaker-pt-gissearch.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index 48941f084..782edbb39 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -173,16 +173,16 @@ SearchDefinitions: 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, + surveyid as plot_map_id, + upper(split_part(rp.tenantid,'.',2)) as town, + split_part(replace(surveyid,upper(split_part(rp.tenantid,'.',2)),''),'-',2) as sector, + split_part(surveyid,'-',2) as subsector, + split_part(surveyid,'-',2) as plot, + split_part(rp.tenantid,'.',2) as city, rp.propertyid as property_id, oldpropertyid as oldpropertyid, 'uidno' as uid_no, - 'blockcode' as wardno, + blockname as wardno, builtup_area as builtup_area, plotsize as land_area, 'area' as area, @@ -195,7 +195,7 @@ SearchDefinitions: 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_assessments ra on (ra.propertyid=rp.propertyid and ra.demandstatus!='CANCELLED') inner join report_payments rpay on (rpay.propertyid=rp.propertyid and rpay.amoutpaid=ra.amount) $where) data groupBy: From c57635fdc0c7a45a7d7a70764c345cea7a5de7f1 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 22 Jul 2024 14:15:31 +0530 Subject: [PATCH 1407/1630] gis search by town --- configs/egov-searcher/rainmaker-pt-gissearch.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index 782edbb39..5f481a591 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -204,9 +204,13 @@ SearchDefinitions: condition: AND params: - name: surveyid - isMandatory: true + isMandatory: false jsonPath: $.searchCriteria.plot_map_id operator: = + - name: rp.tenantid + isMandatory: false + jsonPath: $.searchCriteria.town + operator: = output: jsonFormat: {"ResponseInfo": {}} From 998749222b6c40de0d6b95a4aa4403f89f69e0a1 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 22 Jul 2024 14:25:26 +0530 Subject: [PATCH 1408/1630] Update rainmaker-pt-gissearch.yml --- 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 5f481a591..5a6a74994 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -169,7 +169,7 @@ SearchDefinitions: string_agg(occupancytype,',') as occupancy, sum(builtuparea) as builtup_area from report_units - where propertyuuid in (select pt_uuid from report_properties $where) + where propertyuuid in (select pt_uuid from report_properties rp $where) group by propertyuuid ) select From b1036becca7b8b06c40c9301166e5f69ad726f84 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 22 Jul 2024 14:53:40 +0530 Subject: [PATCH 1409/1630] Update rainmaker-pt-gissearch.yml --- configs/egov-searcher/rainmaker-pt-gissearch.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index 5a6a74994..c9004f66f 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -203,14 +203,15 @@ SearchDefinitions: searchParams: condition: AND params: - - name: surveyid - isMandatory: false - jsonPath: $.searchCriteria.plot_map_id - operator: = - name: rp.tenantid isMandatory: false jsonPath: $.searchCriteria.town operator: = + - name: surveyid + isMandatory: false + jsonPath: $.searchCriteria.plot_map_id + operator: = + output: jsonFormat: {"ResponseInfo": {}} From 5fdad328d5c3fc7310c69c5ee4bd868992929706 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 22 Jul 2024 15:57:36 +0530 Subject: [PATCH 1410/1630] gis map tenantid compulsory --- 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 c9004f66f..513e698ff 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -204,7 +204,7 @@ SearchDefinitions: condition: AND params: - name: rp.tenantid - isMandatory: false + isMandatory: true jsonPath: $.searchCriteria.town operator: = - name: surveyid From 468ae94047f8d015c78b060143f9e2e48a84266f Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Tue, 23 Jul 2024 10:35:34 +0530 Subject: [PATCH 1411/1630] Update ws-onetime-receipt.json --- .../format-config/ws-onetime-receipt.json | 16 ++++++++-------- 1 file changed, 8 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 fbe2c1a41..20b448436 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -276,7 +276,7 @@ ], [ { - "text": "Property ID", + "text": "Bank Name", "border": [ true, false, @@ -286,7 +286,7 @@ "style": "receipt-table-value" }, { - "text": "{{proPertyid}}", + "text": "{{bankName}},{{branchName}}", "border": [ false, false, @@ -366,7 +366,7 @@ { "text": [ { - "text": "{{commissioner/eo}}", + "text": "", "bold": true } ], @@ -450,9 +450,9 @@ "table": { "widths": [ "34%", - "16%", + "18%", "36%", - "14%" + "12%" ], "body": [ [ @@ -671,7 +671,7 @@ ], [ { - "text": "Property ID", + "text": "Bank Name", "border": [ true, false, @@ -681,7 +681,7 @@ "style": "receipt-table-value" }, { - "text": "{{proPertyid}}", + "text": "{{bankName}},{{branchName}}", "border": [ false, false, @@ -761,7 +761,7 @@ { "text": [ { - "text": "{{commissioner/eo}}", + "text": "", "bold": true } ], From 62b2bfbd9b2041927a918580f4456402b93704d8 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Tue, 23 Jul 2024 10:41:57 +0530 Subject: [PATCH 1412/1630] Update ws-onetime-receipt.json --- .../pdf-service/format-config/ws-onetime-receipt.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 20b448436..f5130efbd 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -276,7 +276,7 @@ ], [ { - "text": "Bank Name", + "text": "Property ID", "border": [ true, false, @@ -286,7 +286,7 @@ "style": "receipt-table-value" }, { - "text": "{{bankName}},{{branchName}}", + "text": "{{proPertyid}}", "border": [ false, false, @@ -366,7 +366,7 @@ { "text": [ { - "text": "", + "text": "{{}}", "bold": true } ], @@ -671,7 +671,7 @@ ], [ { - "text": "Bank Name", + "text": "Property ID", "border": [ true, false, @@ -681,7 +681,7 @@ "style": "receipt-table-value" }, { - "text": "{{bankName}},{{branchName}}", + "text": "{{proPertyid}}", "border": [ false, false, From 2a9c7c25c30bd77883458836d24e80c2f768014e Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Tue, 23 Jul 2024 11:00:08 +0530 Subject: [PATCH 1413/1630] 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 f5130efbd..cbe6405c2 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -366,7 +366,7 @@ { "text": [ { - "text": "{{}}", + "text": "", "bold": true } ], From 027d2e607c785619c880c418fb6830821d273123 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Mon, 29 Jul 2024 12:32:07 +0530 Subject: [PATCH 1414/1630] Update to PDF financial cybercrime call 1930 --- .../format-config/property-receipt.json | 1 + configs/pdf-service/format-config/sw-bill.json | 17 +++++++++++++++++ configs/pdf-service/format-config/ws-bill.json | 17 +++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index dd308254d..1bcc1f3cf 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -1164,6 +1164,7 @@ {"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":"5. To report any financial cybercrime call 1930 immediately or register any cybercrime at www.cybercrime.gov.in . For latest updates on cybercrime, follow official social media handle ‘Cyberdost ‘ of Ministry of Home Affairs"}, { "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/sw-bill.json b/configs/pdf-service/format-config/sw-bill.json index 78f891a75..0be355040 100644 --- a/configs/pdf-service/format-config/sw-bill.json +++ b/configs/pdf-service/format-config/sw-bill.json @@ -816,6 +816,23 @@ 0.5 ] } + ], + [ + { + "text": "7. To report any financial cybercrime call 1930 immediately or register any cybercrime at www.cybercrime.gov.in . For latest updates on cybercrime, follow official social media handle ‘Cyberdost ‘ of Ministry of Home Affairs", + "border": [ + true, + false, + true, + true + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } ] ] }, diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index dfa90aa1a..f485b922f 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -833,6 +833,23 @@ 0.5 ] } + ], + [ + { + "text": "8.To report any financial cybercrime call 1930 immediately or register any cybercrime at www.cybercrime.gov.in . For latest updates on cybercrime, follow official social media handle ‘Cyberdost ‘ of Ministry of Home Affairs ", + "border": [ + true, + false, + true, + true + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } ] ] }, From 2bde13912bbb0de0abee01b32e7f853724337c90 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Tue, 30 Jul 2024 09:45:48 +0530 Subject: [PATCH 1415/1630] Updated new text pdf --- configs/pdf-service/format-config/property-receipt.json | 2 +- configs/pdf-service/format-config/sw-bill.json | 2 +- configs/pdf-service/format-config/ws-bill.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 1bcc1f3cf..28ba23b21 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -1164,7 +1164,7 @@ {"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":"5. To report any financial cybercrime call 1930 immediately or register any cybercrime at www.cybercrime.gov.in . For latest updates on cybercrime, follow official social media handle ‘Cyberdost ‘ of Ministry of Home Affairs"}, + {"text":"5. To report any financial cybercrime call 1930 immediately or register any cybercrime at www.cybercrime.gov.in . For latest updates on cybercrime, follow official social media handle Cyberdost of Ministry of Home Affairs"}, { "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/sw-bill.json b/configs/pdf-service/format-config/sw-bill.json index 0be355040..d56a70222 100644 --- a/configs/pdf-service/format-config/sw-bill.json +++ b/configs/pdf-service/format-config/sw-bill.json @@ -819,7 +819,7 @@ ], [ { - "text": "7. To report any financial cybercrime call 1930 immediately or register any cybercrime at www.cybercrime.gov.in . For latest updates on cybercrime, follow official social media handle ‘Cyberdost ‘ of Ministry of Home Affairs", + "text": "7. To report any financial cybercrime call 1930 immediately or register any cybercrime at www.cybercrime.gov.in . For latest updates on cybercrime, follow official social media handle Cyberdost of Ministry of Home Affairs", "border": [ true, false, diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index f485b922f..c831b016f 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -836,7 +836,7 @@ ], [ { - "text": "8.To report any financial cybercrime call 1930 immediately or register any cybercrime at www.cybercrime.gov.in . For latest updates on cybercrime, follow official social media handle ‘Cyberdost ‘ of Ministry of Home Affairs ", + "text": "8.To report any financial cybercrime call 1930 immediately or register any cybercrime at www.cybercrime.gov.in . For latest updates on cybercrime, follow official social media handle Cyberdost of Ministry of Home Affairs ", "border": [ true, false, From e8ae50f840e8aaa395974fda63137947810120a1 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 Aug 2024 10:38:08 +0530 Subject: [PATCH 1416/1630] GIS plot_map_id as CITYsector-subsector-plot --- 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 513e698ff..eca6a5e96 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -177,7 +177,7 @@ SearchDefinitions: upper(split_part(rp.tenantid,'.',2)) as town, split_part(replace(surveyid,upper(split_part(rp.tenantid,'.',2)),''),'-',2) as sector, split_part(surveyid,'-',2) as subsector, - split_part(surveyid,'-',2) as plot, + split_part(surveyid,'-',3) as plot, split_part(rp.tenantid,'.',2) as city, rp.propertyid as property_id, oldpropertyid as oldpropertyid, From 8f5ed5a50b99f323fdef2e2cc7dfdc6aeeb0c1d9 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 Aug 2024 10:57:25 +0530 Subject: [PATCH 1417/1630] Update rainmaker-pt-gissearch.yml --- 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 eca6a5e96..8e34db7bc 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -175,7 +175,7 @@ SearchDefinitions: select surveyid as plot_map_id, upper(split_part(rp.tenantid,'.',2)) as town, - split_part(replace(surveyid,upper(split_part(rp.tenantid,'.',2)),''),'-',2) as sector, + split_part(replace(surveyid,upper(split_part(rp.tenantid,'.',2)),''),'-',1) as sector, split_part(surveyid,'-',2) as subsector, split_part(surveyid,'-',3) as plot, split_part(rp.tenantid,'.',2) as city, From 615fce8f9ce66ca316393abe0ba8f3523634bf93 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 Aug 2024 11:51:37 +0530 Subject: [PATCH 1418/1630] Update pt-reports.yml update pmidc --- configs/reports/configs/pt-reports.yml | 98 +++++++++++++++++++++----- 1 file changed, 81 insertions(+), 17 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 277e90b63..457061b57 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4738,7 +4738,7 @@ ReportDefinitions: - 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' + 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,2024-25:2024-25' source: pt isMandatory: true searchClause: AND 1=1 @@ -5242,6 +5242,22 @@ ReportDefinitions: and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate GROUP BY financialyear,zonecode ), + fy2024 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'))='2024-25' + 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 @@ -5271,8 +5287,11 @@ ReportDefinitions: 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" + coalesce(fy2023.totalcount,0) as "2024_25PTR", + coalesce(fy2023.amount,0) as "2024_25Collection", + + 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)+coalesce(fy2024.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)+coalesce(fy2024.amount,0) as "totalcollection" from zones left outer join fy2013 on fy2013.zonecode=zones.zonecode left outer join fy2014 on fy2014.zonecode=zones.zonecode @@ -5285,6 +5304,7 @@ ReportDefinitions: 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 + left outer join fy2024 on fy2024.zonecode=zones.zonecode where 1=1 orderby: order by zonename @@ -5601,6 +5621,22 @@ ReportDefinitions: and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate GROUP BY financialyear,blockcode ), + fy2024 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'))='2024-25' + 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 @@ -5623,13 +5659,17 @@ ReportDefinitions: 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(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(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" + coalesce(fy2023.totalcount,0) as "2023_24PTR", + coalesce(fy2023.amount,0) as "2023_24Collection", + coalesce(fy2024.totalcount,0) as "2024_25PTR", + coalesce(fy2024.amount,0) as "2024_25Collection, + 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)+coalesce(fy2024.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)+coalesce(fy2024.amount,0) as "totalcollection" from blocks left outer join fy2013 on fy2013.blockcode=blocks.blockcode left outer join fy2014 on fy2014.blockcode=blocks.blockcode @@ -5642,6 +5682,7 @@ ReportDefinitions: 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 + left outer join fy2024 on fy2023.blockcode=blocks.blockcode where 1=1 orderby: order by blockname @@ -6086,7 +6127,7 @@ ReportDefinitions: - 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' + 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,2024-25:2024-25' source: pt isMandatory: false searchClause: AND 1=1 @@ -6600,6 +6641,16 @@ ReportDefinitions: type: string source: pt total: true + - name: 2024_25PTR + label: reports.pt.2024_25_PTR + type: string + source: pt + total: true + - name: 2024_25Collection + label: reports.pt.2024_25Collection + type: string + source: pt + total: true - name: totalptr label: reports.pt.totalptr type: string @@ -6664,6 +6715,8 @@ ReportDefinitions: 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(case when assessmentyears='2024-25' then amount else 0 end) as "2024_25Collection", + sum(case when assessmentyears='2024-25' then totalcount else 0 end) as "2024_25PTR", sum(amount) as totalcollection, sum(totalcount) as totalptr from summary @@ -6791,6 +6844,16 @@ ReportDefinitions: type: string source: pt total: true + - name: 2024_25PTR + label: reports.pt.2024_25_PTR + type: string + source: pt + total: true + - name: 2024_25Collection + label: reports.pt.2024_25Collection + type: string + source: pt + total: true - name: totalptr label: reports.pt.totalptr type: string @@ -6855,6 +6918,8 @@ ReportDefinitions: 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(case when assessmentyears='2024-25' then amount else 0 end) as "2024_25Collection", + sum(case when assessmentyears='2024-25' then totalcount else 0 end) as "2024_25PTR", sum(amount) as totalcollection, sum(totalcount) as totalptr from summary @@ -7189,7 +7254,7 @@ ReportDefinitions: - name: finYear label: Financial Year type: singlevaluelist - pattern: 'list://1554057000000:2019-20,1585679400000:2020-21,1617215400000:2021-22,1648751400000:2022-23,1648771200000:2023-24' + pattern: 'list://1554057000000:2019-20,1585679400000:2020-21,1617215400000:2021-22,1648751400000:2022-23,1680287400000:2023-24,1711909800000:2024-25' source: pt isMandatory: true searchClause: AND 1=1 @@ -8020,7 +8085,7 @@ ReportDefinitions: - 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' + 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,1680287400000:2023-24,1711909800000:2024-25' source: pt isMandatory: true searchClause: and assessments.fy not like concat('%',$fy,'%') @@ -8162,7 +8227,7 @@ ReportDefinitions: - 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' + 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,1680287400000:2023-24,1711909800000:2024-25' source: pt isMandatory: true searchClause: and 1=1 @@ -8329,7 +8394,7 @@ ReportDefinitions: - 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' + 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,2024-25:2024-25' 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 @@ -9029,7 +9094,7 @@ ReportDefinitions: - 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' + 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,2024-25:2024-25' source: pt isMandatory: true searchClause: AND 1=1 @@ -9195,7 +9260,7 @@ ReportDefinitions: - 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' + 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,2024-25:2024-25' source: pt isMandatory: true searchClause: AND 1=1 @@ -9337,7 +9402,7 @@ ReportDefinitions: - 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' + 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,2024-25:2024-25' source: pt isMandatory: false searchClause: and d.fy like concat('%',$fy,'%') @@ -9496,7 +9561,7 @@ ReportDefinitions: - 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' + 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,2024-25:2024-25' source: pt isMandatory: false searchClause: and d.fy like concat('%',$fy,'%') @@ -9850,4 +9915,3 @@ ReportDefinitions: and p.instrumentstatus != 'CANCELLED' and p.paymentstatus != 'CANCELLED' - From 39f155abaaffaa1acb4918f691ac3ef5df210d3d Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Mon, 12 Aug 2024 12:20:21 +0530 Subject: [PATCH 1419/1630] Updated two parameter MeterMake and Meterid --- .../data-config/ws-onetime-receipt.json | 12 +++ .../format-config/ws-onetime-receipt.json | 88 ++++++++++++++++++- 2 files changed, 99 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 a98c62f09..5d7386656 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -50,6 +50,18 @@ "path": "$.mobileNumber" } }, + { + "variable": "MeterMake", + "value": { + "path": "$.meterMake" + } + }, + { + "variable": "MeterId", + "value": { + "path": "$.meterId" + } + }, { "variable": "receiptNo", "value": { diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index cbe6405c2..d29113091 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -273,7 +273,50 @@ "style": "receipt-table" } - ], + ], + [ + { + "text": "Meter Make", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{MeterMake}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Meter No", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{MeterId}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], [ { "text": "Property ID", @@ -669,6 +712,49 @@ } ], + [ + { + "text": "Meter Make", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{MeterMake}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Meter No", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{MeterId}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], [ { "text": "Property ID", From 9f3d286abd8d7609038c0bec96d20052f40b4b52 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 13 Aug 2024 16:38:13 +0530 Subject: [PATCH 1420/1630] added ws quarterly report SELECT w.property_id, w.connectionno, w.status AS connection_status, p.usagecategory, p.landarea As PlotSize, d.id AS demandid , d.businessservice, d.taxperiodfrom, d.taxperiodto, d.tenantid AS demand_tenantid, d.minimumamountpayable, d.status AS demand_status, d.ispaymentcompleted FROM eg_ws_connection w LEFT JOIN eg_pt_property p ON w.property_id = p.propertyid LEFT JOIN egbs_demand_v1 d ON d.consumercode = w.connectionno AND d.businessservice = 'WS' AND d.taxperiodfrom = '1704067200000' AND d.tenantid = 'pb.amritsar' WHERE w.tenantid = 'pb.amritsar' AND w.status = 'Active' AND w.connectionno IS NOT NULL AND (d.status IS NULL OR d.status != 'CANCELLED') --- configs/reports/configs/ws-reports.yml | 109 ++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 2b23fbbc1..90db1ec6c 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2956,8 +2956,109 @@ ReportDefinitions: AND bill.status = 'ACTIVE' AND pd.receiptdate > '1711929599000' GROUP BY cd.usage,bill.businessservice,payment.paymentmode ORDER BY cd.usage,bill.businessservice,payment.paymentmode - - - - +- reportName: QaurterlyReport + summary: Qaurter Report + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: property_id + label: reports.ws.property_id + type: string + source: ws + total: false + - name: connectionno + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: connection_status + label: reports.ws.connection_status + type: string + source: ws + total: false + - name: usagecategory + label: reports.ws.usagecategory + type: string + source: ws + total: false + - name: plotsize + label: reports.ws.plotsize + type: string + source: ws + total: false + - name: demandid + label: reports.ws.demandid + type: string + source: ws + total: false + - name: businessservice + label: reports.ws.businessservice + type: string + source: ws + total: false + - name: taxperiodfrom + label: reports.ws.taxperiodfrom + type: string + source: ws + total: false + - name: taxperiodto + label: reports.ws.taxperiodto + type: string + source: ws + total: false + - name: demand_tenantid + label: reports.ws.demand_tenantid + type: string + source: ws + total: false + - name: minimumamountpayable + label: reports.ws.minimumamountpayable + type: string + source: ws + total: false + - name: demand_status + label: reports.ws.demand_status + type: string + source: ws + total: false + - name: ispaymentcompleted + label: reports.ws.ispaymentcompleted + type: string + source: ws + total: false + searchParams: + - name: quarter + label: Quarter + type: singlevaluelist + pattern: 'list://1704067200000:Q1_2024,1711929600000:Q2_2024,1719792000000:Q3_2024' + source: ws + isMandatory: true + searchClause: AND 1=1 + query: | + SELECT + w.property_id, + w.connectionno, + w.status AS connection_status, + p.usagecategory, + p.landarea As plotsize, + d.id AS demandid , + d.businessservice, + d.taxperiodfrom, + d.taxperiodto, + d.tenantid AS demand_tenantid, + d.minimumamountpayable, + d.status AS demand_status, + d.ispaymentcompleted + FROM eg_ws_connection w + LEFT JOIN eg_pt_property p ON w.property_id = p.propertyid + LEFT JOIN egbs_demand_v1 d ON (d.consumercode = w.connectionno AND d.businessservice = 'WS' AND d.taxperiodfrom = $quarter AND d.tenantid = $tenantid) + WHERE + w.tenantid = $tenantid + AND w.status = 'Active' + AND w.connectionno IS NOT NULL + AND (d.status IS NULL OR d.status != 'CANCELLED') + From b9abb0b63aed5f2e366f60aa6b8b174acf526c68 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 13 Aug 2024 17:00:46 +0530 Subject: [PATCH 1421/1630] added SW Quarter Report --- configs/reports/configs/ws-reports.yml | 106 ++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 90db1ec6c..fbebffb57 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3061,4 +3061,108 @@ ReportDefinitions: AND w.status = 'Active' AND w.connectionno IS NOT NULL AND (d.status IS NULL OR d.status != 'CANCELLED') - + +- reportName: SWQaurterlyReport + summary: SW Qaurter Report + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: property_id + label: reports.ws.property_id + type: string + source: ws + total: false + - name: connectionno + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: connection_status + label: reports.ws.connection_status + type: string + source: ws + total: false + - name: usagecategory + label: reports.ws.usagecategory + type: string + source: ws + total: false + - name: plotsize + label: reports.ws.plotsize + type: string + source: ws + total: false + - name: demandid + label: reports.ws.demandid + type: string + source: ws + total: false + - name: businessservice + label: reports.ws.businessservice + type: string + source: ws + total: false + - name: taxperiodfrom + label: reports.ws.taxperiodfrom + type: string + source: ws + total: false + - name: taxperiodto + label: reports.ws.taxperiodto + type: string + source: ws + total: false + - name: demand_tenantid + label: reports.ws.demand_tenantid + type: string + source: ws + total: false + - name: minimumamountpayable + label: reports.ws.minimumamountpayable + type: string + source: ws + total: false + - name: demand_status + label: reports.ws.demand_status + type: string + source: ws + total: false + - name: ispaymentcompleted + label: reports.ws.ispaymentcompleted + type: string + source: ws + total: false + searchParams: + - name: quarter + label: Quarter + type: singlevaluelist + pattern: 'list://1704067200000:Q1_2024,1711929600000:Q2_2024,1719792000000:Q3_2024' + source: ws + isMandatory: true + searchClause: AND 1=1 + query: | + SELECT + w.property_id, + w.connectionno, + w.status AS connection_status, + p.usagecategory, + p.landarea As plotsize, + d.id AS demandid , + d.businessservice, + d.taxperiodfrom, + d.taxperiodto, + d.tenantid AS demand_tenantid, + d.minimumamountpayable, + d.status AS demand_status, + d.ispaymentcompleted + FROM eg_sw_connection w + LEFT JOIN eg_pt_property p ON w.property_id = p.propertyid + LEFT JOIN egbs_demand_v1 d ON (d.consumercode = w.connectionno AND d.businessservice = 'SW' AND d.taxperiodfrom = $quarter AND d.tenantid = $tenantid) + WHERE + w.tenantid = $tenantid + AND w.status = 'Active' + AND w.connectionno IS NOT NULL + AND (d.status IS NULL OR d.status != 'CANCELLED') From 6150fec14e21a55c759d540abcaae722a7a088b5 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:17:09 +0530 Subject: [PATCH 1422/1630] Update tl-reports.yml --- configs/reports/configs/tl-reports.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 544a21cea..0c2d761a5 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2302,6 +2302,11 @@ ReportDefinitions: type: string source: tl total: false + - name: applicationdate + label: report.tl.receipt.applicationdate + type: string + source: tl + total: false searchParams: - name: fromDate label: reports.tl.fromDate @@ -2324,6 +2329,7 @@ ReportDefinitions: query: | SELECT tl.applicationnumber as applicationnumber, + to_char((To_timestamp(tl.applicationdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as applicationdate, locality_tlb.locality as locality, eg_bndry_mohalla.blockcode as ward_block, eg_bndry_mohalla.zonecode as zone, From aba8ee3de5a836284aab0419e66cc9f814942294 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:21:23 +0530 Subject: [PATCH 1423/1630] Update tl-reports.yml --- configs/reports/configs/tl-reports.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 0c2d761a5..bbd886c21 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2625,6 +2625,11 @@ ReportDefinitions: type: string source: tl total: false + - name: applicationdate + label: report.tl.receipt.applicationdate + type: string + source: tl + total: false searchParams: - name: fromDate label: reports.tl.fromDate @@ -2641,6 +2646,7 @@ ReportDefinitions: query: | SELECT tl.applicationnumber as applicationnumber, + to_char((To_timestamp(tl.applicationdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as applicationdate, propertyid, financialyear, (case when oldlicensenumber is null then 'New' else 'Renewal' end) AS licensetype, From 33a0ec58f9a5e56fed8f53d810b72d275b9a99a0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 14 Aug 2024 12:11:01 +0530 Subject: [PATCH 1424/1630] 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 bbd886c21..756aa7395 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2681,7 +2681,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!='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 + 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,tl.applicationdate orderby: order by tl.tenantid - reportName: TradeLicensePendencyReport_v2 From 0effb7007b30df1d8fcced6223fef314fc4241c0 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Wed, 14 Aug 2024 16:34:30 +0530 Subject: [PATCH 1425/1630] fixed issues metrer id --- 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 5d7386656..390d6b39a 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -59,7 +59,7 @@ { "variable": "MeterId", "value": { - "path": "$.meterId" + "path": "$.MeterId" } }, { From 846849795d374002ce07b15778f083a9128a87a1 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 26 Aug 2024 00:17:21 +0530 Subject: [PATCH 1426/1630] USERNAME_PT to extract mobilenumbers --- configs/reports/configs/pt-reports.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 457061b57..10ce141ae 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9678,16 +9678,18 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND report_owners.tenantid = $ulb + searchClause: AND rp.tenantid = $ulb query: | -- Use CTE to force query plan, compute & use CTE later SELECT - tenantid, - propertyid, + rp.tenantid as tenantid, + rp.propertyid as propertyid, ownername as ownername, guardianname as guardianname, - mobilenumber as mobileno - from report_owners + mobilenumber as mobileno, + rp.propertyusagetype + from report_owners ro + inner join report_properties rp on (ro.propertyid=rp.propertyid and propertystatus='ACTIVE') where 1=1 - reportName: PropertyListReport From 400b6d95c7096095bb31ba10b54d9ee48c99a4e3 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 27 Aug 2024 10:11:57 +0530 Subject: [PATCH 1427/1630] 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 10ce141ae..1c2154847 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9690,7 +9690,7 @@ ReportDefinitions: rp.propertyusagetype from report_owners ro inner join report_properties rp on (ro.propertyid=rp.propertyid and propertystatus='ACTIVE') - where 1=1 + where 1=1 and rp.propertyusagetype='RESIDENTIAL' - reportName: PropertyListReport decryptionPathId: ULBPTDataDumpReport_V2 From 3dd42d339c3f9a101a13a6f6a68badea7614d382 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 28 Aug 2024 09:29:14 +0530 Subject: [PATCH 1428/1630] 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 1c2154847..b3abe75cd 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9690,8 +9690,8 @@ ReportDefinitions: rp.propertyusagetype from report_owners ro inner join report_properties rp on (ro.propertyid=rp.propertyid and propertystatus='ACTIVE') - where 1=1 and rp.propertyusagetype='RESIDENTIAL' - + where 1=1 + - reportName: PropertyListReport decryptionPathId: ULBPTDataDumpReport_V2 summary: PT Report for GIS Mapping From 1838dbe484ace778606326e22b8bd1357e2186a2 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Tue, 3 Sep 2024 12:43:49 +0530 Subject: [PATCH 1429/1630] Updated new changes bill pdf --- .../pdf-service/format-config/ws-bill.json | 65 +++---------------- 1 file changed, 8 insertions(+), 57 deletions(-) diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index c831b016f..3bebf3b97 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -534,7 +534,7 @@ "style": "receipt-table-value2" }, { - "text": "{{advanceAvailable_label}}", + "text": "Advance", "border": [ false, false, @@ -717,7 +717,7 @@ ], [ { - "text": "1. Online payment can be done for {{serviceType}} charges payment. https://mseva.lgpunjab.gov.in/", + "text": "1. Online payment https://mseva.lgpunjab.gov.in/citizen", "border": [ true, false, @@ -734,7 +734,7 @@ ], [ { - "text": "2. If last date of bill is a holiday. Kindly pay your bills either online or offline on next working day to avoid penalty.", + "text": "2. If last date of bill is a holiday. Kindly pay your bills either online or offline on previous working day to avoid penalty.", "border": [ true, false, @@ -749,26 +749,10 @@ ] } ], + [ { - "text": "3. Payment mode available: Cash/Cheque at office counter,Online.", - "border": [ - true, - false, - true, - false - ], - "margin": [ - 4, - 0, - 0, - 0.5 - ] - } - ], - [ - { - "text": "4. Please bring this bill while making payment at office counter.", + "text": "3. Please bring this bill while making payment at office counter during collection hours i.e. 9.00AM to 1:30PM", "border": [ true, false, @@ -785,24 +769,7 @@ ], [ { - "text": "5. 10% surcharge charges will be applied after due date", - "border": [ - true, - false, - true, - false - ], - "margin": [ - 4, - 0, - 0, - 0.5 - ] - } - ], - [ - { - "text": "6. surcharge with & late payment charges calculated based on the payment date will reflect in next bill ", + "text": "4. 10% surcharge charges will be applied after due date will reflect in next bill", "border": [ true, false, @@ -817,26 +784,10 @@ ] } ], + [ { - "text": "7. Bill Payment collect/recover during office period i.e.09:00AM to 01:30PM. ", - "border": [ - true, - false, - true, - true - ], - "margin": [ - 4, - 0, - 0, - 0.5 - ] - } - ], - [ - { - "text": "8.To report any financial cybercrime call 1930 immediately or register any cybercrime at www.cybercrime.gov.in . For latest updates on cybercrime, follow official social media handle Cyberdost of Ministry of Home Affairs ", + "text": "5.To report any financial cybercrime call 1930 immediately or register any cybercrime at www.cybercrime.gov.in . For latest updates on cybercrime, follow official social media handle Cyberdost of Ministry of Home Affairs ", "border": [ true, false, From 07ed93ca108d2713766dda7ad1b92d285bef5055 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Thu, 5 Sep 2024 11:53:17 +0530 Subject: [PATCH 1430/1630] ws report changes --- configs/reports/configs/ws-reports.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index fbebffb57..fdfd5df98 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1862,8 +1862,16 @@ ReportDefinitions: isMandatory: true searchClause: AND ws.createdtime<= $toDate query: | - select count(*) as no_of_applications, pt.usagecategory as catergory, - ws.status as water_status from eg_ws_connection ws, eg_pt_property pt where ws.property_id=pt.propertyid + SELECT + COUNT(*) AS no_of_applications, + pt.usagecategory AS category, + ws.status AS water_status + FROM + eg_ws_connection ws + JOIN + eg_pt_property pt ON ws.property_id = pt.propertyid + WHERE + ws.property_id=pt.propertyid and ws.createdtime>=$fromDate and ws.createdtime<=$toDate and ws.tenantid=$tenantid From eaea48ad1b8594949e88daca2d96735c2eacd2fc Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Thu, 5 Sep 2024 12:30:06 +0530 Subject: [PATCH 1431/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index fdfd5df98..bdaf607a5 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1838,8 +1838,8 @@ ReportDefinitions: type: string source: ws total: true - - name: catergory - label: reports.ws.catergory + - name: category + label: reports.ws.category type: string source: ws total: false From 30f24ae171adc575342fd292eb05ab7ad116ac90 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 6 Sep 2024 12:07:08 +0530 Subject: [PATCH 1432/1630] added fieds in PT_RECEIPTREGISTER_REPORT_V2 unsynch receipt register added property fields ownershipcategory, block, locality, usagetype --- configs/reports/configs/pt-reports.yml | 27 +++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index b3abe75cd..e29ecef8d 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6294,6 +6294,26 @@ ReportDefinitions: type: string source: pt total: false + - name: ownershipcategory + label: reports.pt.ownershipcategory + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: localityname + label: reports.pt.localityname + type: string + source: pt + total: false + - name: block + label: reports.pt.block + type: string + source: pt + total: false searchParams: - name: fromDate label: reports.pt.fromDate @@ -6355,9 +6375,14 @@ ReportDefinitions: 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 + (case when rp.collectedby is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else rp.collectedby end) as collectorname, + p.ownershipcategory as ownershipcategory, + p.propertyusagetype as usagetype, + p.localityname as localityname, + p.blockcode as block from report_payments as rp inner join assessments as asmt on asmt.billid = rp.billid -- asmt.billid like concat('%',rp.billid,'%') + inner join report_properties p on (p.propertyid=rp.propertyid and p.propertystatus='ACTIVE') where rp.paymentstatus!='CANCELLED' and rp.tenantid=$tenantid orderby: order by receiptnumber From 1282ddc1388b332a3b00edb38e7e3858097820e5 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 6 Sep 2024 12:21:24 +0530 Subject: [PATCH 1433/1630] undo last commit reverted to last commit as conflict in row version error occurred --- configs/reports/configs/pt-reports.yml | 32 +++++--------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index e29ecef8d..2f82d5f45 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6294,26 +6294,6 @@ ReportDefinitions: type: string source: pt total: false - - name: ownershipcategory - label: reports.pt.ownershipcategory - type: string - source: pt - total: false - - name: usagetype - label: reports.pt.usagetype - type: string - source: pt - total: false - - name: localityname - label: reports.pt.localityname - type: string - source: pt - total: false - - name: block - label: reports.pt.block - type: string - source: pt - total: false searchParams: - name: fromDate label: reports.pt.fromDate @@ -6375,14 +6355,14 @@ ReportDefinitions: 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, - p.ownershipcategory as ownershipcategory, - p.propertyusagetype as usagetype, - p.localityname as localityname, - p.blockcode as block + (case when rp.collectedby is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else rp.collectedby end) as collectorname --, + --p.ownershipcategory as ownershipcategory, + --p.propertyusagetype as usagetype, + --p.localityname as localityname, + --p.blockcode as block from report_payments as rp inner join assessments as asmt on asmt.billid = rp.billid -- asmt.billid like concat('%',rp.billid,'%') - inner join report_properties p on (p.propertyid=rp.propertyid and p.propertystatus='ACTIVE') + --inner join report_properties p on (p.propertyid=rp.propertyid and p.propertystatus='ACTIVE') where rp.paymentstatus!='CANCELLED' and rp.tenantid=$tenantid orderby: order by receiptnumber From 25a36d7ea9504cad12df44b2d5c455c77a406562 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 6 Sep 2024 12:37:08 +0530 Subject: [PATCH 1434/1630] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 2f82d5f45..6439d68fe 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3044,22 +3044,6 @@ ReportDefinitions: 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, @@ -3076,10 +3060,9 @@ ReportDefinitions: 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 + 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!='pb.testing' - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and pt.propertyid = bill.consumercode and bill.status!='INACTIVE' groupby: GROUP BY payment.tenantid orderby: ORDER BY payment.tenantid, totalamountpaid DESC NULLS LAST From dda58e2f74d440ea03f2e5352401786882ac67c6 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Fri, 6 Sep 2024 14:39:28 +0530 Subject: [PATCH 1435/1630] Removed UAT text --- configs/pdf-service/format-config/ws-estimationnotice.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/ws-estimationnotice.json b/configs/pdf-service/format-config/ws-estimationnotice.json index ddc08e4fc..332ddd183 100644 --- a/configs/pdf-service/format-config/ws-estimationnotice.json +++ b/configs/pdf-service/format-config/ws-estimationnotice.json @@ -29,7 +29,7 @@ { "stack": [ { - "text": "{{tenantName}} - {{UAT}}", + "text": "{{tenantName}}", "style": "receipt-logo-header", "margin": [ 0, From 4d7f7d0340b4f9c4307ea5cb5b07fbb8aaa7f09a Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Fri, 6 Sep 2024 15:05:48 +0530 Subject: [PATCH 1436/1630] romoved the line space --- .../pdf-service/format-config/ws-sanctionletter.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/pdf-service/format-config/ws-sanctionletter.json b/configs/pdf-service/format-config/ws-sanctionletter.json index 06c5ee848..4383b2af7 100644 --- a/configs/pdf-service/format-config/ws-sanctionletter.json +++ b/configs/pdf-service/format-config/ws-sanctionletter.json @@ -49,7 +49,7 @@ ], "alignment": "center", "margin": [ - 90, + 50, 30, 0, 0 @@ -112,7 +112,7 @@ } ], "margin": [ - 50, + 30, 10, 0, 0 @@ -148,7 +148,7 @@ } ], "margin": [ - 50, + 30, 10, 0, 0 @@ -194,7 +194,7 @@ } ], "margin": [ - 50, + 30, 10, 0, 0 @@ -217,7 +217,7 @@ } ], "margin": [ - 50, + 30, 10, 0, 0 @@ -240,8 +240,8 @@ false ], "margin": [ + 20, 40, - 60, 0, 0 ] From a9e1868f587c711b90bc56741aa7794780484599 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 6 Sep 2024 15:09:05 +0530 Subject: [PATCH 1437/1630] 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 6439d68fe..9520ef476 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3062,7 +3062,7 @@ ReportDefinitions: --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!='pb.testing' - and pt.propertyid = bill.consumercode and bill.status!='INACTIVE' + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' groupby: GROUP BY payment.tenantid orderby: ORDER BY payment.tenantid, totalamountpaid DESC NULLS LAST From 5c932ab0f07229bbdf883fb4cbeb3a2ae0813ed1 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Mon, 9 Sep 2024 14:49:05 +0530 Subject: [PATCH 1438/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 69 ++++++++------------------ 1 file changed, 22 insertions(+), 47 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index bdaf607a5..af5a668cf 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1890,21 +1890,6 @@ ReportDefinitions: type: string source: ws total: false - - name: tax_period_from_date - label: reports.ws.tax_period_from_date - type: string - source: ws - total: false - - name: total_demand_amount - label: reports.ws.total_demand_amount - type: string - source: ws - total: true - - name: total_collected_amount - label: reports.ws.total_collected_amount - type: string - source: ws - total: true - name: distinct_consumercode_count label: reports.ws.distinct_consumercode_count type: string @@ -1922,49 +1907,39 @@ ReportDefinitions: source: pt isMandatory: true searchClause: and 1=1 - - name: serviceType - label: serviceType - type: singlevaluelist - pattern: 'list://WS:Water' - source: pt - isMandatory: true - searchClause: AND 1=1 query: | WITH quarterly_data AS ( SELECT - EXTRACT(YEAR FROM to_timestamp(d1.taxperiodfrom / 1000)) AS year, - CASE - WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) = 04 THEN 'Quarter 1' - WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) = 07 THEN 'Quarter 2' - WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) = 10 THEN 'Quarter 3' - WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) = 01 THEN 'Quarter 4' - END AS quarter, - to_char(to_timestamp(d1.taxperiodfrom / 1000), 'YYYY-MM-DD') AS tax_period_from_date, - COUNT(DISTINCT d1.consumercode) AS distinct_consumercode_count, - SUM(d2.taxamount) AS total_demand_amount, - SUM(d2.collectionamount) AS total_collected_amount,d5.usagecategory AS UsageType + EXTRACT(YEAR FROM to_timestamp(d1.taxperiodfrom / 1000)) AS year, + CASE + WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) BETWEEN 4 AND 6 THEN 'Quarter 1' + WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) BETWEEN 7 AND 9 THEN 'Quarter 2' + WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) BETWEEN 10 AND 12 THEN 'Quarter 3' + ELSE 'Quarter 4' + END AS quarter, + COUNT(DISTINCT d1.consumercode) AS distinct_consumercode_count, + d5.usagecategory AS UsageType FROM egbs_demand_v1 d1 - LEFT JOIN egbs_demanddetail_v1 d2 ON d1.id = d2.demandid - LEFT JOIN eg_ws_connection d4 ON d4.connectionno = d1.consumercode - LEFT JOIN eg_pt_property d5 ON d4.property_id = d5.propertyid - WHERE d1.taxperiodfrom >= $fromDate - AND d1.businessservice = $serviceType + LEFT JOIN eg_ws_connection d4 ON d4.connectionno = d1.consumercode + LEFT JOIN eg_ws_service ser ON d4.id = ser.connection_id + LEFT JOIN eg_pt_property d5 ON d4.property_id = d5.propertyid + WHERE d1.taxperiodfrom >= $fromDate AND d1.tenantid = $tenantid - AND d1.status !='CANCELLED' + AND d1.status != 'CANCELLED' + AND d1.businessservice = 'WS' and ser.connectiontype!='Metered' + AND d5.usagecategory IS NOT NULL GROUP BY - year, quarter, tax_period_from_date,UsageType + year, quarter, ser.connectiontype, d5.usagecategory ) SELECT - year || '->' || quarter AS quarter, - tax_period_from_date, - COALESCE(CAST(total_demand_amount AS TEXT), 'No Tax amount') AS total_demand_amount, - COALESCE(CAST(total_collected_amount AS TEXT), 'No Collection Amount') AS total_collected_amount, - COALESCE(CAST(distinct_consumercode_count AS TEXT), '0') AS distinct_consumercode_count, - UsageType + year || '->' || quarter AS quarter, + COALESCE(CAST(distinct_consumercode_count AS TEXT), '0') AS distinct_consumercode_count, + UsageType FROM - quarterly_data where 1=1 + quarterly_data + where 1=1 - reportName: GeneratSWDemandReport summary: Sewerage Demand Report From 3b9375375000ac4e379526e0587fe48cedf05169 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Mon, 9 Sep 2024 14:52:05 +0530 Subject: [PATCH 1439/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 62 +++++++++----------------- 1 file changed, 22 insertions(+), 40 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index af5a668cf..1689a1f2f 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1954,21 +1954,6 @@ ReportDefinitions: type: string source: ws total: false - - name: tax_period_from_date - label: reports.ws.tax_period_from_date - type: string - source: ws - total: false - - name: total_demand_amount - label: reports.ws.total_demand_amount - type: string - source: ws - total: true - - name: total_collected_amount - label: reports.ws.total_collected_amount - type: string - source: ws - total: true - name: distinct_consumercode_count label: reports.ws.distinct_consumercode_count type: string @@ -1989,39 +1974,36 @@ ReportDefinitions: query: | WITH quarterly_data AS ( SELECT - EXTRACT(YEAR FROM to_timestamp(d1.taxperiodfrom / 1000)) AS year, - CASE - WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) = 04 THEN 'Quarter 1' - WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) = 07 THEN 'Quarter 2' - WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) = 10 THEN 'Quarter 3' - WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) = 01 THEN 'Quarter 4' - END AS quarter, - to_char(to_timestamp(d1.taxperiodfrom / 1000), 'YYYY-MM-DD') AS tax_period_from_date, - COUNT(DISTINCT d1.consumercode) AS distinct_consumercode_count, - SUM(d2.taxamount) AS total_demand_amount, - SUM(d2.collectionamount) AS total_collected_amount,d5.usagecategory AS UsageType + EXTRACT(YEAR FROM to_timestamp(d1.taxperiodfrom / 1000)) AS year, + CASE + WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) BETWEEN 4 AND 6 THEN 'Quarter 1' + WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) BETWEEN 7 AND 9 THEN 'Quarter 2' + WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) BETWEEN 10 AND 12 THEN 'Quarter 3' + ELSE 'Quarter 4' + END AS quarter, + COUNT(DISTINCT d1.consumercode) AS distinct_consumercode_count, + d5.usagecategory AS UsageType FROM egbs_demand_v1 d1 - LEFT JOIN egbs_demanddetail_v1 d2 ON d1.id = d2.demandid - LEFT JOIN eg_sw_connection d4 ON d4.connectionno = d1.consumercode - LEFT JOIN eg_pt_property d5 ON d4.property_id = d5.propertyid - WHERE d1.taxperiodfrom >= $fromDate - AND d1.businessservice = 'SW' + LEFT JOIN eg_sw_connection d4 ON d4.connectionno = d1.consumercode + LEFT JOIN eg_sw_service ser ON d4.id = ser.connection_id + LEFT JOIN eg_pt_property d5 ON d4.property_id = d5.propertyid + WHERE d1.taxperiodfrom >= $fromDate AND d1.tenantid = $tenantid - AND d1.status !='CANCELLED' + AND d1.status != 'CANCELLED' + AND d1.businessservice = 'SW' and ser.connectiontype!='Metered' + AND d5.usagecategory IS NOT NULL GROUP BY - year, quarter, tax_period_from_date,UsageType + year, quarter, ser.connectiontype, d5.usagecategory ) SELECT - year || '->' || quarter AS quarter, - tax_period_from_date, - COALESCE(CAST(total_demand_amount AS TEXT), 'No Tax amount') AS total_demand_amount, - COALESCE(CAST(total_collected_amount AS TEXT), 'No Collection Amount') AS total_collected_amount, - COALESCE(CAST(distinct_consumercode_count AS TEXT), '0') AS distinct_consumercode_count, - UsageType + year || '->' || quarter AS quarter, + COALESCE(CAST(distinct_consumercode_count AS TEXT), '0') AS distinct_consumercode_count, + UsageType FROM - quarterly_data where 1=1 + quarterly_data + where 1=1 - reportName: Connectioncountreport summary: Connection Count Report From 0c7683156676cdcfd3cf6734fd1ffb29dcf89c7b Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Mon, 9 Sep 2024 15:18:28 +0530 Subject: [PATCH 1440/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 54 +++++++++++++++++--------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 1689a1f2f..df6de2b04 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2104,26 +2104,42 @@ ReportDefinitions: source: ws total: true query: | - -- Use CTE to force query plan, compute & use CTE later - select a.*, b.*, d.*,e.*,g.*,h.*,i.*, j.*,k.*,l.*,m.*,n.*,o.*,p.*,q.*,r.*,s.* from - (select count (*) as totalwaterconnections from eg_ws_connection where tenantid=$tenantid)a, - (select count (*) as totalsewerageconnections from eg_sw_connection where tenantid=$tenantid)b, - (select count (*) as totalwateractive from eg_ws_connection where status='Active' and tenantid=$tenantid)d, - (select count (*) as totalsewerageactive from eg_sw_connection where status='Active' and tenantid=$tenantid)e, - (select count (*) as totalactiveresidentialinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status IN('ACTIVE','PENDINGWS') and usagecategory in ('RESIDENTIAL') and tenantid=$tenantid) and status='Active' and tenantid=$tenantid)g, - (select count (*) as totalactiveresidentialinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status IN ('ACTIVE','PENDINGWS') and usagecategory in ('RESIDENTIAL') and tenantid=$tenantid ) and status='Active' and tenantid=$tenantid)h, - (select count (*) as totalactivenonresidentialinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where status IN ('ACTIVE','PENDINGWS') and usagecategory like ('NONRESIDENTIAL%') and tenantid=$tenantid) and status='Active' and tenantid=$tenantid)i, - (select count (*) as totalactivenonresidentialinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where status IN ('ACTIVE','PENDINGWS') and usagecategory like ('NONRESIDENTIAL%') and tenantid=$tenantid) and status='Active' and tenantid=$tenantid)j, - (select count (*) as totalmeteredconnections from eg_ws_connection , eg_ws_service where id = connection_id and connectiontype = 'Metered' and status='Active' and tenantid=$tenantid)k, - (select count (*) as totalexemptedinwater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status IN ('ACTIVE','PENDINGWS') and usagecategory='RESIDENTIAL' and tenantid=$tenantid)and status='Active' and tenantid=$tenantid)l, - (select count (*) as totalexemptedinsewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status IN ('ACTIVE','PENDINGWS') and usagecategory='RESIDENTIAL'and tenantid=$tenantid)and status='Active' and tenantid=$tenantid)m, - (select count (*) as betweenfivemarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status IN ('ACTIVE','PENDINGWS') and tenantid=$tenantid )and status='Active' and tenantid=$tenantid)n, - (select count (*) as betweenfivemarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 0 and 125 and status IN ('ACTIVE','PENDINGWS') and tenantid=$tenantid )and status='Active' and tenantid=$tenantid)o, - (select count (*) as betweensixmarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status IN ('ACTIVE','PENDINGWS') and tenantid=$tenantid)and status='Active' and tenantid=$tenantid)p, - (select count (*) as betweensixandtenmarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea between 126 and 250 and status='ACTIVE' and tenantid=$tenantid)and status='Active' and tenantid=$tenantid)q, - (select count (*) as morethantenmarlawater from eg_ws_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status IN ('ACTIVE','PENDINGWS') and tenantid=$tenantid)and status='Active' and tenantid=$tenantid)r, - (select count (*) as morethantenmarlasewerage from eg_sw_connection where property_id in (select propertyid from eg_pt_property where landarea>=251 and status IN ('ACTIVE','PENDINGWS') and tenantid=$tenantid) and status='Active' and tenantid=$tenantid)s; + WITH connection_data AS ( + SELECT + ws.connectionno, + ws.property_id, + ws.status AS water_status, + sw.status AS sewerage_status, + ws.tenantid, + prop.usagecategory, + prop.landarea, + prop.status AS property_status, + ws_service.connectiontype + FROM eg_ws_connection ws + LEFT JOIN eg_sw_connection sw ON ws.property_id = sw.property_id AND sw.tenantid = ws.tenantid + LEFT JOIN eg_pt_property prop ON ws.property_id = prop.propertyid AND prop.tenantid = ws.tenantid + LEFT JOIN eg_ws_service ws_service ON ws.id = ws_service.connection_id + WHERE ws.tenantid = $tenantid ) + SELECT + (SELECT COUNT(*) FROM connection_data) AS totalwaterconnections, + (SELECT COUNT(*) FROM eg_sw_connection WHERE tenantid = $tenantid) AS totalsewerageconnections, + (SELECT COUNT(*) FROM connection_data WHERE water_status = 'Active') AS totalwateractive, + (SELECT COUNT(*) FROM eg_sw_connection WHERE status = 'Active' AND tenantid = $tenantid) AS totalsewerageactive, + (SELECT COUNT(*) FROM connection_data WHERE water_status = 'Active' AND property_status IN ('ACTIVE', 'PENDINGWS') AND usagecategory = 'RESIDENTIAL') AS totalactiveresidentialinwater, + (SELECT COUNT(*) FROM connection_data WHERE sewerage_status = 'Active' AND property_status IN ('ACTIVE', 'PENDINGWS') AND usagecategory = 'RESIDENTIAL') AS totalactiveresidentialinsewerage, + (SELECT COUNT(*) FROM connection_data WHERE sewerage_status = 'Active' AND property_status IN ('ACTIVE', 'PENDINGWS') AND usagecategory LIKE 'NONRESIDENTIAL%') AS totalactivenonresidentialinsewerage, + (SELECT COUNT(*) FROM connection_data WHERE water_status = 'Active' AND property_status IN ('ACTIVE', 'PENDINGWS') AND usagecategory LIKE 'NONRESIDENTIAL%') AS totalactivenonresidentialinwater, + (SELECT COUNT(*) FROM connection_data WHERE connectiontype = 'Metered' AND water_status = 'Active') AS totalmeteredconnections, + (SELECT COUNT(*) FROM connection_data WHERE landarea BETWEEN 0 AND 125 AND usagecategory = 'RESIDENTIAL' AND water_status = 'Active') AS totalexemptedinwater, + (SELECT COUNT(*) FROM connection_data WHERE landarea BETWEEN 0 AND 125 AND usagecategory = 'RESIDENTIAL' AND sewerage_status = 'Active') AS totalexemptedinsewerage, + (SELECT COUNT(*) FROM connection_data WHERE landarea BETWEEN 0 AND 125 AND water_status = 'Active') AS betweenfivemarlawater, + (SELECT COUNT(*) FROM connection_data WHERE landarea BETWEEN 0 AND 125 AND sewerage_status = 'Active') AS betweenfivemarlasewerage, + (SELECT COUNT(*) FROM connection_data WHERE landarea BETWEEN 126 AND 250 AND water_status = 'Active') AS betweensixmarlawater, + (SELECT COUNT(*) FROM connection_data WHERE landarea BETWEEN 126 AND 250 AND sewerage_status = 'Active') AS betweensixandtenmarlasewerage, + (SELECT COUNT(*) FROM connection_data WHERE landarea >= 251 AND water_status = 'Active') AS morethantenmarlawater, + (SELECT COUNT(*) FROM connection_data WHERE landarea >= 251 AND sewerage_status = 'Active') AS morethantenmarlasewerage + - reportName: WsDefaulterReport summary: Ws Defaulter Report version: 1.0.0 From cb231fec19035d3ab9020c804dee10fa2a15e902 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Mon, 9 Sep 2024 16:57:35 +0530 Subject: [PATCH 1441/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 85 ++++++++------------------ 1 file changed, 26 insertions(+), 59 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index df6de2b04..76437143e 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2142,6 +2142,7 @@ ReportDefinitions: - reportName: WsDefaulterReport summary: Ws Defaulter Report + decryptionPathId: MiscReceiptULB_v2 version: 1.0.0 moduleName: rainmaker-ws additionalConfig: @@ -2153,75 +2154,41 @@ ReportDefinitions: type: string source: ws total: false - - name: total_arrear_demand_amount - label: reports.ws.total_arrear_demand_amount + - name: usagecategory + label: reports.ws.usagecat type: string source: ws total: false - - name: current_charges_demand_amount - label: reports.ws.current_charges_demand_amount + - name: name + label: reports.ws.name type: string source: ws total: true - - name: arrear_usage_type - label: reports.ws.arrear_usage_type - type: string - source: ws - total: false - - name: current_charges_usage_type - label: reports.ws.current_charges_usage_type + - name: mobilenumber + label: reports.ws.mobilenumber type: string source: ws total: false - - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND ws.createdtime>= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND ws.createdtime<= $toDate query: | - WITH quarterly_data AS ( - SELECT - d1.consumercode, - CASE - WHEN to_timestamp(d1.taxperiodfrom / 1000) < '2023-10-01'::timestamp THEN 'Arrear' - ELSE 'Current Charges' - END AS charge_category, - to_char(to_timestamp(d1.taxperiodfrom / 1000), 'YYYY-MM-DD') AS tax_period_from_date, - d2.taxamount AS demand_amount, - d2.collectionamount AS collected_amount, - d5.usagecategory AS UsageType, - ROW_NUMBER() OVER (PARTITION BY d1.consumercode ORDER BY to_timestamp(d1.taxperiodfrom / 1000) DESC) AS row_num - FROM - egbs_demand_v1 d1 - LEFT JOIN egbs_demanddetail_v1 d2 ON d1.id = d2.demandid - LEFT JOIN eg_ws_connection d4 ON d4.connectionno = d1.consumercode - LEFT JOIN eg_pt_property d5 ON d4.property_id = d5.propertyid - WHERE d1.taxperiodfrom >= '1672531200000' - AND d1.businessservice = 'WS' - AND d1.tenantid = $tenantid - AND (d2.collectionamount IS NULL OR d2.collectionamount = 0)) -- Include only pending amounts) - SELECT - consumercode, - SUM(CASE WHEN charge_category = 'Arrear' THEN demand_amount ELSE 0 END) AS total_arrear_demand_amount, - MAX(CASE WHEN charge_category = 'Current Charges' THEN demand_amount else 0 END) AS current_charges_demand_amount, - MAX(CASE WHEN charge_category = 'Arrear' AND row_num = 1 THEN UsageType else 'NA' END) AS arrear_usage_type, - MAX(CASE WHEN charge_category = 'Current Charges' AND row_num = 1 THEN UsageType else 'NA' END) AS current_charges_usage_type - FROM - - quarterly_data - GROUP BY - consumercode - ORDER BY - consumercode; + SELECT ws.consumercode, + pt.usagecategory as usagecat, + users.name as name, + users.mobilenumber, + CONCAT_WS(', ', addd.buildingname, addd.doorno, addd.street, addd.plotno, addd.landmark) AS full_address FROM eg_ws_connection AS ws + JOIN eg_pt_property AS pt ON ws.property_id = pt.propertyid + JOIN eg_ws_connectionholder AS conn ON ws.id = conn.connectionid + JOIN eg_user AS users ON conn.userid = users.uuid + JOIN eg_pt_address AS addd ON pt.id = addd.propertyid + WHERE EXISTS ( + SELECT 1 + FROM egbs_demand_v1 AS demand + WHERE demand.consumercode = ws.connectionno + AND demand.businessservice = 'WS' + AND demand.tenantid = $tenantid + AND demand.ispaymentcompleted = 'false' + and demand.status='ACTIVE' + ) + - reportName: SwDefaulterReport summary: Sw Defaulter Report version: 1.0.0 From 31649f0a22b976d714b85a804994f4c1015ca885 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Mon, 9 Sep 2024 17:02:53 +0530 Subject: [PATCH 1442/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 76437143e..ae3a9113b 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2170,7 +2170,7 @@ ReportDefinitions: source: ws total: false query: | - SELECT ws.consumercode, + SELECT ws.connectionno, pt.usagecategory as usagecat, users.name as name, users.mobilenumber, From a057d307c1642829779ede087f24e94d5bd2a8a9 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Mon, 9 Sep 2024 17:04:51 +0530 Subject: [PATCH 1443/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index ae3a9113b..8a1fbda32 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2163,17 +2163,17 @@ ReportDefinitions: label: reports.ws.name type: string source: ws - total: true + total: false - name: mobilenumber label: reports.ws.mobilenumber type: string source: ws total: false query: | - SELECT ws.connectionno, + SELECT ws.connectionno as consumercode , pt.usagecategory as usagecat, users.name as name, - users.mobilenumber, + users.mobilenumber as mobilenumber, CONCAT_WS(', ', addd.buildingname, addd.doorno, addd.street, addd.plotno, addd.landmark) AS full_address FROM eg_ws_connection AS ws JOIN eg_pt_property AS pt ON ws.property_id = pt.propertyid JOIN eg_ws_connectionholder AS conn ON ws.id = conn.connectionid From 78d9ad0e7ee8c689fa3c2dbec4509e01650f2f84 Mon Sep 17 00:00:00 2001 From: Amardeep Gumber <45850454+deepgumber9996@users.noreply.github.com> Date: Mon, 16 Sep 2024 15:01:39 +0530 Subject: [PATCH 1444/1630] Update IFMS integration for duplicate data in taxheadcode --- 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 8e34db7bc..d047824f9 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -94,7 +94,7 @@ SearchDefinitions: 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' + $where and payment.paymentstatus != 'CANCELLED' and t.txn_status = 'SUCCESS' GROUP BY pd.receiptnumber,pd.businessservice,pd.amountpaid,pd.tenantid, payment.paymentmode,t.mobile_number,payment.transactionnumber, bill.consumercode,payment.paidby,bad.taxheadcode From 6f04d1b226dba9b0bf609326bdbc162b32e27fcf Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Thu, 19 Sep 2024 12:12:17 +0530 Subject: [PATCH 1445/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 46 ++++++++++++++++---------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 8a1fbda32..4c82a580b 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2170,25 +2170,35 @@ ReportDefinitions: source: ws total: false query: | - SELECT ws.connectionno as consumercode , - pt.usagecategory as usagecat, - users.name as name, - users.mobilenumber as mobilenumber, - CONCAT_WS(', ', addd.buildingname, addd.doorno, addd.street, addd.plotno, addd.landmark) AS full_address FROM eg_ws_connection AS ws - JOIN eg_pt_property AS pt ON ws.property_id = pt.propertyid - JOIN eg_ws_connectionholder AS conn ON ws.id = conn.connectionid - JOIN eg_user AS users ON conn.userid = users.uuid - JOIN eg_pt_address AS addd ON pt.id = addd.propertyid - WHERE EXISTS ( - SELECT 1 - FROM egbs_demand_v1 AS demand - WHERE demand.consumercode = ws.connectionno - AND demand.businessservice = 'WS' - AND demand.tenantid = $tenantid - AND demand.ispaymentcompleted = 'false' - and demand.status='ACTIVE' - ) + SELECT + ws.connectionno AS consumercode, + pt.usagecategory AS usagecat, + -- users.name AS name, + -- users.mobilenumber AS mobilenumber, + CONCAT_WS(', ', addd.buildingname, addd.doorno, addd.street, addd.plotno, addd.landmark) AS full_address, + SUM(demand.minimumamountpayable) AS total_tax_amount + FROM + eg_ws_connection AS ws + JOIN + eg_pt_property AS pt ON ws.property_id = pt.propertyid + JOIN + eg_ws_connectionholder AS conn ON ws.id = conn.connectionid + JOIN + eg_user AS users ON conn.userid = users.uuid + JOIN + eg_pt_address AS addd ON pt.id = addd.propertyid + JOIN + egbs_demand_v1 AS demand ON demand.consumercode = ws.connectionno + WHERE + demand.businessservice = 'WS' + AND demand.tenantid = 'pb.amritsar' + AND demand.ispaymentcompleted = 'false' + AND demand.status = 'ACTIVE' + AND demand.minimumamountpayable != 0 + GROUP BY + ws.connectionno, pt.usagecategory, addd.buildingname, addd.doorno, addd.street, addd.plotno, addd.landmark; + - reportName: SwDefaulterReport summary: Sw Defaulter Report version: 1.0.0 From fb8974b5a4d2df3b239c4430a2fcdcf0db154455 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Thu, 19 Sep 2024 13:14:18 +0530 Subject: [PATCH 1446/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 4c82a580b..ac70d5636 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2159,13 +2159,13 @@ ReportDefinitions: type: string source: ws total: false - - name: name - label: reports.ws.name + - name: full_address + label: reports.ws.full_address type: string source: ws total: false - - name: mobilenumber - label: reports.ws.mobilenumber + - name: total_tax_amount + label: reports.ws.total_tax_amount type: string source: ws total: false From 354bf4c1c629a5e41adf34665b5336278766109c Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Thu, 19 Sep 2024 15:10:42 +0530 Subject: [PATCH 1447/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index ac70d5636..634ecb01a 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2173,12 +2173,12 @@ ReportDefinitions: SELECT ws.connectionno AS consumercode, pt.usagecategory AS usagecat, - -- users.name AS name, - -- users.mobilenumber AS mobilenumber, - CONCAT_WS(', ', addd.buildingname, addd.doorno, addd.street, addd.plotno, addd.landmark) AS full_address, - SUM(demand.minimumamountpayable) AS total_tax_amount + CONCAT_WS(', ', addd.buildingname, addd.doorno, addd.street, addd.plotno, addd.landmark) AS full_address, + SUM(demand.minimumamountpayable) AS total_tax_amount FROM - eg_ws_connection AS ws + egbs_demand_v1 AS demand + JOIN + eg_ws_connection AS ws ON demand.consumercode = ws.connectionno JOIN eg_pt_property AS pt ON ws.property_id = pt.propertyid JOIN @@ -2187,16 +2187,14 @@ ReportDefinitions: eg_user AS users ON conn.userid = users.uuid JOIN eg_pt_address AS addd ON pt.id = addd.propertyid - JOIN - egbs_demand_v1 AS demand ON demand.consumercode = ws.connectionno WHERE demand.businessservice = 'WS' - AND demand.tenantid = 'pb.amritsar' + AND demand.tenantid = $tenantid AND demand.ispaymentcompleted = 'false' AND demand.status = 'ACTIVE' AND demand.minimumamountpayable != 0 GROUP BY - ws.connectionno, pt.usagecategory, addd.buildingname, addd.doorno, addd.street, addd.plotno, addd.landmark; + ws.connectionno, pt.usagecategory, addd.buildingname, addd.doorno, addd.street, addd.plotno, addd.landmark - reportName: SwDefaulterReport From 27ce1d62d8879ef266d4de847df260928328902e Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Thu, 19 Sep 2024 16:54:11 +0530 Subject: [PATCH 1448/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 68 +++++++++++++++++--------- 1 file changed, 44 insertions(+), 24 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 634ecb01a..e360427e0 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2159,8 +2159,23 @@ ReportDefinitions: type: string source: ws total: false - - name: full_address - label: reports.ws.full_address + - name: zonename + label: reports.ws.zonename + type: string + source: ws + total: false + - name: propertyid + label: reports.ws.propertyid + type: string + source: ws + total: false + - name: address + label: reports.ws.address + type: string + source: ws + total: false + - name: blockname + label: reports.ws.blockname type: string source: ws total: false @@ -2168,33 +2183,38 @@ ReportDefinitions: label: reports.ws.total_tax_amount type: string source: ws - total: false + total: true query: | + WITH demand_summary AS ( + SELECT + consumercode, + SUM(minimumamountpayable) AS total_tax_amount + FROM + egbs_demand_v1 + WHERE + businessservice = 'WS' + AND tenantid = $tenantid + AND ispaymentcompleted = 'false' + AND status = 'ACTIVE' + AND minimumamountpayable != 0 + GROUP BY + consumercode + ) SELECT - ws.connectionno AS consumercode, - pt.usagecategory AS usagecat, - CONCAT_WS(', ', addd.buildingname, addd.doorno, addd.street, addd.plotno, addd.landmark) AS full_address, - SUM(demand.minimumamountpayable) AS total_tax_amount + ws.connectionno AS consumercode, + addd.propertyusagetype AS usagecat, + addd.zonename, + addd.propertyid, + addd.address, + addd.blockname, + SUM(demand_summary.total_tax_amount) AS total_tax_amount FROM - egbs_demand_v1 AS demand - JOIN - eg_ws_connection AS ws ON demand.consumercode = ws.connectionno - JOIN - eg_pt_property AS pt ON ws.property_id = pt.propertyid + (SELECT DISTINCT connectionno, property_id FROM eg_ws_connection) AS ws JOIN - eg_ws_connectionholder AS conn ON ws.id = conn.connectionid + demand_summary ON ws.connectionno = demand_summary.consumercode JOIN - eg_user AS users ON conn.userid = users.uuid - JOIN - eg_pt_address AS addd ON pt.id = addd.propertyid - WHERE - demand.businessservice = 'WS' - AND demand.tenantid = $tenantid - AND demand.ispaymentcompleted = 'false' - AND demand.status = 'ACTIVE' - AND demand.minimumamountpayable != 0 - GROUP BY - ws.connectionno, pt.usagecategory, addd.buildingname, addd.doorno, addd.street, addd.plotno, addd.landmark + report_properties AS addd ON ws.property_id = addd.propertyid + groupby: GROUP BY ws.connectionno, addd.propertyusagetype, addd.zonename, addd.propertyid, addd.address, addd.blockname; - reportName: SwDefaulterReport From ba58d154f6f99ef2d8bc74f0e7919ca90f06eb7a Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Thu, 19 Sep 2024 18:11:42 +0530 Subject: [PATCH 1449/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 33 +++++++++++++------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index e360427e0..9b5708261 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2154,7 +2154,7 @@ ReportDefinitions: type: string source: ws total: false - - name: usagecategory + - name: usagecat label: reports.ws.usagecat type: string source: ws @@ -2186,19 +2186,19 @@ ReportDefinitions: total: true query: | WITH demand_summary AS ( - SELECT - consumercode, - SUM(minimumamountpayable) AS total_tax_amount - FROM - egbs_demand_v1 - WHERE - businessservice = 'WS' - AND tenantid = $tenantid - AND ispaymentcompleted = 'false' - AND status = 'ACTIVE' - AND minimumamountpayable != 0 - GROUP BY - consumercode + SELECT + consumercode, + SUM(minimumamountpayable) AS total_tax_amount + FROM + egbs_demand_v1 + WHERE + businessservice = 'WS' + AND tenantid = $tenantid + AND ispaymentcompleted = 'false' + AND status = 'ACTIVE' + AND minimumamountpayable != 0 + GROUP BY + consumercode ) SELECT ws.connectionno AS consumercode, @@ -2207,14 +2207,13 @@ ReportDefinitions: addd.propertyid, addd.address, addd.blockname, - SUM(demand_summary.total_tax_amount) AS total_tax_amount + demand_summary.total_tax_amount FROM - (SELECT DISTINCT connectionno, property_id FROM eg_ws_connection) AS ws + eg_ws_connection AS ws JOIN demand_summary ON ws.connectionno = demand_summary.consumercode JOIN report_properties AS addd ON ws.property_id = addd.propertyid - groupby: GROUP BY ws.connectionno, addd.propertyusagetype, addd.zonename, addd.propertyid, addd.address, addd.blockname; - reportName: SwDefaulterReport From f08bb54f0f57badda27f07cb9ad9b8c16ad32e21 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Thu, 19 Sep 2024 18:26:28 +0530 Subject: [PATCH 1450/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 83 +++++++++++++++----------- 1 file changed, 48 insertions(+), 35 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 9b5708261..bfd7dd361 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2229,53 +2229,66 @@ ReportDefinitions: type: string source: ws total: false - - name: total_arrear_demand_amount - label: reports.ws.total_arrear_demand_amount + - name: usagecat + label: reports.ws.usagecat type: string source: ws total: false - - name: current_charges_demand_amount - label: reports.ws.current_charges_demand_amount + - name: zonename + label: reports.ws.zonename type: string source: ws - total: true - - name: arrear_usage_type - label: reports.ws.arrear_usage_type + total: false + - name: propertyid + label: reports.ws.propertyid + type: string + source: ws + total: false + - name: address + label: reports.ws.address type: string source: ws total: false - - name: current_charges_usage_type - label: reports.ws.current_charges_usage_type + - name: blockname + label: reports.ws.blockname type: string source: ws total: false + - name: total_tax_amount + label: reports.ws.total_tax_amount + type: string + source: ws + total: true query: | - WITH quarterly_data AS ( - SELECT - d1.consumercode, - CASE WHEN to_timestamp(d1.taxperiodfrom / 1000) < '2023-10-01'::timestamp THEN 'Arrear' ELSE 'Current Charges' END AS charge_category, - to_char(to_timestamp(d1.taxperiodfrom / 1000), 'YYYY-MM-DD') AS tax_period_from_date, - d2.taxamount AS demand_amount, - d2.collectionamount AS collected_amount, - d5.usagecategory AS UsageType, - ROW_NUMBER() OVER (PARTITION BY d1.consumercode ORDER BY to_timestamp(d1.taxperiodfrom / 1000) DESC) AS row_num - FROM egbs_demand_v1 d1 - LEFT JOIN egbs_demanddetail_v1 d2 ON d1.id = d2.demandid - LEFT JOIN eg_sw_connection d4 ON d4.connectionno = d1.consumercode - LEFT JOIN eg_pt_property d5 ON d4.property_id = d5.propertyid - WHERE d1.taxperiodfrom >= '1672531200000' - AND d1.businessservice = 'SW' - AND d1.tenantid = $tenantid - AND (d2.collectionamount IS NULL OR d2.collectionamount = 0)) -- Include only pending amounts) - SELECT - consumercode, - SUM(CASE WHEN charge_category = 'Arrear' THEN demand_amount ELSE 0 END) AS total_arrear_demand_amount, - MAX(CASE WHEN charge_category = 'Current Charges' THEN demand_amount else 0 END) AS current_charges_demand_amount, - MAX(CASE WHEN charge_category = 'Arrear' AND row_num = 1 THEN UsageType else 'NA' END) AS arrear_usage_type, - MAX(CASE WHEN charge_category = 'Current Charges' AND row_num = 1 THEN UsageType else 'NA' END) AS current_charges_usage_type - FROM quarterly_data - groupby: GROUP BY consumercode - orderby: ORDER BY consumercode + WITH demand_summary AS ( + SELECT + consumercode, + SUM(minimumamountpayable) AS total_tax_amount + FROM + egbs_demand_v1 + WHERE + businessservice = 'SW' + AND tenantid = $tenantid + AND ispaymentcompleted = 'false' + AND status = 'ACTIVE' + AND minimumamountpayable != 0 + GROUP BY + consumercode + ) + SELECT + ws.connectionno AS consumercode, + addd.propertyusagetype AS usagecat, + addd.zonename, + addd.propertyid, + addd.address, + addd.blockname, + demand_summary.total_tax_amount + FROM + eg_sw_connection AS ws + JOIN + demand_summary ON ws.connectionno = demand_summary.consumercode + JOIN + report_properties AS addd ON ws.property_id = addd.propertyid - reportName: WsandSwDumpReport decryptionPathId: ULBPTDataDumpReport_V2 From 2d7ee3fdc824b8f16801c0590f48cec0f343344c Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Tue, 24 Sep 2024 15:40:25 +0530 Subject: [PATCH 1451/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 71 +++++++++++++++----------- 1 file changed, 41 insertions(+), 30 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index bfd7dd361..b60013229 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2614,108 +2614,119 @@ ReportDefinitions: type: string source: ws total: false + - name: propertyuid label: reports.ws.propertyuid type: string source: ws total: false + - name: propertyusagetype label: reports.ws.propertyusagetype type: string source: ws total: false + - name: meterstatus label: reports.ws.meterstatus type: string source: ws total: false + - name: lastreading label: reports.ws.lastreading type: string source: ws total: false + - name: lastreadingdate label: reports.ws.lastreadingdate type: string source: ws total: false + - name: ownername label: reports.ws.ownername type: string source: ws total: false + - name: mobileno label: reports.ws.mobileno type: string source: ws total: false + - name: locality label: reports.ws.locality type: string source: ws total: false + - name: ward label: reports.ws.ward type: string source: ws total: false + - name: address label: reports.ws.address type: string source: ws total: false + - name: currentmeterstatus label: reports.ws.currentmeterstatus type: string source: ws total: false + - name: currentreading label: reports.ws.currentreading type: string source: ws total: false + - name: currentreadingdate label: reports.ws.currentreadingdate type: string source: ws total: false + searchParams: - name: localityArray label: reports.pt.zoneList type: boundarylist source: pt isMandatory: false - searchClause: AND p.localitycode IN ($localityArray) + searchClause: AND pt.localitycode IN ($localityArray) query: | - WITH latest_readings AS (SELECT connectionno, MAX(currentreadingdate) AS latest_reading_date FROM eg_ws_meterreading WHERE tenantid = $tenantid - GROUP BY connectionno), - connection_details AS ( SELECT b1.connectionno,b1.property_id, b4.currentreading as lastreading, b4.currentreadingdate as lastReadingDate, b4.meterstatus - FROM eg_ws_connection b1 JOIN eg_pt_property b2 ON b1.property_id = b2.propertyid - JOIN eg_ws_service b3 ON b1.id = b3.connection_id - JOIN eg_ws_meterreading b4 ON b1.connectionno = b4.connectionno - JOIN latest_readings lr ON b4.connectionno = lr.connectionno - AND b4.currentreadingdate = lr.latest_reading_date - WHERE b1.tenantid = $tenantid AND b2.tenantid = $tenantid - AND b3.connectiontype = 'Metered' AND b1.status = 'Active')SELECT - c.connectionno as connectionno, - p.propertyid AS propertyuid, - p.propertyusagetype as propertyusagetype, - c.meterstatus as meterstatus, - c.lastreading as lastreading, - to_char((To_timestamp(c.lastReadingDate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as lastreadingdate, - split_part(string_agg(u.name, ','), ',', 1) AS ownername, - split_part(string_agg(u.mobilenumber, ','), ',', 1) AS mobileno, - split_part(string_agg(p.localityname, ','), ',', 1) AS locality, - split_part(string_agg(p.blockname, ','), ',', 1) AS ward, - split_part(string_agg(p.address, ','), ',', 1) AS address, - NULL as currentmeterstatus, - NULL as currentreading, - NULL as currentreadingdate - FROM report_properties p INNER JOIN connection_details c ON c.property_id = p.propertyid - INNER JOIN eg_pt_owner o ON o.propertyid = p.pt_uuid - INNER JOIN eg_user u ON u.uuid = o.userid - WHERE p.tenantid = $tenantid AND p.propertystatus = 'ACTIVE' - groupby: GROUP BY p.propertyid,c.connectionno,c.lastreading,c.lastReadingDate,p.propertyusagetype,c.meterstatus + SELECT + conn.connectionno, + MAX(mt.billingperiod) AS billingperiod, + MAX(pt.propertyid) AS propertyid, + MAX(mt.currentreading) AS currentReading, + MAX(mt.lastreading) AS lastReading, + MAX(mt.meterstatus) AS meterstatus, + MAX(pt.address) AS address, + MAX(pt.blockname) AS blockname, + MAX(pt.zonename) AS zonename, + MAX(pt.zonecode) AS zonecode, + MAX(pt.propertyusagetype) AS propertyusagetype, + MAX(pt.propertytype) AS propertytype FROM eg_ws_meterreading AS mt + INNER JOIN + eg_ws_connection AS conn ON mt.connectionno = conn.connectionno + INNER JOIN + report_properties AS pt ON pt.propertyid = conn.property_id + WHERE + conn.tenantid = $tenantid + AND + mt.currentreadingdate = ( + SELECT MAX(currentreadingdate) + FROM eg_ws_meterreading + WHERE connectionno = mt.connectionno + ) + groupby: GROUP BY conn.connectionno From 923294a03dc7107c7f2d5a51d2625918e6921cfe Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Tue, 24 Sep 2024 16:24:47 +0530 Subject: [PATCH 1452/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 71 +++++++++++--------------- 1 file changed, 29 insertions(+), 42 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index b60013229..7b297bc5d 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2614,85 +2614,72 @@ ReportDefinitions: type: string source: ws total: false - - - name: propertyuid - label: reports.ws.propertyuid + + - name: billingperiod + label: reports.ws.billingperiod type: string source: ws total: false - - name: propertyusagetype - label: reports.ws.propertyusagetype + - name: propertyid + label: reports.ws.propertyid type: string - source: ws + source: pt total: false - - name: meterstatus - label: reports.ws.meterstatus + - name: currentReading + label: reports.ws.currentreading type: string source: ws total: false - - name: lastreading + - name: lastReading label: reports.ws.lastreading type: string source: ws total: false - - name: lastreadingdate - label: reports.ws.lastreadingdate - type: string - source: ws - total: false - - - name: ownername - label: reports.ws.ownername - type: string - source: ws - total: false - - - name: mobileno - label: reports.ws.mobileno + - name: meterstatus + label: reports.ws.meterstatus type: string source: ws total: false - - name: locality - label: reports.ws.locality + - name: address + label: reports.ws.address type: string - source: ws + source: pt total: false - - name: ward - label: reports.ws.ward + - name: blockname + label: reports.ws.blockname type: string - source: ws + source: pt total: false - - name: address - label: reports.ws.address + - name: zonename + label: reports.ws.zonename type: string - source: ws + source: pt total: false - - name: currentmeterstatus - label: reports.ws.currentmeterstatus + - name: zonecode + label: reports.ws.zonecode type: string - source: ws + source: pt total: false - - name: currentreading - label: reports.ws.currentreading + - name: propertyusagetype + label: reports.ws.propertyusagetype type: string - source: ws + source: pt total: false - - name: currentreadingdate - label: reports.ws.currentreadingdate + - name: propertytype + label: reports.ws.propertytype type: string - source: ws + source: pt total: false - searchParams: - name: localityArray label: reports.pt.zoneList From 4b25067fdee27091bd34763ae86353a9bd905f1a Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Tue, 24 Sep 2024 22:25:20 +0530 Subject: [PATCH 1453/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 31 ++++++++++++++++++++------ 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 7b297bc5d..4f40899c8 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2193,20 +2193,32 @@ ReportDefinitions: egbs_demand_v1 WHERE businessservice = 'WS' - AND tenantid = $tenantid + AND tenantid = $tenantid AND ispaymentcompleted = 'false' AND status = 'ACTIVE' - AND minimumamountpayable != 0 + AND minimumamountpayable > 0 GROUP BY - consumercode + consumercode ), + ranked_bills AS ( + SELECT + bill.consumercode, + bill.payername, + bill.mobilenumber, + ROW_NUMBER() OVER (PARTITION BY bill.consumercode ORDER BY bill.createddate DESC) AS rn + FROM + egbs_bill_v1 AS bill + WHERE + bill.status = 'ACTIVE' ) SELECT ws.connectionno AS consumercode, - addd.propertyusagetype AS usagecat, - addd.zonename, + ranked_bills.payername, + ranked_bills.mobilenumber, addd.propertyid, - addd.address, - addd.blockname, + MAX(addd.propertyusagetype) AS usagecat, -- Use aggregation to avoid duplicates + MAX(addd.zonename) AS zonename, + MAX(addd.address) AS address, + MAX(addd.blockname) AS blockname, demand_summary.total_tax_amount FROM eg_ws_connection AS ws @@ -2214,6 +2226,11 @@ ReportDefinitions: demand_summary ON ws.connectionno = demand_summary.consumercode JOIN report_properties AS addd ON ws.property_id = addd.propertyid + JOIN + ranked_bills ON ranked_bills.consumercode = ws.connectionno + WHERE + ranked_bills.rn = 1 + groupby: GROUP BY ws.connectionno, ranked_bills.payername, ranked_bills.mobilenumber, addd.propertyid, demand_summary.total_tax_amount - reportName: SwDefaulterReport From 7d9f27bdd3e3d03f3cd2b7a0d1b5a7e30ce39c49 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Tue, 24 Sep 2024 22:28:50 +0530 Subject: [PATCH 1454/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 4f40899c8..3ea2c0023 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2154,13 +2154,13 @@ ReportDefinitions: type: string source: ws total: false - - name: usagecat - label: reports.ws.usagecat + - name: payername + label: reports.ws.payername type: string source: ws total: false - - name: zonename - label: reports.ws.zonename + - name: mobilenumber + label: reports.ws.mobilenumber type: string source: ws total: false @@ -2169,6 +2169,16 @@ ReportDefinitions: type: string source: ws total: false + - name: usagecat + label: reports.ws.usagecat + type: string + source: ws + total: false + - name: zonename + label: reports.ws.zonename + type: string + source: ws + total: false - name: address label: reports.ws.address type: string @@ -2212,10 +2222,10 @@ ReportDefinitions: ) SELECT ws.connectionno AS consumercode, - ranked_bills.payername, - ranked_bills.mobilenumber, - addd.propertyid, - MAX(addd.propertyusagetype) AS usagecat, -- Use aggregation to avoid duplicates + ranked_bills.payername as payername, + ranked_bills.mobilenumber as mobilenumber, + addd.propertyid as propertyid, + MAX(addd.propertyusagetype) AS usagecat, MAX(addd.zonename) AS zonename, MAX(addd.address) AS address, MAX(addd.blockname) AS blockname, From 8be4e01c25f9f10c896b5582b1a316469e877f8a Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Tue, 24 Sep 2024 22:50:37 +0530 Subject: [PATCH 1455/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 3ea2c0023..c6c8c75ca 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2169,16 +2169,6 @@ ReportDefinitions: type: string source: ws total: false - - name: usagecat - label: reports.ws.usagecat - type: string - source: ws - total: false - - name: zonename - label: reports.ws.zonename - type: string - source: ws - total: false - name: address label: reports.ws.address type: string @@ -2225,8 +2215,6 @@ ReportDefinitions: ranked_bills.payername as payername, ranked_bills.mobilenumber as mobilenumber, addd.propertyid as propertyid, - MAX(addd.propertyusagetype) AS usagecat, - MAX(addd.zonename) AS zonename, MAX(addd.address) AS address, MAX(addd.blockname) AS blockname, demand_summary.total_tax_amount From 4c8d38a2853c9c2a739f3679e468ae5955b56bd7 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Tue, 24 Sep 2024 23:05:19 +0530 Subject: [PATCH 1456/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 39 ++++++++------------------ 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index c6c8c75ca..7b297bc5d 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2154,13 +2154,13 @@ ReportDefinitions: type: string source: ws total: false - - name: payername - label: reports.ws.payername + - name: usagecat + label: reports.ws.usagecat type: string source: ws total: false - - name: mobilenumber - label: reports.ws.mobilenumber + - name: zonename + label: reports.ws.zonename type: string source: ws total: false @@ -2193,30 +2193,20 @@ ReportDefinitions: egbs_demand_v1 WHERE businessservice = 'WS' - AND tenantid = $tenantid + AND tenantid = $tenantid AND ispaymentcompleted = 'false' AND status = 'ACTIVE' - AND minimumamountpayable > 0 + AND minimumamountpayable != 0 GROUP BY - consumercode ), - ranked_bills AS ( - SELECT - bill.consumercode, - bill.payername, - bill.mobilenumber, - ROW_NUMBER() OVER (PARTITION BY bill.consumercode ORDER BY bill.createddate DESC) AS rn - FROM - egbs_bill_v1 AS bill - WHERE - bill.status = 'ACTIVE' + consumercode ) SELECT ws.connectionno AS consumercode, - ranked_bills.payername as payername, - ranked_bills.mobilenumber as mobilenumber, - addd.propertyid as propertyid, - MAX(addd.address) AS address, - MAX(addd.blockname) AS blockname, + addd.propertyusagetype AS usagecat, + addd.zonename, + addd.propertyid, + addd.address, + addd.blockname, demand_summary.total_tax_amount FROM eg_ws_connection AS ws @@ -2224,11 +2214,6 @@ ReportDefinitions: demand_summary ON ws.connectionno = demand_summary.consumercode JOIN report_properties AS addd ON ws.property_id = addd.propertyid - JOIN - ranked_bills ON ranked_bills.consumercode = ws.connectionno - WHERE - ranked_bills.rn = 1 - groupby: GROUP BY ws.connectionno, ranked_bills.payername, ranked_bills.mobilenumber, addd.propertyid, demand_summary.total_tax_amount - reportName: SwDefaulterReport From af011b314a6433f9322c321e0ab24186d54df4ea Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Wed, 25 Sep 2024 09:55:21 +0530 Subject: [PATCH 1457/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 85 +++++++++++++++++++------- 1 file changed, 63 insertions(+), 22 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 7b297bc5d..4d4583df8 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2154,13 +2154,13 @@ ReportDefinitions: type: string source: ws total: false - - name: usagecat - label: reports.ws.usagecat + - name: payername + label: reports.ws.payername type: string source: ws total: false - - name: zonename - label: reports.ws.zonename + - name: mobilenumber + label: reports.ws.mobilenumber type: string source: ws total: false @@ -2169,6 +2169,16 @@ ReportDefinitions: type: string source: ws total: false + - name: usagecat + label: reports.ws.usagecat + type: string + source: ws + total: false + - name: zonename + label: reports.ws.zonename + type: string + source: ws + total: false - name: address label: reports.ws.address type: string @@ -2184,38 +2194,69 @@ ReportDefinitions: type: string source: ws total: true + searchParams: + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: true + searchClause: AND rp.localitycode IN ($localityArray) query: | WITH demand_summary AS ( - SELECT + SELECT consumercode, SUM(minimumamountpayable) AS total_tax_amount - FROM + FROM egbs_demand_v1 - WHERE + WHERE businessservice = 'WS' - AND tenantid = $tenantid + AND tenantid = $tenantid AND ispaymentcompleted = 'false' AND status = 'ACTIVE' - AND minimumamountpayable != 0 - GROUP BY + AND minimumamountpayable > 0 + GROUP BY consumercode + ), + latest_bills AS ( + SELECT lb.consumercode, lb.payername, lb.mobilenumber + FROM ( + SELECT + bill.consumercode, + bill.payername, + bill.mobilenumber, + ROW_NUMBER() OVER (PARTITION BY bill.consumercode ORDER BY bill.createddate DESC) AS rn + FROM + egbs_bill_v1 bill + WHERE + bill.status = 'ACTIVE' + AND EXISTS ( + SELECT 1 FROM eg_ws_connection ws + WHERE ws.connectionno = bill.consumercode + ) + ) lb + WHERE lb.rn = 1 ) SELECT - ws.connectionno AS consumercode, - addd.propertyusagetype AS usagecat, - addd.zonename, - addd.propertyid, - addd.address, - addd.blockname, - demand_summary.total_tax_amount + ws.connectionno AS consumercode, + lb.payername AS payername, + lb.mobilenumber AS mobilenumber, + rp.propertyid AS propertyid, + MAX(rp.propertyusagetype) AS usagecat, + MAX(rp.zonename) AS zonename, + MAX(rp.address) AS address, + MAX(rp.blockname) AS blockname, + ds.total_tax_amount FROM - eg_ws_connection AS ws + eg_ws_connection ws JOIN - demand_summary ON ws.connectionno = demand_summary.consumercode + demand_summary ds ON ws.connectionno = ds.consumercode JOIN - report_properties AS addd ON ws.property_id = addd.propertyid - - + report_properties rp ON ws.property_id = rp.propertyid + JOIN + latest_bills lb ON lb.consumercode = ws.connectionno + GROUP BY + ws.connectionno, lb.payername, lb.mobilenumber, rp.propertyid, ds.total_tax_amount + - reportName: SwDefaulterReport summary: Sw Defaulter Report version: 1.0.0 From e578269cecd4158b3515606c4a046c3745af1065 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Wed, 25 Sep 2024 10:04:16 +0530 Subject: [PATCH 1458/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 4d4583df8..b85d14ca4 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2254,8 +2254,8 @@ ReportDefinitions: report_properties rp ON ws.property_id = rp.propertyid JOIN latest_bills lb ON lb.consumercode = ws.connectionno - GROUP BY - ws.connectionno, lb.payername, lb.mobilenumber, rp.propertyid, ds.total_tax_amount + where rp.tenantid = $tenantid + groupby: GROUP BY ws.connectionno, lb.payername, lb.mobilenumber, rp.propertyid, ds.total_tax_amount - reportName: SwDefaulterReport summary: Sw Defaulter Report From e6983e4d5edfa4cf9873c0d71352fdbd5a2ae66f Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Wed, 25 Sep 2024 10:36:33 +0530 Subject: [PATCH 1459/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index b85d14ca4..dfd5c88de 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2194,13 +2194,6 @@ ReportDefinitions: type: string source: ws total: true - searchParams: - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: true - searchClause: AND rp.localitycode IN ($localityArray) query: | WITH demand_summary AS ( SELECT @@ -2254,7 +2247,6 @@ ReportDefinitions: report_properties rp ON ws.property_id = rp.propertyid JOIN latest_bills lb ON lb.consumercode = ws.connectionno - where rp.tenantid = $tenantid groupby: GROUP BY ws.connectionno, lb.payername, lb.mobilenumber, rp.propertyid, ds.total_tax_amount - reportName: SwDefaulterReport From 6f4936948aa54bd59fa68da47ab4871adc2c069a Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:38:08 +0530 Subject: [PATCH 1460/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 64 +++++++++----------------- 1 file changed, 22 insertions(+), 42 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index dfd5c88de..e4efde073 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2196,58 +2196,38 @@ ReportDefinitions: total: true query: | WITH demand_summary AS ( - SELECT + SELECT consumercode, SUM(minimumamountpayable) AS total_tax_amount - FROM + FROM egbs_demand_v1 - WHERE - businessservice = 'WS' - AND tenantid = $tenantid + WHERE + businessservice = 'WS' + AND tenantid = $tenantid AND ispaymentcompleted = 'false' AND status = 'ACTIVE' AND minimumamountpayable > 0 - GROUP BY - consumercode - ), - latest_bills AS ( - SELECT lb.consumercode, lb.payername, lb.mobilenumber - FROM ( - SELECT - bill.consumercode, - bill.payername, - bill.mobilenumber, - ROW_NUMBER() OVER (PARTITION BY bill.consumercode ORDER BY bill.createddate DESC) AS rn - FROM - egbs_bill_v1 bill - WHERE - bill.status = 'ACTIVE' - AND EXISTS ( - SELECT 1 FROM eg_ws_connection ws - WHERE ws.connectionno = bill.consumercode - ) - ) lb - WHERE lb.rn = 1 - ) + GROUP BY + consumercode) SELECT - ws.connectionno AS consumercode, - lb.payername AS payername, - lb.mobilenumber AS mobilenumber, - rp.propertyid AS propertyid, - MAX(rp.propertyusagetype) AS usagecat, - MAX(rp.zonename) AS zonename, - MAX(rp.address) AS address, - MAX(rp.blockname) AS blockname, - ds.total_tax_amount + ws.connectionno AS consumercode, + COALESCE(STRING_AGG(DISTINCT bill.payername, '/') FILTER (WHERE bill.payername IS NOT NULL), 'Please generate bill of this consumer') AS payername, + COALESCE(STRING_AGG(DISTINCT bill.mobilenumber, '/') FILTER (WHERE bill.mobilenumber IS NOT NULL), 'Please generate bill of this consumer') AS mobilenumber, + addd.propertyusagetype AS usagecat, + addd.zonename, + addd.propertyid, + addd.address, + addd.blockname, + demand_summary.total_tax_amount FROM - eg_ws_connection ws - JOIN - demand_summary ds ON ws.connectionno = ds.consumercode + eg_ws_connection AS ws JOIN - report_properties rp ON ws.property_id = rp.propertyid + demand_summary ON ws.connectionno = demand_summary.consumercode JOIN - latest_bills lb ON lb.consumercode = ws.connectionno - groupby: GROUP BY ws.connectionno, lb.payername, lb.mobilenumber, rp.propertyid, ds.total_tax_amount + report_properties AS addd ON ws.property_id = addd.propertyid + LEFT JOIN + egbs_bill_v1 AS bill ON ws.connectionno = bill.consumercode + groupby: GROUP BY ws.connectionno, addd.propertyusagetype, addd.zonename,addd.propertyid, addd.address, addd.blockname, demand_summary.total_tax_amount - reportName: SwDefaulterReport summary: Sw Defaulter Report From e5c55010e084ff6bb27f0aeb65cfe9529145f364 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:51:15 +0530 Subject: [PATCH 1461/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index e4efde073..4ff221235 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2192,8 +2192,8 @@ ReportDefinitions: - name: total_tax_amount label: reports.ws.total_tax_amount type: string - source: ws - total: true + source: demand_summary + total: false query: | WITH demand_summary AS ( SELECT From 9229edc183fd02b0cd56fabce79ad88af55e3276 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Wed, 25 Sep 2024 12:58:30 +0530 Subject: [PATCH 1462/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 40 +++++++++----------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 4ff221235..f9f155610 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2154,13 +2154,13 @@ ReportDefinitions: type: string source: ws total: false - - name: payername - label: reports.ws.payername + - name: usagecat + label: reports.ws.usagecat type: string source: ws total: false - - name: mobilenumber - label: reports.ws.mobilenumber + - name: zonename + label: reports.ws.zonename type: string source: ws total: false @@ -2169,16 +2169,6 @@ ReportDefinitions: type: string source: ws total: false - - name: usagecat - label: reports.ws.usagecat - type: string - source: ws - total: false - - name: zonename - label: reports.ws.zonename - type: string - source: ws - total: false - name: address label: reports.ws.address type: string @@ -2192,8 +2182,8 @@ ReportDefinitions: - name: total_tax_amount label: reports.ws.total_tax_amount type: string - source: demand_summary - total: false + source: ws + total: true query: | WITH demand_summary AS ( SELECT @@ -2202,32 +2192,28 @@ ReportDefinitions: FROM egbs_demand_v1 WHERE - businessservice = 'WS' - AND tenantid = $tenantid + businessservice = 'WS' + AND tenantid = $tenantid AND ispaymentcompleted = 'false' AND status = 'ACTIVE' - AND minimumamountpayable > 0 + AND minimumamountpayable != 0 GROUP BY - consumercode) + consumercode + ) SELECT ws.connectionno AS consumercode, - COALESCE(STRING_AGG(DISTINCT bill.payername, '/') FILTER (WHERE bill.payername IS NOT NULL), 'Please generate bill of this consumer') AS payername, - COALESCE(STRING_AGG(DISTINCT bill.mobilenumber, '/') FILTER (WHERE bill.mobilenumber IS NOT NULL), 'Please generate bill of this consumer') AS mobilenumber, addd.propertyusagetype AS usagecat, addd.zonename, addd.propertyid, addd.address, addd.blockname, - demand_summary.total_tax_amount + demand_summary.total_tax_amount FROM - eg_ws_connection AS ws + eg_sw_connection AS ws JOIN demand_summary ON ws.connectionno = demand_summary.consumercode JOIN report_properties AS addd ON ws.property_id = addd.propertyid - LEFT JOIN - egbs_bill_v1 AS bill ON ws.connectionno = bill.consumercode - groupby: GROUP BY ws.connectionno, addd.propertyusagetype, addd.zonename,addd.propertyid, addd.address, addd.blockname, demand_summary.total_tax_amount - reportName: SwDefaulterReport summary: Sw Defaulter Report From dfc4577a202a351c572e522523f930a8a2e679bd Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Wed, 25 Sep 2024 14:10:49 +0530 Subject: [PATCH 1463/1630] Change format employtee receipt --- .../format-config/ws-onetime-receipt.json | 782 +----------------- 1 file changed, 27 insertions(+), 755 deletions(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index d29113091..6198cf62d 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -33,7 +33,7 @@ "text": "{{website}}" }, { - "text": "{{serviceType}} {{payment_receipt}}(Employee Copy)", + "text": "{{serviceType}} {{payment_receipt}}", "style": "receipt-logo-sub-header-ASR" } ], @@ -50,321 +50,7 @@ }, "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 No", - "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": "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": "Meter Make", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{MeterMake}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Meter No", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{MeterId}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - - } - ], - [ - { - "text": "Property ID", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{proPertyid}}", - "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": { @@ -426,445 +112,7 @@ { "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": [ - 40, - 500, - 20 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 60, - "height": 61.25 - }, - { - "stack": [ - { - "text": "{{logo-header}} {{mcGradePwssb}}", - "style": "receipt-logo-header" - }, - { - "text": "{{address}}" - }, - { - "text": "{{website}}" - }, - { - "text": "{{serviceType}} {{payment_receipt}}(Citizen Copy)", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "center", - "margin": [ - 13, - 7, - 0, - 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 No", - "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": "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": "Meter Make", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{MeterMake}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Meter No", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{MeterId}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - - } - ], - [ - { - "text": "Property ID", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{proPertyid}}", - "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": "", - "bold": true - } - ], - "alignment": "right", - "margin": [ - 0, - 0, - -10, - 1 - ] - } - ] - }, - { - "style": "no-signature", - "text": "{{no_signature}}" - } + } ], "styles": { "noc-head": { @@ -952,6 +200,18 @@ 0 ] }, + "receipt-table-valueone":{ + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 100, + "margin": [ + 8, + 0, + 0, + 0 + ] + }, "receipt-tableee": { "color": "#000000", "bold": false, @@ -976,6 +236,18 @@ 0 ] }, + "receipt-tableone":{ + "color": "#000000", + "bold": false, + "fontSize": 10, + "fontWeight": 200, + "margin": [ + -10, + 0, + 0, + 0 + ] + }, "receipt-approver": { "fontSize": 8, "bold": true, From 1ef89ee7b9d08114d08d2f552d97bd3d6ffd4306 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Thu, 26 Sep 2024 14:17:27 +0530 Subject: [PATCH 1464/1630] UPDATED one time receipt --- .../format-config/ws-onetime-receipt.json | 320 +++++++++++++++++- 1 file changed, 319 insertions(+), 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 6198cf62d..3dfda04bc 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -50,7 +50,325 @@ }, "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 No", + "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": "Meter Make", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{MeterMake}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Meter No", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{MeterId}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], + [ + { + "text": "Property ID", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{proPertyid}}", + "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": "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-valueone" + }, + { + "text": "{{ADdress}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-tableone" + + } + ] + + ] + }, + "layout": {} + }, { "style": "next-noc-table", "table": { From ac96ab375693db115316393581e49d6074e75b77 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Thu, 26 Sep 2024 14:27:06 +0530 Subject: [PATCH 1465/1630] revert change --- .../format-config/ws-onetime-receipt.json | 446 +++++++++++++++++- 1 file changed, 444 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 3dfda04bc..e21cc16bb 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -33,7 +33,7 @@ "text": "{{website}}" }, { - "text": "{{serviceType}} {{payment_receipt}}", + "text": "{{serviceType}} {{payment_receipt}}(Employee Copy)", "style": "receipt-logo-sub-header-ASR" } ], @@ -430,7 +430,449 @@ { "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": [ + 40, + 500, + 20 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 60, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{mcGradePwssb}}", + "style": "receipt-logo-header" + }, + { + "text": "{{address}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{serviceType}} {{payment_receipt}}(Citizen Copy)", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "center", + "margin": [ + 13, + 7, + 0, + 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 No", + "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": "Meter Make", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{MeterMake}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Meter No", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{MeterId}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], + [ + { + "text": "Property ID", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{proPertyid}}", + "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": "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" + + } + ] + + ] + }, + "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": "", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "style": "no-signature", + "text": "{{no_signature}}" + } ], "styles": { "noc-head": { From 6095d7d3e4a6141b2c70064dee858a6e44ba3ca3 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Thu, 26 Sep 2024 14:52:59 +0530 Subject: [PATCH 1466/1630] revert change --- .../format-config/ws-onetime-receipt.json | 322 +----------------- 1 file changed, 2 insertions(+), 320 deletions(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index e21cc16bb..f21ad28b1 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -33,7 +33,7 @@ "text": "{{website}}" }, { - "text": "{{serviceType}} {{payment_receipt}}(Employee Copy)", + "text": "{{serviceType}} {{payment_receipt}}", "style": "receipt-logo-sub-header-ASR" } ], @@ -50,325 +50,7 @@ }, "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 No", - "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": "Meter Make", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{MeterMake}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Meter No", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{MeterId}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - - } - ], - [ - { - "text": "Property ID", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{proPertyid}}", - "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": "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-valueone" - }, - { - "text": "{{ADdress}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-tableone" - - } - ] - - ] - }, - "layout": {} - }, + { "style": "next-noc-table", "table": { From e0adad77189dd644d7317c5c1acebb8dbd566527 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Thu, 26 Sep 2024 15:09:28 +0530 Subject: [PATCH 1467/1630] Revert Change --- .../format-config/ws-onetime-receipt.json | 380 +++++++++++++++--- 1 file changed, 333 insertions(+), 47 deletions(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index f21ad28b1..032337cbf 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -33,7 +33,7 @@ "text": "{{website}}" }, { - "text": "{{serviceType}} {{payment_receipt}}", + "text": "{{serviceType}} {{payment_receipt}}(Employee Copy)", "style": "receipt-logo-sub-header-ASR" } ], @@ -50,7 +50,321 @@ }, "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 No", + "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": "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": "Meter Make", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{MeterMake}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Meter No", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{MeterId}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], + [ + { + "text": "Property ID", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{proPertyid}}", + "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": { @@ -355,10 +669,9 @@ } ], - [ { - "text": "Meter Make", + "text": "Usage Category", "border": [ true, false, @@ -368,7 +681,7 @@ "style": "receipt-table-value" }, { - "text": "{{MeterMake}}", + "text": "{{UsageCategory}}", "border": [ false, false, @@ -378,7 +691,7 @@ "style": "receipt-table" }, { - "text": "Meter No", + "text": "Address", "border": [ false, false, @@ -388,7 +701,7 @@ "style": "receipt-table-value" }, { - "text": "{{MeterId}}", + "text": "{{ADdress}}", "border": [ false, false, @@ -401,7 +714,7 @@ ], [ { - "text": "Property ID", + "text": "Meter Make", "border": [ true, false, @@ -411,7 +724,7 @@ "style": "receipt-table-value" }, { - "text": "{{proPertyid}}", + "text": "{{MeterMake}}", "border": [ false, false, @@ -421,7 +734,7 @@ "style": "receipt-table" }, { - "text": "IFSC Code", + "text": "Meter No", "border": [ false, false, @@ -431,7 +744,7 @@ "style": "receipt-table-value" }, { - "text": "{{ifsc}}", + "text": "{{MeterId}}", "border": [ false, false, @@ -439,12 +752,12 @@ false ], "style": "receipt-table" - + } - ], + ], [ { - "text": "Usage Category", + "text": "Property ID", "border": [ true, false, @@ -454,7 +767,7 @@ "style": "receipt-table-value" }, { - "text": "{{UsageCategory}}", + "text": "{{proPertyid}}", "border": [ false, false, @@ -462,12 +775,9 @@ false ], "style": "receipt-table" - } - - ], - [ + }, { - "text": "Address", + "text": "IFSC Code", "border": [ false, false, @@ -477,7 +787,7 @@ "style": "receipt-table-value" }, { - "text": "{{ADdress}}", + "text": "{{ifsc}}", "border": [ false, false, @@ -485,7 +795,7 @@ false ], "style": "receipt-table" - + } ] @@ -642,18 +952,6 @@ 0 ] }, - "receipt-table-valueone":{ - "color": "#000000", - "bold": true, - "fontSize": 10, - "fontWeight": 100, - "margin": [ - 8, - 0, - 0, - 0 - ] - }, "receipt-tableee": { "color": "#000000", "bold": false, @@ -678,18 +976,6 @@ 0 ] }, - "receipt-tableone":{ - "color": "#000000", - "bold": false, - "fontSize": 10, - "fontWeight": 200, - "margin": [ - -10, - 0, - 0, - 0 - ] - }, "receipt-approver": { "fontSize": 8, "bold": true, @@ -733,4 +1019,4 @@ } } } -} +} \ No newline at end of file From 1acc8b0a1bc9a08fdd7e74bbd744b7ffd311b9ca Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Mon, 30 Sep 2024 11:39:44 +0530 Subject: [PATCH 1468/1630] Change design onetime receipt --- .../format-config/ws-onetime-receipt.json | 442 +----------------- 1 file changed, 2 insertions(+), 440 deletions(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 032337cbf..fa9559c81 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -33,7 +33,7 @@ "text": "{{website}}" }, { - "text": "{{serviceType}} {{payment_receipt}}(Employee Copy)", + "text": "{{serviceType}} {{payment_receipt}}", "style": "receipt-logo-sub-header-ASR" } ], @@ -426,445 +426,7 @@ { "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": [ - 40, - 500, - 20 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 60, - "height": 61.25 - }, - { - "stack": [ - { - "text": "{{logo-header}} {{mcGradePwssb}}", - "style": "receipt-logo-header" - }, - { - "text": "{{address}}" - }, - { - "text": "{{website}}" - }, - { - "text": "{{serviceType}} {{payment_receipt}}(Citizen Copy)", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "center", - "margin": [ - 13, - 7, - 0, - 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 No", - "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": "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": "Meter Make", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{MeterMake}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Meter No", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{MeterId}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - - } - ], - [ - { - "text": "Property ID", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{proPertyid}}", - "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": "", - "bold": true - } - ], - "alignment": "right", - "margin": [ - 0, - 0, - -10, - 1 - ] - } - ] - }, - { - "style": "no-signature", - "text": "{{no_signature}}" - } + } ], "styles": { "noc-head": { From d24bd2a84e0f0d8540939264a52e3fb48dbd6b92 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 4 Oct 2024 10:01:49 +0530 Subject: [PATCH 1469/1630] Update ws-reports.yml sw and ws report gurp --- configs/reports/configs/ws-reports.yml | 308 +++++++++++++++++++++++++ 1 file changed, 308 insertions(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index f9f155610..2a6e6c0fe 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3151,3 +3151,311 @@ ReportDefinitions: AND w.status = 'Active' AND w.connectionno IS NOT NULL AND (d.status IS NULL OR d.status != 'CANCELLED') + +- reportName: WaterReportUlb + summary: Water Report Ulb + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: tenantid + label: reports.ws.tenantid + 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: amount + label: reports.ws.amount + type: string + source: ws + total: false + - name: instrumenttype + label: reports.ws.instrumenttype + type: string + source: ws + total: false + - name: transactionnumber + label: reports.ws.transactionnumber + type: string + source: ws + total: false + - name: securityfee + label: reports.ws.securityfee + type: string + source: ws + total: false + - name: connectionfee + label: reports.ws.connectionfee + type: string + source: ws + total: false + - name: othefee + label: reports.ws.othefee + type: string + source: ws + total: false + - name: roadcutting + label: reports.ws.roadcutting + type: string + source: ws + total: false + - name: usagetype + label: reports.ws.usagetype + type: string + source: ws + total: false + - name: ledgerid + label: reports.ws.ledgerid + type: string + source: ws + total: false + - name: propertyid + label: reports.ws.propertyid + type: string + source: ws + total: false + - name: plotsize + label: reports.ws.plotsize + type: string + source: ws + total: false + - name: address + label: reports.ws.address + type: string + source: ws + total: false + - 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 + query: | + WITH receipt_breakup AS ( + SELECT + pd.id AS pdid, + SUM(CASE WHEN taxheadcode LIKE 'WS_SECURITY_DEPOSIT' THEN adjustedamount ELSE 0 END) AS securityfee, + SUM(CASE WHEN taxheadcode LIKE 'WS_CONNECTION_FEE' THEN adjustedamount ELSE 0 END) AS connectionfee, + SUM(CASE WHEN taxheadcode LIKE 'WS_OTHER_FEE' THEN adjustedamount ELSE 0 END) AS othefee, + SUM(CASE WHEN taxheadcode LIKE 'WS_ROAD_CUTTING_CHARGE' THEN adjustedamount ELSE 0 END) AS roadcutting + 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 >= 1725129000000 + AND pd.receiptdate <= 1727688900000 + GROUP BY pdid + ) + SELECT + pd.tenantid AS tenantid, + pd.id, + TO_CHAR(TO_TIMESTAMP(pd.receiptdate / 1000) AT TIME ZONE 'Asia/Kolkata', 'DD-MM-YYYY') AS receiptdate, + pd.receiptnumber, + payment.totalamountpaid AS amount, + payment.paymentmode AS instrumenttype, + payment.transactionnumber, + receipt_breakup.*, + TO_CHAR(TO_TIMESTAMP(pd.manualreceiptdate / 1000) AT TIME ZONE 'Asia/Kolkata', 'DD-MM-YYYY') AS g8issuedate, + pd.manualreceiptnumber AS g8receiptno, + ws.additionaldetails->>'waterSubUsageType' as usageType, + ws.additionaldetails->>'ledgerid' as ledgerid, + pt.propertyid as propertyid, + pt.landarea as plotsize, + concat(doorno,',',buildingname,',',street,',',city) as address + FROM egcl_paymentdetail pd + INNER JOIN egcl_payment payment ON pd.paymentid = payment.id + INNER JOIN egcl_bill bill ON bill.id = pd.billid + INNER JOIN receipt_breakup ON receipt_breakup.pdid = pd.id + INNER JOIN eg_ws_connection ws ON ws.applicationno = bill.consumercode + inner join eg_pt_property pt on (ws.property_id=pt.propertyid and pt.status!='INACTIVE') + inner join eg_pt_address pta on (pta.propertyid=pt.id) + WHERE payment.paymentstatus != 'CANCELLED' + AND pd.businessservice = 'WS.ONE_TIME_FEE + AND payment.tenantid =$tenantid + ORDER BY pd.receiptdate DESC; + +- reportName: SewerageReportUlb + summary: Sewerage Report Ulb + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: tenantid + label: reports.ws.tenantid + 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: amount + label: reports.ws.amount + type: string + source: ws + total: false + - name: instrumenttype + label: reports.ws.instrumenttype + type: string + source: ws + total: false + - name: transactionnumber + label: reports.ws.transactionnumber + type: string + source: ws + total: false + - name: securityfee + label: reports.ws.securityfee + type: string + source: ws + total: false + - name: connectionfee + label: reports.ws.connectionfee + type: string + source: ws + total: false + - name: othefee + label: reports.ws.othefee + type: string + source: ws + total: false + - name: roadcutting + label: reports.ws.roadcutting + type: string + source: ws + total: false + - name: usagetype + label: reports.ws.usagetype + type: string + source: ws + total: false + - name: ledgerid + label: reports.ws.ledgerid + type: string + source: ws + total: false + - name: propertyid + label: reports.ws.propertyid + type: string + source: ws + total: false + - name: plotsize + label: reports.ws.plotsize + type: string + source: ws + total: false + - name: address + label: reports.ws.address + type: string + source: ws + total: false + - 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 + query: | + WITH receipt_breakup AS ( + SELECT + pd.id AS pdid, + SUM(CASE WHEN taxheadcode LIKE 'SW_SECURITY_DEPOSIT' THEN adjustedamount ELSE 0 END) AS securityfee, + SUM(CASE WHEN taxheadcode LIKE 'SW_CONNECTION_FEE' THEN adjustedamount ELSE 0 END) AS connectionfee, + SUM(CASE WHEN taxheadcode LIKE 'SW_OTHER_FEE' THEN adjustedamount ELSE 0 END) AS othefee, + SUM(CASE WHEN taxheadcode LIKE 'SW_ROAD_CUTTING_CHARGE' THEN adjustedamount ELSE 0 END) AS roadcutting + 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 = 'SW.ONE_TIME_FEE' + AND pd.receiptdate >= 1725129000000 + AND pd.receiptdate <= 1727688900000 + GROUP BY pdid + ) + SELECT + pd.tenantid AS tenantid, + pd.id, + TO_CHAR(TO_TIMESTAMP(pd.receiptdate / 1000) AT TIME ZONE 'Asia/Kolkata', 'DD-MM-YYYY') AS receiptdate, + pd.receiptnumber, + payment.totalamountpaid AS amount, + payment.paymentmode AS instrumenttype, + payment.transactionnumber, + receipt_breakup.*, + TO_CHAR(TO_TIMESTAMP(pd.manualreceiptdate / 1000) AT TIME ZONE 'Asia/Kolkata', 'DD-MM-YYYY') AS g8issuedate, + pd.manualreceiptnumber AS g8receiptno,s + sw.additionaldetails->>'waterSubUsageType' as usageType, + sw.additionaldetails->>'ledgerid' as ledgerid, + pt.propertyid as propertyid, + pt.landarea as plotsize, + concat(doorno,',',buildingname,',',street,',',city) as address + FROM egcl_paymentdetail pd + INNER JOIN egcl_payment payment ON pd.paymentid = payment.id + INNER JOIN egcl_bill bill ON bill.id = pd.billid + INNER JOIN receipt_breakup ON receipt_breakup.pdid = pd.id + INNER JOIN eg_sw_connection sw ON sw.applicationno = bill.consumercode + inner join eg_pt_property pt on (sw.property_id=pt.propertyid and pt.status!='INACTIVE') + inner join eg_pt_address pta on (pta.propertyid=pt.id) + WHERE payment.paymentstatus != 'CANCELLED' + AND pd.businessservice = 'SW.ONE_TIME_FEE' + AND payment.tenantid =$tenantid + ORDER BY pd.receiptdate DESC; + + From 8f6307d93fe4317aa1f5d09b69f091288c46e6d2 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 8 Oct 2024 10:51:45 +0530 Subject: [PATCH 1470/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 2a6e6c0fe..a547b376b 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3273,8 +3273,8 @@ ReportDefinitions: WHERE payment.tenantid =$tenantid AND payment.paymentstatus != 'CANCELLED' AND pd.businessservice = 'WS.ONE_TIME_FEE' - AND pd.receiptdate >= 1725129000000 - AND pd.receiptdate <= 1727688900000 + AND pd.receiptdate >= $fromDate + AND pd.receiptdate <= $toDate GROUP BY pdid ) SELECT @@ -3303,7 +3303,7 @@ ReportDefinitions: WHERE payment.paymentstatus != 'CANCELLED' AND pd.businessservice = 'WS.ONE_TIME_FEE AND payment.tenantid =$tenantid - ORDER BY pd.receiptdate DESC; + orderby: ORDER BY pd.receiptdate DESC; - reportName: SewerageReportUlb summary: Sewerage Report Ulb @@ -3426,8 +3426,8 @@ ReportDefinitions: WHERE payment.tenantid =$tenantid AND payment.paymentstatus != 'CANCELLED' AND pd.businessservice = 'SW.ONE_TIME_FEE' - AND pd.receiptdate >= 1725129000000 - AND pd.receiptdate <= 1727688900000 + AND pd.receiptdate >= $fromDate + AND pd.receiptdate <= $toDate GROUP BY pdid ) SELECT @@ -3440,7 +3440,7 @@ ReportDefinitions: payment.transactionnumber, receipt_breakup.*, TO_CHAR(TO_TIMESTAMP(pd.manualreceiptdate / 1000) AT TIME ZONE 'Asia/Kolkata', 'DD-MM-YYYY') AS g8issuedate, - pd.manualreceiptnumber AS g8receiptno,s + pd.manualreceiptnumber AS g8receiptno, sw.additionaldetails->>'waterSubUsageType' as usageType, sw.additionaldetails->>'ledgerid' as ledgerid, pt.propertyid as propertyid, @@ -3456,6 +3456,6 @@ ReportDefinitions: WHERE payment.paymentstatus != 'CANCELLED' AND pd.businessservice = 'SW.ONE_TIME_FEE' AND payment.tenantid =$tenantid - ORDER BY pd.receiptdate DESC; + orderby: ORDER BY pd.receiptdate DESC From 13c21db91cb020ecae867aa26f1c606b36e86425 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 8 Oct 2024 12:59:45 +0530 Subject: [PATCH 1471/1630] syntax corrected --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index a547b376b..681aa519c 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3301,7 +3301,7 @@ ReportDefinitions: inner join eg_pt_property pt on (ws.property_id=pt.propertyid and pt.status!='INACTIVE') inner join eg_pt_address pta on (pta.propertyid=pt.id) WHERE payment.paymentstatus != 'CANCELLED' - AND pd.businessservice = 'WS.ONE_TIME_FEE + AND pd.businessservice = 'WS.ONE_TIME_FEE' AND payment.tenantid =$tenantid orderby: ORDER BY pd.receiptdate DESC; From a65054e94ad8b068a1adf5a85e0cd516b390dfcb Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 11 Oct 2024 12:53:26 +0530 Subject: [PATCH 1472/1630] added connectionCategory ws receipt recport --- configs/reports/configs/ws-reports.yml | 28 ++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 681aa519c..859769090 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3220,6 +3220,16 @@ ReportDefinitions: type: string source: ws total: false + - name: ownername + label: reports.ws.ownername + type: string + source: ws + total: false + - name: connectioncategory + label: reports.ws.connectioncategory + type: string + source: ws + total: false - name: propertyid label: reports.ws.propertyid type: string @@ -3292,7 +3302,9 @@ ReportDefinitions: ws.additionaldetails->>'ledgerid' as ledgerid, pt.propertyid as propertyid, pt.landarea as plotsize, - concat(doorno,',',buildingname,',',street,',',city) as address + concat(doorno,',',buildingname,',',street,',',city) as address, + ws.additionaldetails->>'connectionCategory' as connectioncategory, + ws.additionaldetails->>'ownerName' as ownername, FROM egcl_paymentdetail pd INNER JOIN egcl_payment payment ON pd.paymentid = payment.id INNER JOIN egcl_bill bill ON bill.id = pd.billid @@ -3373,6 +3385,16 @@ ReportDefinitions: type: string source: ws total: false + - name: ownername + label: reports.ws.ownername + type: string + source: ws + total: false + - name: connectioncategory + label: reports.ws.connectioncategory + type: string + source: ws + total: false - name: propertyid label: reports.ws.propertyid type: string @@ -3445,7 +3467,9 @@ ReportDefinitions: sw.additionaldetails->>'ledgerid' as ledgerid, pt.propertyid as propertyid, pt.landarea as plotsize, - concat(doorno,',',buildingname,',',street,',',city) as address + concat(doorno,',',buildingname,',',street,',',city) as address, + sw.additionaldetails->>'connectionCategory' as connectioncategory, + sw.additionaldetails->>'ownerName' as ownername, FROM egcl_paymentdetail pd INNER JOIN egcl_payment payment ON pd.paymentid = payment.id INNER JOIN egcl_bill bill ON bill.id = pd.billid From f6bf01099681a5d15aa8f07b06a802ea1d66dcbe Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Fri, 11 Oct 2024 13:01:13 +0530 Subject: [PATCH 1473/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 859769090..efe3425c8 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2209,7 +2209,7 @@ ReportDefinitions: addd.blockname, demand_summary.total_tax_amount FROM - eg_sw_connection AS ws + eg_ws_connection AS ws JOIN demand_summary ON ws.connectionno = demand_summary.consumercode JOIN From 92efb9489e41a451c69c729d2787a2284d40f6ee Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 23 Oct 2024 10:42:02 +0530 Subject: [PATCH 1474/1630] syntax correction --- configs/reports/configs/ws-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index efe3425c8..a3e9ecb4c 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3304,7 +3304,7 @@ ReportDefinitions: pt.landarea as plotsize, concat(doorno,',',buildingname,',',street,',',city) as address, ws.additionaldetails->>'connectionCategory' as connectioncategory, - ws.additionaldetails->>'ownerName' as ownername, + ws.additionaldetails->>'ownerName' as ownername FROM egcl_paymentdetail pd INNER JOIN egcl_payment payment ON pd.paymentid = payment.id INNER JOIN egcl_bill bill ON bill.id = pd.billid @@ -3469,7 +3469,7 @@ ReportDefinitions: pt.landarea as plotsize, concat(doorno,',',buildingname,',',street,',',city) as address, sw.additionaldetails->>'connectionCategory' as connectioncategory, - sw.additionaldetails->>'ownerName' as ownername, + sw.additionaldetails->>'ownerName' as ownername FROM egcl_paymentdetail pd INNER JOIN egcl_payment payment ON pd.paymentid = payment.id INNER JOIN egcl_bill bill ON bill.id = pd.billid From cecb1bab9ec8e8f955b44722a65b05aa609eb874 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 23 Oct 2024 13:57:31 +0530 Subject: [PATCH 1475/1630] added application status report --- configs/reports/configs/ws-reports.yml | 45 +++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index a3e9ecb4c..c042644cb 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3482,4 +3482,47 @@ ReportDefinitions: AND payment.tenantid =$tenantid orderby: ORDER BY pd.receiptdate DESC - +- reportName: waterApplicationStatusReport + summary: Water Application Status + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: applicationstatus + label: reports.ws.applicationstatus + type: string + source: ws + total: false + - name: totalcount + label: reports.ws.total + type: string + source: ws + total: true + query: | + select applicationstatus,count(*) as totalcount from eg_ws_connection where tenantid=$tenantid and applicationstatus not in ('INITIATED') + groupby: group by applicationstatus + +- reportName: sewerageApplicationStatusReport + summary: Sewerage Application Status + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: applicationstatus + label: reports.ws.applicationstatus + type: string + source: ws + total: false + - name: totalcount + label: reports.ws.total + type: string + source: ws + total: true + query: | + select applicationstatus,count(*) as totalcount from eg_sw_connection where tenantid=$tenantid and applicationstatus not in ('INITIATED') + groupby: group by applicationstatus + From 63a647138980533b1be252afb2242d083ec5e80a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 28 Oct 2024 16:56:06 +0530 Subject: [PATCH 1476/1630] include all WS and SW payments in receiptregister --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index c042644cb..ce69e9ec9 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -128,7 +128,7 @@ ReportDefinitions: 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' + where payment.tenantid=$tenantid and pd.businessservice in ('WS','SW','WS.ONE_TIME_FEE','SW.ONE_TIME_FEE') and bill.status='ACTIVE' orderby: order by pd.receiptdate desc From e5ec92c78087b96709777437de24e553e595dfb1 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Mon, 4 Nov 2024 17:31:52 +0530 Subject: [PATCH 1477/1630] Slowness in Pgr Removed like operator from tenantid and service request id --- configs/egov-searcher/rainmaker-pgr-v2-searcher.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml index 76308662c..acdb070d7 100644 --- a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml +++ b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml @@ -14,11 +14,9 @@ SearchDefinitions: - 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 @@ -76,7 +74,6 @@ SearchDefinitions: - name: tenantid isMandatory: false jsonPath: $.searchCriteria.tenantId - operator: LIKE - name: servicerequestid isMandatory: false jsonPath: $.searchCriteria.serviceRequestId @@ -168,11 +165,9 @@ SearchDefinitions: - 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 @@ -216,11 +211,9 @@ SearchDefinitions: - 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 @@ -264,14 +257,12 @@ SearchDefinitions: - 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 From 823a9f1b704bd07706d41c7b69168b9ece8fdb35 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 5 Nov 2024 12:24:51 +0530 Subject: [PATCH 1478/1630] added approval date and approved by --- configs/reports/configs/ws-reports.yml | 38 +++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index ce69e9ec9..48ad9d979 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3153,6 +3153,7 @@ ReportDefinitions: AND (d.status IS NULL OR d.status != 'CANCELLED') - reportName: WaterReportUlb + decryptionPathId: JE_PendencyReport_WS summary: Water Report Ulb version: 1.0.0 moduleName: rainmaker-ws @@ -3254,7 +3255,17 @@ ReportDefinitions: label: reports.ws.g8receiptno type: string source: ws - total: false + total: false + - name: name + label: reports.ws.approvedby + type: string + source: ws + total: false + - name: approvaldate + label: reports.ws.approvaldate + type: string + source: ws + total: false searchParams: - name: fromDate label: reports.pt.fromDate @@ -3304,7 +3315,9 @@ ReportDefinitions: pt.landarea as plotsize, concat(doorno,',',buildingname,',',street,',',city) as address, ws.additionaldetails->>'connectionCategory' as connectioncategory, - ws.additionaldetails->>'ownerName' as ownername + ws.additionaldetails->>'ownerName' as ownername, + eu.name as name, + TO_CHAR(TO_TIMESTAMP(pi.lastmodifiedtime / 1000) AT TIME ZONE 'Asia/Kolkata', 'DD-MM-YYYY') as approvaldate FROM egcl_paymentdetail pd INNER JOIN egcl_payment payment ON pd.paymentid = payment.id INNER JOIN egcl_bill bill ON bill.id = pd.billid @@ -3312,12 +3325,15 @@ ReportDefinitions: INNER JOIN eg_ws_connection ws ON ws.applicationno = bill.consumercode inner join eg_pt_property pt on (ws.property_id=pt.propertyid and pt.status!='INACTIVE') inner join eg_pt_address pta on (pta.propertyid=pt.id) + inner join eg_wf_processinstance_v2 pi on (pi.businessid=sw.applicationno and pi.action='APPROVE_FOR_CONNECTION') + inner join eg_user eu on eu.uuid=pi.lastmodifiedby WHERE payment.paymentstatus != 'CANCELLED' AND pd.businessservice = 'WS.ONE_TIME_FEE' AND payment.tenantid =$tenantid orderby: ORDER BY pd.receiptdate DESC; - reportName: SewerageReportUlb + decryptionPathId: JE_PendencyReport_WS summary: Sewerage Report Ulb version: 1.0.0 moduleName: rainmaker-ws @@ -3419,7 +3435,17 @@ ReportDefinitions: label: reports.ws.g8receiptno type: string source: ws - total: false + total: false + - name: name + label: reports.ws.approvedby + type: string + source: ws + total: false + - name: approvaldate + label: reports.ws.approvaldate + type: string + source: ws + total: false searchParams: - name: fromDate label: reports.pt.fromDate @@ -3469,7 +3495,9 @@ ReportDefinitions: pt.landarea as plotsize, concat(doorno,',',buildingname,',',street,',',city) as address, sw.additionaldetails->>'connectionCategory' as connectioncategory, - sw.additionaldetails->>'ownerName' as ownername + sw.additionaldetails->>'ownerName' as ownername, + eu.name as name, + TO_CHAR(TO_TIMESTAMP(pi.lastmodifiedtime / 1000) AT TIME ZONE 'Asia/Kolkata', 'DD-MM-YYYY') as approvaldate FROM egcl_paymentdetail pd INNER JOIN egcl_payment payment ON pd.paymentid = payment.id INNER JOIN egcl_bill bill ON bill.id = pd.billid @@ -3477,6 +3505,8 @@ ReportDefinitions: INNER JOIN eg_sw_connection sw ON sw.applicationno = bill.consumercode inner join eg_pt_property pt on (sw.property_id=pt.propertyid and pt.status!='INACTIVE') inner join eg_pt_address pta on (pta.propertyid=pt.id) + inner join eg_wf_processinstance_v2 pi on (pi.businessid=sw.applicationno and pi.action='APPROVE_FOR_CONNECTION') + inner join eg_user eu on eu.uuid=pi.lastmodifiedby WHERE payment.paymentstatus != 'CANCELLED' AND pd.businessservice = 'SW.ONE_TIME_FEE' AND payment.tenantid =$tenantid From 339b37b507e38e8513dc7cd1086465160baf8cf9 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 5 Nov 2024 12:54:51 +0530 Subject: [PATCH 1479/1630] decrypted name of approval --- configs/reports/configs/ws-reports.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 48ad9d979..5b148b099 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3153,7 +3153,7 @@ ReportDefinitions: AND (d.status IS NULL OR d.status != 'CANCELLED') - reportName: WaterReportUlb - decryptionPathId: JE_PendencyReport_WS + decryptionPathId: ReceiptRegisterShort_V2 summary: Water Report Ulb version: 1.0.0 moduleName: rainmaker-ws @@ -3256,7 +3256,7 @@ ReportDefinitions: type: string source: ws total: false - - name: name + - name: collectorname label: reports.ws.approvedby type: string source: ws @@ -3316,7 +3316,7 @@ ReportDefinitions: concat(doorno,',',buildingname,',',street,',',city) as address, ws.additionaldetails->>'connectionCategory' as connectioncategory, ws.additionaldetails->>'ownerName' as ownername, - eu.name as name, + eu.name as collectorname, TO_CHAR(TO_TIMESTAMP(pi.lastmodifiedtime / 1000) AT TIME ZONE 'Asia/Kolkata', 'DD-MM-YYYY') as approvaldate FROM egcl_paymentdetail pd INNER JOIN egcl_payment payment ON pd.paymentid = payment.id @@ -3325,7 +3325,7 @@ ReportDefinitions: INNER JOIN eg_ws_connection ws ON ws.applicationno = bill.consumercode inner join eg_pt_property pt on (ws.property_id=pt.propertyid and pt.status!='INACTIVE') inner join eg_pt_address pta on (pta.propertyid=pt.id) - inner join eg_wf_processinstance_v2 pi on (pi.businessid=sw.applicationno and pi.action='APPROVE_FOR_CONNECTION') + inner join eg_wf_processinstance_v2 pi on (pi.businessid=ws.applicationno and pi.action='APPROVE_FOR_CONNECTION') inner join eg_user eu on eu.uuid=pi.lastmodifiedby WHERE payment.paymentstatus != 'CANCELLED' AND pd.businessservice = 'WS.ONE_TIME_FEE' @@ -3333,7 +3333,7 @@ ReportDefinitions: orderby: ORDER BY pd.receiptdate DESC; - reportName: SewerageReportUlb - decryptionPathId: JE_PendencyReport_WS + decryptionPathId: ReceiptRegisterShort_V2 summary: Sewerage Report Ulb version: 1.0.0 moduleName: rainmaker-ws @@ -3436,7 +3436,7 @@ ReportDefinitions: type: string source: ws total: false - - name: name + - name: collectorname label: reports.ws.approvedby type: string source: ws @@ -3496,7 +3496,7 @@ ReportDefinitions: concat(doorno,',',buildingname,',',street,',',city) as address, sw.additionaldetails->>'connectionCategory' as connectioncategory, sw.additionaldetails->>'ownerName' as ownername, - eu.name as name, + eu.name as collectorname, TO_CHAR(TO_TIMESTAMP(pi.lastmodifiedtime / 1000) AT TIME ZONE 'Asia/Kolkata', 'DD-MM-YYYY') as approvaldate FROM egcl_paymentdetail pd INNER JOIN egcl_payment payment ON pd.paymentid = payment.id From 186edbe08c8e86d24924ed275767d7701db8ecc4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 6 Nov 2024 10:31:25 +0530 Subject: [PATCH 1480/1630] added connectionno and application no in WS report --- configs/reports/configs/ws-reports.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 5b148b099..ea4cff812 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3166,6 +3166,16 @@ ReportDefinitions: type: string source: ws total: false + - name: applicationno + label: reports.ws.applicationno + type: string + source: ws + total: false + - name: connectionno + label: reports.ws.connectionno + type: string + source: ws + total: false - name: receiptdate label: reports.ws.receiptdate type: string @@ -3311,6 +3321,8 @@ ReportDefinitions: pd.manualreceiptnumber AS g8receiptno, ws.additionaldetails->>'waterSubUsageType' as usageType, ws.additionaldetails->>'ledgerid' as ledgerid, + ws.connectionno as connectionno, + ws.applicationno as applicationno, pt.propertyid as propertyid, pt.landarea as plotsize, concat(doorno,',',buildingname,',',street,',',city) as address, @@ -3346,6 +3358,16 @@ ReportDefinitions: type: string source: ws total: false + - name: applicationno + label: reports.ws.applicationno + type: string + source: ws + total: false + - name: connectionno + label: reports.ws.connectionno + type: string + source: ws + total: false - name: receiptdate label: reports.ws.receiptdate type: string @@ -3491,6 +3513,8 @@ ReportDefinitions: pd.manualreceiptnumber AS g8receiptno, sw.additionaldetails->>'waterSubUsageType' as usageType, sw.additionaldetails->>'ledgerid' as ledgerid, + sw.connectionno as connectionno, + sw.applicationno as applicationno, pt.propertyid as propertyid, pt.landarea as plotsize, concat(doorno,',',buildingname,',',street,',',city) as address, From 2e34482d367ee9b633e0baa06674a0e8022b2e39 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 6 Nov 2024 10:58:01 +0530 Subject: [PATCH 1481/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index ea4cff812..f2fbea8e0 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3320,7 +3320,7 @@ ReportDefinitions: TO_CHAR(TO_TIMESTAMP(pd.manualreceiptdate / 1000) AT TIME ZONE 'Asia/Kolkata', 'DD-MM-YYYY') AS g8issuedate, pd.manualreceiptnumber AS g8receiptno, ws.additionaldetails->>'waterSubUsageType' as usageType, - ws.additionaldetails->>'ledgerid' as ledgerid, + ws.additionaldetails->>'ledgerId' as ledgerid, ws.connectionno as connectionno, ws.applicationno as applicationno, pt.propertyid as propertyid, @@ -3512,7 +3512,7 @@ ReportDefinitions: TO_CHAR(TO_TIMESTAMP(pd.manualreceiptdate / 1000) AT TIME ZONE 'Asia/Kolkata', 'DD-MM-YYYY') AS g8issuedate, pd.manualreceiptnumber AS g8receiptno, sw.additionaldetails->>'waterSubUsageType' as usageType, - sw.additionaldetails->>'ledgerid' as ledgerid, + sw.additionaldetails->>'ledgerId' as ledgerid, sw.connectionno as connectionno, sw.applicationno as applicationno, pt.propertyid as propertyid, From cd19b766c80699bfc20e5ff448656842fd3f05f4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 11 Nov 2024 11:37:24 +0530 Subject: [PATCH 1482/1630] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 92 ++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 9520ef476..9fb21a8b7 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9904,4 +9904,96 @@ ReportDefinitions: and bill.tenantid = $tenantid and p.instrumentstatus != 'CANCELLED' and p.paymentstatus != 'CANCELLED' + +- reportName: PTReportforGISMappingg + 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 + + From 2f4469e503152c4f49f311038cefa1420f4ac937 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 11 Nov 2024 11:46:13 +0530 Subject: [PATCH 1483/1630] Update pt-reports.yml --- 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 9fb21a8b7..9d72dde6c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6026,12 +6026,12 @@ ReportDefinitions: 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 + from eg_pt_property as p inner join eg_pt_owner as o on p.id=o.propertyid and o.tenantid!='pb.testing' 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' + where p.tenantid!='pb.testing' and p.status='ACTIVE' and - o.propertyid in (select id from eg_pt_property where tenantid=$tenantid and status='ACTIVE') + o.propertyid in (select id from eg_pt_property where tenantid!='pb.testing' and status='ACTIVE') orderby: ORDER BY p.propertyid From 310faeb30ca3b6689c9f9535fef5cfe620e2fe0a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 12 Nov 2024 10:29:14 +0530 Subject: [PATCH 1484/1630] 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 9d72dde6c..7ad09f004 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4345,7 +4345,7 @@ ReportDefinitions: (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' + and pt.propertyid = bill.consumercode --and pt.status!='INACTIVE' groupby: GROUP BY financialyear orderby: ORDER BY financialyear From 2b8e4290c6ee75a8daffcfcb6c9b2209ad7139ec Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 19 Nov 2024 09:34:28 +0530 Subject: [PATCH 1485/1630] Update pt-reports.yml state ulb added gis --- configs/reports/configs/pt-reports.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 7ad09f004..6b4793ed7 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6023,6 +6023,14 @@ ReportDefinitions: source: pt isMandatory: false searchClause: AND p.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 p.tenantid = $ulb 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 b78f36301a003257eb434cfe9f6e23b424e9c56d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 20 Nov 2024 12:59:51 +0530 Subject: [PATCH 1486/1630] Update pt-reports.yml report rr like = --- configs/reports/configs/pt-reports.yml | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 6b4793ed7..bfe63996a 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2245,20 +2245,20 @@ ReportDefinitions: 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 + SUM(CASE WHEN taxheadcode = 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode = 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode = 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode = 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode = 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode = 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode = 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode = 'PT_TAX' THEN bad.amount ELSE 0 END) as propertytax, + SUM(CASE WHEN taxheadcode = 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, + (SUM(CASE WHEN taxheadcode = 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) ) as exemption, + (SUM(CASE WHEN taxheadcode = 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = '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 From 2a4e2ccea87dc0885445b6901a418b392fe2e5ce Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 22 Nov 2024 12:38:29 +0530 Subject: [PATCH 1487/1630] Update ws-reports.yml summar collection --- configs/reports/configs/ws-reports.yml | 38 ++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index f2fbea8e0..e86b43a41 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3579,4 +3579,42 @@ ReportDefinitions: query: | select applicationstatus,count(*) as totalcount from eg_sw_connection where tenantid=$tenantid and applicationstatus not in ('INITIATED') groupby: group by applicationstatus + +- reportName: wssummaryregistercollection + summary: WS Summary register collection + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: sum + label: reports.ws.sum + type: string + source: ws + total: true + - name: count + label: reports.ws.count + type: string + source: ws + total: true + - name: collector + label: reports.ws.collector + type: string + source: ws + total: false + query: | + with collection as( + select sum(amountpaid) as sum,count(*) as count,pd.createdby as + collector_userid from egcl_paymentdetail pd + inner join egcl_bill as bill on bill.id=pd.billid + where pd.tenantid='pb.bareta' and bill.status='ACTIVE' + and pd.businessservice like 'WS%' and paymentid not in + (select id from egcl_payment where tenantid='pb.bareta' and (paymentstatus='CANCELLED' or paymentmode='ONLINE') ) + groupby: group by pd.createdby + ) + select c.*,eu.username,eu.name as collector from collection c + inner join eg_user eu on eu.id::text=c.collector_userid::text + + From d3bd34ac19a0ebfa6d7ae3b314b3d6efeeda54c7 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 22 Nov 2024 12:43:44 +0530 Subject: [PATCH 1488/1630] Update ws-reports.yml ws summary collection register --- configs/reports/configs/ws-reports.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index e86b43a41..75910c66f 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3608,13 +3608,10 @@ ReportDefinitions: select sum(amountpaid) as sum,count(*) as count,pd.createdby as collector_userid from egcl_paymentdetail pd inner join egcl_bill as bill on bill.id=pd.billid - where pd.tenantid='pb.bareta' and bill.status='ACTIVE' + where pd.tenantid=$tenantid and bill.status='ACTIVE' and pd.businessservice like 'WS%' and paymentid not in (select id from egcl_payment where tenantid='pb.bareta' and (paymentstatus='CANCELLED' or paymentmode='ONLINE') ) groupby: group by pd.createdby ) select c.*,eu.username,eu.name as collector from collection c - inner join eg_user eu on eu.id::text=c.collector_userid::text - - - + inner join eg_user eu on eu.id::text=c.collector_userid::text From e29409aa41c48f45d123ff9d63038841962f26a8 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 22 Nov 2024 12:47:30 +0530 Subject: [PATCH 1489/1630] Update ws-reports.yml sw summary collection --- configs/reports/configs/ws-reports.yml | 40 +++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 75910c66f..f969edf97 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3614,4 +3614,42 @@ ReportDefinitions: groupby: group by pd.createdby ) select c.*,eu.username,eu.name as collector from collection c - inner join eg_user eu on eu.id::text=c.collector_userid::text + inner join eg_user eu on eu.id::text=c.collector_userid::text + +- reportName: swsummaryregistercollection + summary: SW Summary register collection + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: sum + label: reports.ws.sum + type: string + source: ws + total: true + - name: count + label: reports.ws.count + type: string + source: ws + total: true + - name: collector + label: reports.ws.collector + type: string + source: ws + total: false + query: | + with collection as( + select sum(amountpaid) as sum,count(*) as count,pd.createdby as + collector_userid from egcl_paymentdetail pd + inner join egcl_bill as bill on bill.id=pd.billid + where pd.tenantid=$tenantid and bill.status='ACTIVE' + and pd.businessservice like 'SW%' and paymentid not in + (select id from egcl_payment where tenantid='pb.bareta' and (paymentstatus='CANCELLED' or paymentmode='ONLINE') ) + groupby: group by pd.createdby + ) + select c.*,eu.username,eu.name as collector from collection c + inner join eg_user eu on eu.id::text=c.collector_userid::text + + From b6988b6623b6b3833544d55749593d00d5e6b5e2 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 22 Nov 2024 13:08:11 +0530 Subject: [PATCH 1490/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index f969edf97..778e6f80e 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3610,7 +3610,7 @@ ReportDefinitions: inner join egcl_bill as bill on bill.id=pd.billid where pd.tenantid=$tenantid and bill.status='ACTIVE' and pd.businessservice like 'WS%' and paymentid not in - (select id from egcl_payment where tenantid='pb.bareta' and (paymentstatus='CANCELLED' or paymentmode='ONLINE') ) + (select id from egcl_payment where tenantid=$tenantid and (paymentstatus='CANCELLED' or paymentmode='ONLINE') ) groupby: group by pd.createdby ) select c.*,eu.username,eu.name as collector from collection c @@ -3646,7 +3646,7 @@ ReportDefinitions: inner join egcl_bill as bill on bill.id=pd.billid where pd.tenantid=$tenantid and bill.status='ACTIVE' and pd.businessservice like 'SW%' and paymentid not in - (select id from egcl_payment where tenantid='pb.bareta' and (paymentstatus='CANCELLED' or paymentmode='ONLINE') ) + (select id from egcl_payment where tenantid=$tenantid and (paymentstatus='CANCELLED' or paymentmode='ONLINE') ) groupby: group by pd.createdby ) select c.*,eu.username,eu.name as collector from collection c From 635c9b05e6de876207e61a9bbf77cad93e64ddaf Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 25 Nov 2024 15:14:05 +0530 Subject: [PATCH 1491/1630] corrected groupby syntax --- configs/reports/configs/ws-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 778e6f80e..57bbd1b77 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3611,7 +3611,7 @@ ReportDefinitions: where pd.tenantid=$tenantid and bill.status='ACTIVE' and pd.businessservice like 'WS%' and paymentid not in (select id from egcl_payment where tenantid=$tenantid and (paymentstatus='CANCELLED' or paymentmode='ONLINE') ) - groupby: group by pd.createdby + group by pd.createdby ) select c.*,eu.username,eu.name as collector from collection c inner join eg_user eu on eu.id::text=c.collector_userid::text @@ -3647,7 +3647,7 @@ ReportDefinitions: where pd.tenantid=$tenantid and bill.status='ACTIVE' and pd.businessservice like 'SW%' and paymentid not in (select id from egcl_payment where tenantid=$tenantid and (paymentstatus='CANCELLED' or paymentmode='ONLINE') ) - groupby: group by pd.createdby + group by pd.createdby ) select c.*,eu.username,eu.name as collector from collection c inner join eg_user eu on eu.id::text=c.collector_userid::text From bc5849967faa36d09c9f135e9952b730053de106 Mon Sep 17 00:00:00 2001 From: palamgarg Date: Mon, 25 Nov 2024 16:38:23 +0530 Subject: [PATCH 1492/1630] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 160 ++++++++++++------------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index bfe63996a..8134fa1dc 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2466,20 +2466,20 @@ ReportDefinitions: 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 + SUM(CASE WHEN taxheadcode = 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode = 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode = 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode = 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode = 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode = 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode = 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode = 'PT_TAX' THEN bad.amount ELSE 0 END) as propertytax, + SUM(CASE WHEN taxheadcode = 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, + (SUM(CASE WHEN taxheadcode = 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) ) as exemption, + (SUM(CASE WHEN taxheadcode = 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = '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 @@ -2680,20 +2680,20 @@ ReportDefinitions: 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 + SUM(CASE WHEN taxheadcode = 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode = 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode = 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode = 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode = 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode = 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode = 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode = 'PT_TAX' THEN bad.amount ELSE 0 END) as propertytax, + SUM(CASE WHEN taxheadcode = 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, + (SUM(CASE WHEN taxheadcode = 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) ) as exemption, + (SUM(CASE WHEN taxheadcode = 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = '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 @@ -2949,19 +2949,19 @@ ReportDefinitions: 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 + SUM(CASE WHEN taxheadcode = 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode = 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode = 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode = 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode = 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode = 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode = 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode = 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode = 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode = 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = '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 @@ -3759,19 +3759,19 @@ ReportDefinitions: 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 + SUM(CASE WHEN taxheadcode = 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode = 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode = 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode = 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode = 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode = 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode = 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode = 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode = 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode = 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = '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 @@ -3939,19 +3939,19 @@ ReportDefinitions: 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 taxheadcode = 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode = 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode = 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode = 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode = 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode = 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode = 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode = 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode = 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode = 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = '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, @@ -4054,19 +4054,19 @@ ReportDefinitions: -- 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 + SUM(CASE WHEN taxheadcode = 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode = 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode = 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode = 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode = 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode = 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode = 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode = 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode = 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode = 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = '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 From d1b7e5b5a8fdb79817b87154cc1f460d4fa9ad32 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 25 Nov 2024 16:53:36 +0530 Subject: [PATCH 1493/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 57bbd1b77..1e58a6c15 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3581,6 +3581,7 @@ ReportDefinitions: groupby: group by applicationstatus - reportName: wssummaryregistercollection + decryptionPathId: ReceiptRegisterShort_V2 summary: WS Summary register collection version: 1.0.0 moduleName: rainmaker-ws @@ -3617,6 +3618,7 @@ ReportDefinitions: inner join eg_user eu on eu.id::text=c.collector_userid::text - reportName: swsummaryregistercollection + decryptionPathId: ReceiptRegisterShort_V2 summary: SW Summary register collection version: 1.0.0 moduleName: rainmaker-ws From e3111f2e6d2a0ec60616da0f9d94038d5eded56f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 27 Nov 2024 09:23:20 +0530 Subject: [PATCH 1494/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 1e58a6c15..42b55e019 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3610,7 +3610,7 @@ ReportDefinitions: collector_userid from egcl_paymentdetail pd inner join egcl_bill as bill on bill.id=pd.billid where pd.tenantid=$tenantid and bill.status='ACTIVE' - and pd.businessservice like 'WS%' and paymentid not in + and pd.businessservice in ('WS','WS.ONE_TIME_FEE') and paymentid not in (select id from egcl_payment where tenantid=$tenantid and (paymentstatus='CANCELLED' or paymentmode='ONLINE') ) group by pd.createdby ) @@ -3647,7 +3647,7 @@ ReportDefinitions: collector_userid from egcl_paymentdetail pd inner join egcl_bill as bill on bill.id=pd.billid where pd.tenantid=$tenantid and bill.status='ACTIVE' - and pd.businessservice like 'SW%' and paymentid not in + and pd.businessservice in ('SW','SW.ONE_TIME_FEE') and paymentid not in (select id from egcl_payment where tenantid=$tenantid and (paymentstatus='CANCELLED' or paymentmode='ONLINE') ) group by pd.createdby ) From 3985b21e945fa1f29dd3ff087337fbd317c81005 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 27 Nov 2024 10:38:01 +0530 Subject: [PATCH 1495/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 42b55e019..fc43a3911 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3581,7 +3581,7 @@ ReportDefinitions: groupby: group by applicationstatus - reportName: wssummaryregistercollection - decryptionPathId: ReceiptRegisterShort_V2 + decryptionPathId: MiscReceiptULB_v2 summary: WS Summary register collection version: 1.0.0 moduleName: rainmaker-ws @@ -3618,7 +3618,7 @@ ReportDefinitions: inner join eg_user eu on eu.id::text=c.collector_userid::text - reportName: swsummaryregistercollection - decryptionPathId: ReceiptRegisterShort_V2 + decryptionPathId: MiscReceiptULB_v2 summary: SW Summary register collection version: 1.0.0 moduleName: rainmaker-ws From 0d511521627e5423de8d1c2fc4632e0e4a47150c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 27 Nov 2024 11:39:43 +0530 Subject: [PATCH 1496/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index fc43a3911..24fe09b1c 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3599,8 +3599,8 @@ ReportDefinitions: type: string source: ws total: true - - name: collector - label: reports.ws.collector + - name: collectorname + label: reports.ws.collectorname type: string source: ws total: false @@ -3614,7 +3614,7 @@ ReportDefinitions: (select id from egcl_payment where tenantid=$tenantid and (paymentstatus='CANCELLED' or paymentmode='ONLINE') ) group by pd.createdby ) - select c.*,eu.username,eu.name as collector from collection c + select c.*,eu.username,eu.name as collectorname from collection c inner join eg_user eu on eu.id::text=c.collector_userid::text - reportName: swsummaryregistercollection @@ -3636,8 +3636,8 @@ ReportDefinitions: type: string source: ws total: true - - name: collector - label: reports.ws.collector + - name: collectorname + label: reports.ws.collectorname type: string source: ws total: false @@ -3651,7 +3651,7 @@ ReportDefinitions: (select id from egcl_payment where tenantid=$tenantid and (paymentstatus='CANCELLED' or paymentmode='ONLINE') ) group by pd.createdby ) - select c.*,eu.username,eu.name as collector from collection c + select c.*,eu.username,eu.name as collectorname from collection c inner join eg_user eu on eu.id::text=c.collector_userid::text From 7623a0bff23322aa631a340f3c8b6c7176635a5c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 27 Nov 2024 13:26:04 +0530 Subject: [PATCH 1497/1630] Update ws-reports.ymlcadd on as per requirement --- configs/reports/configs/ws-reports.yml | 74 ++++++++++++++++++++------ 1 file changed, 59 insertions(+), 15 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 24fe09b1c..c69132ae2 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3589,27 +3589,49 @@ ReportDefinitions: print: pdfPageSize: A1 sourceColumns: - - name: sum - label: reports.ws.sum + - name: collectoruserid + label: reports.ws.collectoruserid type: string source: ws - total: true + total: false + - name: collectorname + label: reports.ws.collectorname + type: string + source: ws + total: false - name: count label: reports.ws.count type: string source: ws total: true - - name: collectorname - label: reports.ws.collectorname + - name: sum + label: reports.ws.sum type: string source: ws - total: false + 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: | with collection as( select sum(amountpaid) as sum,count(*) as count,pd.createdby as - collector_userid from egcl_paymentdetail pd + collector_userid + --,to_timestamp(max(pd.receiptdate)/1000) as receipt_date + from egcl_paymentdetail pd inner join egcl_bill as bill on bill.id=pd.billid where pd.tenantid=$tenantid and bill.status='ACTIVE' + and pd.receiptdate >= $fromDate + and pd.receiptdate <= $toDate and pd.businessservice in ('WS','WS.ONE_TIME_FEE') and paymentid not in (select id from egcl_payment where tenantid=$tenantid and (paymentstatus='CANCELLED' or paymentmode='ONLINE') ) group by pd.createdby @@ -3626,32 +3648,54 @@ ReportDefinitions: print: pdfPageSize: A1 sourceColumns: - - name: sum - label: reports.ws.sum + - name: collectoruserid + label: reports.ws.collectoruserid type: string source: ws - total: true + total: false + - name: collectorname + label: reports.ws.collectorname + type: string + source: ws + total: false - name: count label: reports.ws.count type: string source: ws total: true - - name: collectorname - label: reports.ws.collectorname + - name: sum + label: reports.ws.sum type: string source: ws - total: false + 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: | with collection as( select sum(amountpaid) as sum,count(*) as count,pd.createdby as - collector_userid from egcl_paymentdetail pd + collectoruserid + --,to_timestamp(max(pd.receiptdate)/1000) as receipt_date + from egcl_paymentdetail pd inner join egcl_bill as bill on bill.id=pd.billid where pd.tenantid=$tenantid and bill.status='ACTIVE' + and pd.receiptdate >= $fromDate + and pd.receiptdate <= $toDate and pd.businessservice in ('SW','SW.ONE_TIME_FEE') and paymentid not in (select id from egcl_payment where tenantid=$tenantid and (paymentstatus='CANCELLED' or paymentmode='ONLINE') ) group by pd.createdby ) select c.*,eu.username,eu.name as collectorname from collection c - inner join eg_user eu on eu.id::text=c.collector_userid::text + inner join eg_user eu on eu.id::text=c.collectoruserid::text From bbb514124d365af40db6e2ff55e31cff0fb1ea79 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 27 Nov 2024 16:51:48 +0530 Subject: [PATCH 1498/1630] Update ws-reports.yml correction summary sw ws --- configs/reports/configs/ws-reports.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index c69132ae2..4054250e3 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3614,30 +3614,30 @@ ReportDefinitions: label: reports.pt.fromDate type: epoch source: pt - isMandatory: true + isMandatory: false searchClause: AND pd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt - isMandatory: true + isMandatory: false searchClause: AND pd.receiptdate <= $toDate query: | with collection as( select sum(amountpaid) as sum,count(*) as count,pd.createdby as - collector_userid + collectoruserid --,to_timestamp(max(pd.receiptdate)/1000) as receipt_date from egcl_paymentdetail pd inner join egcl_bill as bill on bill.id=pd.billid where pd.tenantid=$tenantid and bill.status='ACTIVE' - and pd.receiptdate >= $fromDate - and pd.receiptdate <= $toDate + --and pd.receiptdate >= $fromDate + --and pd.receiptdate <= $toDate and pd.businessservice in ('WS','WS.ONE_TIME_FEE') and paymentid not in (select id from egcl_payment where tenantid=$tenantid and (paymentstatus='CANCELLED' or paymentmode='ONLINE') ) group by pd.createdby ) select c.*,eu.username,eu.name as collectorname from collection c - inner join eg_user eu on eu.id::text=c.collector_userid::text + inner join eg_user eu on eu.id::text=c.collectoruserid::text - reportName: swsummaryregistercollection decryptionPathId: MiscReceiptULB_v2 @@ -3673,13 +3673,13 @@ ReportDefinitions: label: reports.pt.fromDate type: epoch source: pt - isMandatory: true + isMandatory: false searchClause: AND pd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt - isMandatory: true + isMandatory: false searchClause: AND pd.receiptdate <= $toDate query: | with collection as( @@ -3689,8 +3689,8 @@ ReportDefinitions: from egcl_paymentdetail pd inner join egcl_bill as bill on bill.id=pd.billid where pd.tenantid=$tenantid and bill.status='ACTIVE' - and pd.receiptdate >= $fromDate - and pd.receiptdate <= $toDate + --and pd.receiptdate >= $fromDate + --and pd.receiptdate <= $toDate and pd.businessservice in ('SW','SW.ONE_TIME_FEE') and paymentid not in (select id from egcl_payment where tenantid=$tenantid and (paymentstatus='CANCELLED' or paymentmode='ONLINE') ) group by pd.createdby From d37a4d256822144f1345de64e5bf69e03ccbfc00 Mon Sep 17 00:00:00 2001 From: M125688 Date: Wed, 27 Nov 2024 17:32:11 +0530 Subject: [PATCH 1499/1630] Update ws-reports.yml commented out receiptdate in query --- configs/reports/configs/ws-reports.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 4054250e3..ac35de7f5 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3626,7 +3626,6 @@ ReportDefinitions: with collection as( select sum(amountpaid) as sum,count(*) as count,pd.createdby as collectoruserid - --,to_timestamp(max(pd.receiptdate)/1000) as receipt_date from egcl_paymentdetail pd inner join egcl_bill as bill on bill.id=pd.billid where pd.tenantid=$tenantid and bill.status='ACTIVE' @@ -3684,8 +3683,7 @@ ReportDefinitions: query: | with collection as( select sum(amountpaid) as sum,count(*) as count,pd.createdby as - collectoruserid - --,to_timestamp(max(pd.receiptdate)/1000) as receipt_date + collectoruserid from egcl_paymentdetail pd inner join egcl_bill as bill on bill.id=pd.billid where pd.tenantid=$tenantid and bill.status='ACTIVE' @@ -3694,7 +3692,7 @@ ReportDefinitions: and pd.businessservice in ('SW','SW.ONE_TIME_FEE') and paymentid not in (select id from egcl_payment where tenantid=$tenantid and (paymentstatus='CANCELLED' or paymentmode='ONLINE') ) group by pd.createdby - ) + ) select c.*,eu.username,eu.name as collectorname from collection c inner join eg_user eu on eu.id::text=c.collectoruserid::text From 002fef317c9f6cbea20863918617812032592e49 Mon Sep 17 00:00:00 2001 From: M125688 Date: Wed, 27 Nov 2024 17:47:11 +0530 Subject: [PATCH 1500/1630] Update ws-reports.yml Update where clause in the ws sw report --- configs/reports/configs/ws-reports.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index ac35de7f5..52bf6d5f7 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3629,14 +3629,14 @@ ReportDefinitions: from egcl_paymentdetail pd inner join egcl_bill as bill on bill.id=pd.billid where pd.tenantid=$tenantid and bill.status='ACTIVE' - --and pd.receiptdate >= $fromDate - --and pd.receiptdate <= $toDate + and pd.receiptdate >= $fromDate + and pd.receiptdate <= $toDate and pd.businessservice in ('WS','WS.ONE_TIME_FEE') and paymentid not in (select id from egcl_payment where tenantid=$tenantid and (paymentstatus='CANCELLED' or paymentmode='ONLINE') ) group by pd.createdby ) select c.*,eu.username,eu.name as collectorname from collection c - inner join eg_user eu on eu.id::text=c.collectoruserid::text + inner join eg_user eu on eu.id::text=c.collectoruserid::text where 1=1 - reportName: swsummaryregistercollection decryptionPathId: MiscReceiptULB_v2 @@ -3687,13 +3687,13 @@ ReportDefinitions: from egcl_paymentdetail pd inner join egcl_bill as bill on bill.id=pd.billid where pd.tenantid=$tenantid and bill.status='ACTIVE' - --and pd.receiptdate >= $fromDate - --and pd.receiptdate <= $toDate + and pd.receiptdate >= $fromDate + and pd.receiptdate <= $toDate and pd.businessservice in ('SW','SW.ONE_TIME_FEE') and paymentid not in (select id from egcl_payment where tenantid=$tenantid and (paymentstatus='CANCELLED' or paymentmode='ONLINE') ) group by pd.createdby ) select c.*,eu.username,eu.name as collectorname from collection c - inner join eg_user eu on eu.id::text=c.collectoruserid::text + inner join eg_user eu on eu.id::text=c.collectoruserid::text where 1=1 From 6574fa53ac6e41b45fd84553a076008162741f0f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 28 Nov 2024 10:34:27 +0530 Subject: [PATCH 1501/1630] Update ws-reports.yml correction ws sw --- configs/reports/configs/ws-reports.yml | 40 ++++++++++++-------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 52bf6d5f7..317750cf4 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3623,20 +3623,19 @@ ReportDefinitions: isMandatory: false searchClause: AND pd.receiptdate <= $toDate query: | - with collection as( - select sum(amountpaid) as sum,count(*) as count,pd.createdby as - collectoruserid + select pd.createdby as collectoruserid, + count (*) as count, + sum(pd.amountpaid) as sum, + usr.name as collectorname, + to_timestamp(max(pd.receiptdate)/1000) as receipt_date 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 and bill.status='ACTIVE' - and pd.receiptdate >= $fromDate - and pd.receiptdate <= $toDate - and pd.businessservice in ('WS','WS.ONE_TIME_FEE') and paymentid not in - (select id from egcl_payment where tenantid=$tenantid and (paymentstatus='CANCELLED' or paymentmode='ONLINE') ) - group by pd.createdby - ) - select c.*,eu.username,eu.name as collectorname from collection c - inner join eg_user eu on eu.id::text=c.collectoruserid::text where 1=1 + and pd.businessservice in ('WS','WS.ONE_TIME_FEE') and paymentid not in + (select id from egcl_payment where tenantid=$tenantid and (paymentstatus='CANCELLED' or paymentmode='ONLINE')) + groupby: group by pd.createdby, usr.name; - reportName: swsummaryregistercollection decryptionPathId: MiscReceiptULB_v2 @@ -3681,19 +3680,18 @@ ReportDefinitions: isMandatory: false searchClause: AND pd.receiptdate <= $toDate query: | - with collection as( - select sum(amountpaid) as sum,count(*) as count,pd.createdby as - collectoruserid + select pd.createdby as collectoruserid, + count (*) as count, + sum(pd.amountpaid) as sum, + usr.name as collectorname, + to_timestamp(max(pd.receiptdate)/1000) as receipt_date 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 and bill.status='ACTIVE' - and pd.receiptdate >= $fromDate - and pd.receiptdate <= $toDate and pd.businessservice in ('SW','SW.ONE_TIME_FEE') and paymentid not in - (select id from egcl_payment where tenantid=$tenantid and (paymentstatus='CANCELLED' or paymentmode='ONLINE') ) - group by pd.createdby - ) - select c.*,eu.username,eu.name as collectorname from collection c - inner join eg_user eu on eu.id::text=c.collectoruserid::text where 1=1 + (select id from egcl_payment where tenantid=$tenantid and (paymentstatus='CANCELLED' or paymentmode='ONLINE')) + groupby: group by pd.createdby, usr.name; From 9a819517b0a1fd3d1677528c92d307f3bea1b640 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 28 Nov 2024 17:27:39 +0530 Subject: [PATCH 1502/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 60 +++++++++++++------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 317750cf4..16ccb7f5a 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3589,8 +3589,8 @@ ReportDefinitions: print: pdfPageSize: A1 sourceColumns: - - name: collectoruserid - label: reports.ws.collectoruserid + - name: usernameid + label: reports.ws.usernameid type: string source: ws total: false @@ -3623,19 +3623,19 @@ ReportDefinitions: isMandatory: false searchClause: AND pd.receiptdate <= $toDate query: | - select pd.createdby as collectoruserid, - count (*) as count, - sum(pd.amountpaid) as sum, - usr.name as collectorname, - to_timestamp(max(pd.receiptdate)/1000) as receipt_date - 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 and bill.status='ACTIVE' - and pd.businessservice in ('WS','WS.ONE_TIME_FEE') and paymentid not in - (select id from egcl_payment where tenantid=$tenantid and (paymentstatus='CANCELLED' or paymentmode='ONLINE')) - groupby: group by pd.createdby, usr.name; + SELECT + SUM(pd.amountpaid) AS sum, + COUNT(*) AS count, + CASE WHEN payment.paymentmode!= 'CASH' THEN 'ONLINE' ELSE payment.paymentmode END as paymentmode, + eu.username as usernameid, + eu.name AS collectorname + FROM egcl_paymentdetail pd + INNER JOIN egcl_bill AS bill ON bill.id = pd.billid + INNER JOIN eg_user as eu ON eu.id::text = pd.createdby::text + INNER JOIN egcl_payment as payment ON payment.id = pd.paymentid + WHERE pd.tenantid = $tenantid AND bill.status = 'ACTIVE' AND pd.businessservice IN ('WS', 'WS.ONE_TIME_FEE') AND payment.paymentstatus != 'CANCELLED' + groupby: GROUP BY eu.username, eu.name, CASE WHEN payment.paymentmode!= 'CASH' THEN 'ONLINE' ELSE payment.paymentmode END + orderby: ORDER BY CASE WHEN payment.paymentmode!= 'CASH' THEN 'ONLINE' ELSE payment.paymentmode END DESC,eu.username; - reportName: swsummaryregistercollection decryptionPathId: MiscReceiptULB_v2 @@ -3646,8 +3646,8 @@ ReportDefinitions: print: pdfPageSize: A1 sourceColumns: - - name: collectoruserid - label: reports.ws.collectoruserid + - name: usernameid + label: reports.ws.usernameid type: string source: ws total: false @@ -3680,18 +3680,18 @@ ReportDefinitions: isMandatory: false searchClause: AND pd.receiptdate <= $toDate query: | - select pd.createdby as collectoruserid, - count (*) as count, - sum(pd.amountpaid) as sum, - usr.name as collectorname, - to_timestamp(max(pd.receiptdate)/1000) as receipt_date - 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 and bill.status='ACTIVE' - and pd.businessservice in ('SW','SW.ONE_TIME_FEE') and paymentid not in - (select id from egcl_payment where tenantid=$tenantid and (paymentstatus='CANCELLED' or paymentmode='ONLINE')) - groupby: group by pd.createdby, usr.name; + SELECT + SUM(pd.amountpaid) AS sum, + COUNT(*) AS count, + CASE WHEN payment.paymentmode!= 'CASH' THEN 'ONLINE' ELSE payment.paymentmode END as paymentmode, + eu.username as usernameid, + eu.name AS collectorname + FROM egcl_paymentdetail pd + INNER JOIN egcl_bill AS bill ON bill.id = pd.billid + INNER JOIN eg_user as eu ON eu.id::text = pd.createdby::text + INNER JOIN egcl_payment as payment ON payment.id = pd.paymentid + WHERE pd.tenantid = $tenantid AND bill.status = 'ACTIVE' AND pd.businessservice IN ('SW', 'SW.ONE_TIME_FEE') AND payment.paymentstatus != 'CANCELLED' + groupby: GROUP BY eu.username, eu.name, CASE WHEN payment.paymentmode!= 'CASH' THEN 'ONLINE' ELSE payment.paymentmode END + orderby: ORDER BY CASE WHEN payment.paymentmode!= 'CASH' THEN 'ONLINE' ELSE payment.paymentmode END DESC,eu.username; From eb6c711a6a1340f42f4abf99601b7fe569aa13de Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 28 Nov 2024 17:38:16 +0530 Subject: [PATCH 1503/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 16ccb7f5a..3f30c9e35 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3609,6 +3609,11 @@ ReportDefinitions: type: string source: ws total: true + - name: paymentmode + label: reports.ws.paymentmode + type: string + source: ws + total: false searchParams: - name: fromDate label: reports.pt.fromDate @@ -3666,6 +3671,11 @@ ReportDefinitions: type: string source: ws total: true + - name: paymentmode + label: reports.ws.paymentmode + type: string + source: ws + total: false searchParams: - name: fromDate label: reports.pt.fromDate From fe3a95b65565f87259efea676375236196f34afb Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 29 Nov 2024 09:17:32 +0530 Subject: [PATCH 1504/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 3f30c9e35..4b21ddc61 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3589,11 +3589,6 @@ ReportDefinitions: print: pdfPageSize: A1 sourceColumns: - - name: usernameid - label: reports.ws.usernameid - type: string - source: ws - total: false - name: collectorname label: reports.ws.collectorname type: string @@ -3632,7 +3627,6 @@ ReportDefinitions: SUM(pd.amountpaid) AS sum, COUNT(*) AS count, CASE WHEN payment.paymentmode!= 'CASH' THEN 'ONLINE' ELSE payment.paymentmode END as paymentmode, - eu.username as usernameid, eu.name AS collectorname FROM egcl_paymentdetail pd INNER JOIN egcl_bill AS bill ON bill.id = pd.billid @@ -3651,11 +3645,6 @@ ReportDefinitions: print: pdfPageSize: A1 sourceColumns: - - name: usernameid - label: reports.ws.usernameid - type: string - source: ws - total: false - name: collectorname label: reports.ws.collectorname type: string @@ -3694,7 +3683,6 @@ ReportDefinitions: SUM(pd.amountpaid) AS sum, COUNT(*) AS count, CASE WHEN payment.paymentmode!= 'CASH' THEN 'ONLINE' ELSE payment.paymentmode END as paymentmode, - eu.username as usernameid, eu.name AS collectorname FROM egcl_paymentdetail pd INNER JOIN egcl_bill AS bill ON bill.id = pd.billid From 0bf07bd661b1cdfe23950729cf5ec071e2117e86 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:45:03 +0530 Subject: [PATCH 1505/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 4b21ddc61..818675385 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3608,7 +3608,12 @@ ReportDefinitions: label: reports.ws.paymentmode type: string source: ws - total: false + total: false + - name: type + label: reports.ws.type + type: string + source: ws + total: false searchParams: - name: fromDate label: reports.pt.fromDate @@ -3627,13 +3632,14 @@ ReportDefinitions: SUM(pd.amountpaid) AS sum, COUNT(*) AS count, CASE WHEN payment.paymentmode!= 'CASH' THEN 'ONLINE' ELSE payment.paymentmode END as paymentmode, - eu.name AS collectorname + eu.name AS collectorname, + eu.type as type FROM egcl_paymentdetail pd INNER JOIN egcl_bill AS bill ON bill.id = pd.billid INNER JOIN eg_user as eu ON eu.id::text = pd.createdby::text INNER JOIN egcl_payment as payment ON payment.id = pd.paymentid - WHERE pd.tenantid = $tenantid AND bill.status = 'ACTIVE' AND pd.businessservice IN ('WS', 'WS.ONE_TIME_FEE') AND payment.paymentstatus != 'CANCELLED' - groupby: GROUP BY eu.username, eu.name, CASE WHEN payment.paymentmode!= 'CASH' THEN 'ONLINE' ELSE payment.paymentmode END + WHERE pd.tenantid = $tenantid AND bill.status = 'ACTIVE' AND eu.type in ('EMPLOYEE','CITIZEN','SYSTEM') AND pd.businessservice IN ('WS', 'WS.ONE_TIME_FEE') AND payment.paymentstatus != 'CANCELLED' + groupby: GROUP BY eu.username, eu.name, CASE WHEN payment.paymentmode!= 'CASH' THEN 'ONLINE' ELSE payment.paymentmode END,eu.type orderby: ORDER BY CASE WHEN payment.paymentmode!= 'CASH' THEN 'ONLINE' ELSE payment.paymentmode END DESC,eu.username; - reportName: swsummaryregistercollection @@ -3665,6 +3671,11 @@ ReportDefinitions: type: string source: ws total: false + - name: type + label: reports.ws.type + type: string + source: ws + total: false searchParams: - name: fromDate label: reports.pt.fromDate @@ -3683,13 +3694,14 @@ ReportDefinitions: SUM(pd.amountpaid) AS sum, COUNT(*) AS count, CASE WHEN payment.paymentmode!= 'CASH' THEN 'ONLINE' ELSE payment.paymentmode END as paymentmode, - eu.name AS collectorname + eu.name AS collectorname, + eu.type as type FROM egcl_paymentdetail pd INNER JOIN egcl_bill AS bill ON bill.id = pd.billid INNER JOIN eg_user as eu ON eu.id::text = pd.createdby::text INNER JOIN egcl_payment as payment ON payment.id = pd.paymentid - WHERE pd.tenantid = $tenantid AND bill.status = 'ACTIVE' AND pd.businessservice IN ('SW', 'SW.ONE_TIME_FEE') AND payment.paymentstatus != 'CANCELLED' - groupby: GROUP BY eu.username, eu.name, CASE WHEN payment.paymentmode!= 'CASH' THEN 'ONLINE' ELSE payment.paymentmode END + WHERE pd.tenantid = $tenantid AND bill.status = 'ACTIVE' AND eu.type in ('EMPLOYEE','CITIZEN','SYSTEM') and pd.businessservice IN ('SW', 'SW.ONE_TIME_FEE') AND payment.paymentstatus != 'CANCELLED' + groupby: GROUP BY eu.username, eu.name, CASE WHEN payment.paymentmode!= 'CASH' THEN 'ONLINE' ELSE payment.paymentmode END,eu.type orderby: ORDER BY CASE WHEN payment.paymentmode!= 'CASH' THEN 'ONLINE' ELSE payment.paymentmode END DESC,eu.username; From 8f24e1697ddb97ab9c1b230b9f0e05cba9cc2c31 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:46:14 +0530 Subject: [PATCH 1506/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 818675385..66fea1588 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3695,7 +3695,7 @@ ReportDefinitions: COUNT(*) AS count, CASE WHEN payment.paymentmode!= 'CASH' THEN 'ONLINE' ELSE payment.paymentmode END as paymentmode, eu.name AS collectorname, - eu.type as type + eu.type as type FROM egcl_paymentdetail pd INNER JOIN egcl_bill AS bill ON bill.id = pd.billid INNER JOIN eg_user as eu ON eu.id::text = pd.createdby::text From cff7debc4c186c839b4cae0afbec54290b062aa4 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Mon, 16 Dec 2024 16:47:43 +0530 Subject: [PATCH 1507/1630] Updated New parameters --- .../data-config/ws-onetime-receipt.json | 30 +++++++ .../format-config/ws-onetime-receipt.json | 88 ++++++++++++++++++- 2 files changed, 117 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 390d6b39a..615bf3a63 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -62,6 +62,36 @@ "path": "$.MeterId" } }, + { + "variable": "ploatarea", + "value": { + "path": "$.landarea" + } + }, + { + "variable": "ledgerId", + "value": { + "path": "$.ledgerId" + } + }, + { + "variable": "connectionCategory", + "value": { + "path": "$.connectionCategory" + } + }, + { + "variable": "roadtype", + "value": { + "path": "$.roadtype" + } + }, + { + "variable": "roadlength", + "value": { + "path": "$.roadlength" + } + }, { "variable": "receiptNo", "value": { diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index fa9559c81..b5d3b4fc3 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -274,6 +274,92 @@ } ], + [ + { + "text": "Ledger Id", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ledgerId}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Ploat Area", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ploatarea}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], + [ + { + "text": "Connection Category", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{connectionCategory}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Road Type", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{roadtype}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], [ { "text": "Meter Make", @@ -316,7 +402,7 @@ "style": "receipt-table" } - ], + ], [ { "text": "Property ID", From bd78adeba121ce19c0963412003f56f18130b8bb Mon Sep 17 00:00:00 2001 From: hemendiranb Date: Wed, 18 Dec 2024 17:45:28 +0530 Subject: [PATCH 1508/1630] added operator like as UAT added operator like as UAT --- configs/egov-searcher/rainmaker-pgr-v2-searcher.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml index acdb070d7..f07447ec3 100644 --- a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml +++ b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml @@ -14,9 +14,11 @@ SearchDefinitions: - 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 @@ -74,6 +76,7 @@ SearchDefinitions: - name: tenantid isMandatory: false jsonPath: $.searchCriteria.tenantId + operator: LIKE - name: servicerequestid isMandatory: false jsonPath: $.searchCriteria.serviceRequestId @@ -165,9 +168,11 @@ SearchDefinitions: - 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 @@ -299,4 +304,4 @@ SearchDefinitions: output: jsonFormat: {"ResponseInfo": {}} outJsonPath: $.services - responseInfoPath: $.ResponseInfo + responseInfoPath: $.ResponseInfo \ No newline at end of file From d886c6e62d9746cc0058a570fe1c1bf115b95b5c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 21 Dec 2024 00:06:28 +0530 Subject: [PATCH 1509/1630] added recetipdate in IFMS integration api --- configs/egov-searcher/rainmaker-pt-gissearch.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index d047824f9..abef716b7 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -85,7 +85,7 @@ SearchDefinitions: select array_to_json(array_agg(row_to_json(data))) from (with details as ( - SELECT pd.receiptnumber,payment.paidby,bill.consumercode,pd.amountpaid, + SELECT pd.receiptnumber,pd.receiptdate as receiptdate,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 @@ -95,11 +95,11 @@ SearchDefinitions: 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' and t.txn_status = 'SUCCESS' - GROUP BY pd.receiptnumber,pd.businessservice,pd.amountpaid,pd.tenantid, + GROUP BY pd.receiptnumber,pd.receiptdate,pd.businessservice,pd.amountpaid,pd.tenantid, payment.paymentmode,t.mobile_number,payment.transactionnumber, bill.consumercode,payment.paidby,bad.taxheadcode ) - select receiptnumber, + select receiptnumber,receiptdate, paidby, consumercode, amountpaid, @@ -111,7 +111,7 @@ SearchDefinitions: 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 + group by receiptnumber,receiptdate,paidby, consumercode, amountpaid, businessservice, tenantid,paymentmode,transactionNo ,mobile_number ) as data groupBy: orderBy: From cdfc6113cb3189685ce58a6c5ba15f0fb898e4b7 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Sat, 4 Jan 2025 11:10:33 +0530 Subject: [PATCH 1510/1630] removing localiy code form indexer --- 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 fd9cc5213..b6a41a4a5 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -43,7 +43,7 @@ ServiceMaps: externalUriMapping: - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,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 b3dda4ece966d4e13f6784b235bd354964a65f4c Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Sat, 4 Jan 2025 11:55:13 +0530 Subject: [PATCH 1511/1630] removing locality code for payment --- configs/egov-indexer/payment-indexer.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index b6a41a4a5..bea766d88 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -103,7 +103,7 @@ ServiceMaps: 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 + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,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: @@ -163,7 +163,7 @@ ServiceMaps: 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 + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,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: @@ -222,7 +222,7 @@ ServiceMaps: 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 + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,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: @@ -314,7 +314,7 @@ ServiceMaps: - 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 + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,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: @@ -395,7 +395,7 @@ ServiceMaps: - 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 + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,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: @@ -475,7 +475,7 @@ ServiceMaps: - 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 + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,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 6f336e2e7cba0866d173d46749a9d4029e148567 Mon Sep 17 00:00:00 2001 From: M125688 Date: Wed, 8 Jan 2025 12:26:41 +0530 Subject: [PATCH 1512/1630] Update BillSchedulerReport (converted epoch to timestamp format) in ws-reports.yml. --- configs/reports/configs/ws-reports.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 66fea1588..869de2262 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -2786,9 +2786,9 @@ ReportDefinitions: s1.locality, s1.status, b1.service_type, - b1.billingcyclestartdate, - b1.billingcycleenddate, - b1.createddate + to_char(to_timestamp(b1.billingcyclestartdate / 1000), 'YYYY-MM-DD') as billingcyclestartdate, + to_char(to_timestamp(b1.billingcycleenddate / 1000), 'YYYY-MM-DD') as billingcycleenddate, + to_char(to_timestamp(b1.createddate / 1000), 'YYYY-MM-DD') as createddate FROM eg_ws_scheduler s1 INNER JOIN CombinedLatestBill b1 ON s1.locality = b1.locality AND s1.billingcyclestartdate = b1.billingcyclestartdate AND s1.billingcycleenddate = b1.billingcycleenddate @@ -2798,9 +2798,9 @@ ReportDefinitions: s2.locality, s2.status, b1.service_type, - b1.billingcyclestartdate, - b1.billingcycleenddate, - b1.createddate + to_char(to_timestamp(b1.billingcyclestartdate / 1000), 'YYYY-MM-DD') as billingcyclestartdate, + to_char(to_timestamp(b1.billingcycleenddate / 1000), 'YYYY-MM-DD') as billingcycleenddate, + to_char(to_timestamp(b1.createddate / 1000), 'YYYY-MM-DD') as createddate FROM eg_sw_scheduler s2 INNER JOIN CombinedLatestBill b1 ON s2.locality = b1.locality AND s2.billingcyclestartdate = b1.billingcyclestartdate AND s2.billingcycleenddate = b1.billingcycleenddate AND s2.createdtime = b1.createddate WHERE s2.tenantid = $tenantid AND b1.service_type = 'Sewerage' ORDER BY locality, service_type; From e04def3e6bf23eec6721f9684402153819f78913 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Wed, 8 Jan 2025 17:09:00 +0530 Subject: [PATCH 1513/1630] Updated two parameter group and roadlength receipt SW and WS --- .../data-config/ws-onetime-receipt.json | 65 ++++++++------ .../format-config/ws-onetime-receipt.json | 85 +++++++++++++------ 2 files changed, 96 insertions(+), 54 deletions(-) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index 615bf3a63..872641801 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -37,7 +37,7 @@ "path": "$.address" } }, - { + { "variable": "user-name", "value": { "path": "$.userInfo.name" @@ -68,6 +68,12 @@ "path": "$.landarea" } }, + { + "variable": "groupId", + "value": { + "path": "$.groupId" + } + }, { "variable": "ledgerId", "value": { @@ -204,52 +210,56 @@ } }, { - "variable": "chequeDD", + "variable": "chequeDD", "value": { "path": "$.instrumentNumber" } }, { - "variable": "chequeDDDate", + "variable": "chequeDDDate", "value": { "path": "$.instrumentDate" }, - "type":"date" + "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": "var_paymentheads", + "value": { + "path": "$.paymentDetails[0].additionalDetails.*" + }, + "type": "array", + "format": { + "type": "string", + "scema": [ + { + "variable": "taxheaddd", + "value": "taxhead" + }, + { + "variable": "amountt", + "value": "amount" + } + ] + } + }, { "variable": "dueAmount", "value": { @@ -424,7 +434,6 @@ "module": "rainmaker-common" } }, - { "variable": "generated_by", "value": { @@ -556,7 +565,7 @@ "prefix": null, "module": "rainmaker-common" } - } + } ] }, { @@ -583,8 +592,8 @@ "value": "$.MdmsRes.tenant.tenants[0].address" }, { - "variable":"mcGradePwssb", - "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + "variable": "mcGradePwssb", + "value": "$.MdmsRes.tenant.tenants[0].city.pwssbGrade" }, { "variable": "phoneNumber", @@ -620,4 +629,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 b5d3b4fc3..bbcfc09e9 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -28,7 +28,7 @@ }, { "text": "{{address}}" - }, + }, { "text": "{{website}}" }, @@ -45,7 +45,7 @@ 0 ] } - ] + ] ] }, "layout": "noBorders" @@ -228,7 +228,6 @@ false ], "style": "receipt-table" - } ], [ @@ -271,9 +270,8 @@ false ], "style": "receipt-table" - } - ], + ], [ { "text": "Ledger Id", @@ -314,7 +312,6 @@ false ], "style": "receipt-table" - } ], [ @@ -357,7 +354,48 @@ false ], "style": "receipt-table" - + } + ], + [ + { + "text": "Group ID", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{groupId}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Road Length", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{roadlength}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" } ], [ @@ -400,9 +438,8 @@ false ], "style": "receipt-table" - } - ], + ], [ { "text": "Property ID", @@ -443,10 +480,8 @@ false ], "style": "receipt-table" - } ] - ] }, "layout": {} @@ -458,21 +493,19 @@ "65%", "35%" ], - "body": + "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}}" - ] - - + { + "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": {} }, @@ -512,7 +545,7 @@ { "style": "no-signature", "text": "{{no_signature}}" - } + } ], "styles": { "noc-head": { From 41e6def3e3d41c9420f0caf8695c950e33ed48ac Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 23 Jan 2025 12:53:21 +0530 Subject: [PATCH 1514/1630] Update tl-reports.yml report --- 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 756aa7395..b78d3a059 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2335,7 +2335,7 @@ ReportDefinitions: eg_bndry_mohalla.zonecode as zone, propertyid, financialyear, - (case when oldlicensenumber is null then 'New' else 'Renewal' end) AS licensetype, + (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, From 548f6cef325977c46677c8b0748c77dc99d5d9a5 Mon Sep 17 00:00:00 2001 From: hemendiranb Date: Thu, 23 Jan 2025 14:52:39 +0530 Subject: [PATCH 1515/1630] survey services yml addition survey services yml addition from upyog configs --- .../egov-survey-service-persister.yml | 184 ++++++++++++++++++ 1 file changed, 184 insertions(+) create mode 100644 configs/egov-persister/egov-survey-service-persister.yml diff --git a/configs/egov-persister/egov-survey-service-persister.yml b/configs/egov-persister/egov-survey-service-persister.yml new file mode 100644 index 000000000..8823fa0e9 --- /dev/null +++ b/configs/egov-persister/egov-survey-service-persister.yml @@ -0,0 +1,184 @@ +serviceMaps: + serviceName: egov-survey-services + mappings: + - version: 1.0 + description: Persists surveys in eg_ss_survey table + fromTopic: save-ss-survey + isTransaction: true + queryMaps: + - query: INSERT INTO eg_ss_survey( uuid,tenantid,title,description,status,postedby,startDate,endDate,active,createdby,lastmodifiedby,createdtime,lastmodifiedtime) VALUES (?,?,?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: SurveyEntity + jsonMaps: + - jsonPath: $.SurveyEntity.uuid + + - jsonPath: $.SurveyEntity.tenantId + + - jsonPath: $.SurveyEntity.title + + - jsonPath: $.SurveyEntity.description + + - jsonPath: $.SurveyEntity.status + + - jsonPath: $.SurveyEntity.postedBy + + - jsonPath: $.SurveyEntity.startDate + + - jsonPath: $.SurveyEntity.endDate + + - jsonPath: $.SurveyEntity.active + + - jsonPath: $.SurveyEntity.auditDetails.createdBy + + - jsonPath: $.SurveyEntity.auditDetails.lastModifiedBy + + - jsonPath: $.SurveyEntity.auditDetails.createdTime + + - jsonPath: $.SurveyEntity.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_ss_question( uuid,surveyid,questionstatement,options,status,type,required,createdby,lastmodifiedby,createdtime,lastmodifiedtime,qorder) VALUES (?,?,?,?,?,?,?,?,?,?,?,?); + basePath: SurveyEntity.questions.* + jsonMaps: + - jsonPath: $.SurveyEntity.questions.*.uuid + + - jsonPath: $.SurveyEntity.questions.*.surveyId + + - jsonPath: $.SurveyEntity.questions.*.questionStatement + + - jsonPath: $.SurveyEntity.questions.*.options + type: ARRAY + dbType: STRING + + - jsonPath: $.SurveyEntity.questions.*.status + + - jsonPath: $.SurveyEntity.questions.*.type + + - jsonPath: $.SurveyEntity.questions.*.required + + - jsonPath: $.SurveyEntity.questions.*.auditDetails.createdBy + + - jsonPath: $.SurveyEntity.questions.*.auditDetails.lastModifiedBy + + - jsonPath: $.SurveyEntity.questions.*.auditDetails.createdTime + + - jsonPath: $.SurveyEntity.questions.*.auditDetails.lastModifiedTime + + - jsonPath: $.SurveyEntity.questions.*.qorder + + - version: 1.0 + description: Persists answers in eg_ss_answer table + fromTopic: save-ss-answer + isTransaction: true + queryMaps: + - query: INSERT INTO eg_ss_answer( uuid,questionid,surveyid,answer,citizenid,createdby,lastmodifiedby,createdtime,lastmodifiedtime) VALUES (?,?,?,?,?,?,?,?,?); + basePath: AnswerEntity.answers.* + jsonMaps: + - jsonPath: $.AnswerEntity.answers.*.uuid + + - jsonPath: $.AnswerEntity.answers.*.questionId + + - jsonPath: $.AnswerEntity.surveyId + + - jsonPath: $.AnswerEntity.answers.*.answer + type: ARRAY + dbType: STRING + + - jsonPath: $.AnswerEntity.answers.*.citizenId + + - jsonPath: $.AnswerEntity.answers.*.auditDetails.createdBy + + - jsonPath: $.AnswerEntity.answers.*.auditDetails.lastModifiedBy + + - jsonPath: $.AnswerEntity.answers.*.auditDetails.createdTime + + - jsonPath: $.AnswerEntity.answers.*.auditDetails.lastModifiedTime + + - version: 1.0 + description: Updates survey in tables + fromTopic: update-ss-survey + isTransaction: true + queryMaps: + - query: UPDATE eg_ss_survey SET tenantid=?, title=?, description=?, status=?, postedBy=?, startDate = ?, endDate = ?, lastmodifiedby=?, lastmodifiedtime=? WHERE uuid=?; + basePath: SurveyEntity + jsonMaps: + - jsonPath: $.SurveyEntity.tenantId + + - jsonPath: $.SurveyEntity.title + + - jsonPath: $.SurveyEntity.description + + - jsonPath: $.SurveyEntity.status + + - jsonPath: $.SurveyEntity.postedBy + + - jsonPath: $.SurveyEntity.startDate + + - jsonPath: $.SurveyEntity.endDate + + - jsonPath: $.SurveyEntity.auditDetails.lastModifiedBy + + - jsonPath: $.SurveyEntity.auditDetails.lastModifiedTime + + - jsonPath: $.SurveyEntity.uuid + + - query: UPDATE eg_ss_question SET questionstatement = ?, options = ?, status = ?, type = ?, required = ?, lastmodifiedby = ?, lastmodifiedtime = ? WHERE uuid = ?; + basePath: SurveyEntity.questions.* + jsonMaps: + + - jsonPath: $.SurveyEntity.questions.*.questionStatement + + - jsonPath: $.SurveyEntity.questions.*.options + type: ARRAY + dbType: STRING + + - jsonPath: $.SurveyEntity.questions.*.status + + - jsonPath: $.SurveyEntity.questions.*.type + + - jsonPath: $.SurveyEntity.questions.*.required + + - jsonPath: $.SurveyEntity.questions.*.auditDetails.lastModifiedBy + + - jsonPath: $.SurveyEntity.questions.*.auditDetails.lastModifiedTime + + - jsonPath: $.SurveyEntity.questions.*.uuid + + - query: INSERT INTO eg_ss_question( uuid,surveyid,questionstatement,options,status,type,required,createdby,lastmodifiedby,createdtime,lastmodifiedtime,qorder) VALUES (?,?,?,?,?,?,?,?,?,?,?,?); + basePath: SurveyEntity.insertQuestionsForUpdate.* + jsonMaps: + - jsonPath: $.SurveyEntity.insertQuestionsForUpdate.*.uuid + + - jsonPath: $.SurveyEntity.insertQuestionsForUpdate.*.surveyId + + - jsonPath: $.SurveyEntity.insertQuestionsForUpdate.*.questionStatement + + - jsonPath: $.SurveyEntity.insertQuestionsForUpdate.*.options + type: ARRAY + dbType: STRING + + - jsonPath: $.SurveyEntity.insertQuestionsForUpdate.*.status + + - jsonPath: $.SurveyEntity.insertQuestionsForUpdate.*.type + + - jsonPath: $.SurveyEntity.insertQuestionsForUpdate.*.required + + - jsonPath: $.SurveyEntity.insertQuestionsForUpdate.*.auditDetails.createdBy + + - jsonPath: $.SurveyEntity.insertQuestionsForUpdate.*.auditDetails.lastModifiedBy + + - jsonPath: $.SurveyEntity.insertQuestionsForUpdate.*.auditDetails.createdTime + + - jsonPath: $.SurveyEntity.insertQuestionsForUpdate.*.auditDetails.lastModifiedTime + + - jsonPath: $.SurveyEntity.insertQuestionsForUpdate.*.qorder + + - version: 1.0 + description: Deletes survey in tables + fromTopic: delete-ss-survey + isTransaction: true + queryMaps: + - query: UPDATE eg_ss_survey SET active=? WHERE uuid=?; + basePath: SurveyEntity + jsonMaps: + - jsonPath: $.SurveyEntity.active + + - jsonPath: $.SurveyEntity.uuid \ No newline at end of file From 959b5f918af4cfac0be16ecdd1698301b2bea57b Mon Sep 17 00:00:00 2001 From: anujkit <46367271+anujkit@users.noreply.github.com> Date: Thu, 23 Jan 2025 15:58:37 +0530 Subject: [PATCH 1516/1630] Update firenoc_persiter.yaml for FireNOC --- 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 e7a57fde6..bfdfd5be4 100644 --- a/configs/egov-persister/firenoc_persiter.yaml +++ b/configs/egov-persister/firenoc_persiter.yaml @@ -81,7 +81,7 @@ serviceMaps: - 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 (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?); + - query: INSERT INTO eg_fn_owner(uuid, tenantid, firenocdetailsuuid, isactive, isprimaryowner, ownertype, ownershippercentage, relationship, active, institutionid, createdby, createdtime, lastmodifiedby, lastmodifiedtime,useruuid,applicationAssignee) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?); basePath: FireNOCs.*.fireNOCDetails.applicantDetails.owners.* jsonMaps: - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.ownerUUID @@ -113,6 +113,8 @@ serviceMaps: - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.lastModifiedTime - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.uuid + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.applicationAssignee - 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 From 647bbdeab004f73dd31268baa49840022bbf446c Mon Sep 17 00:00:00 2001 From: M125688 Date: Thu, 23 Jan 2025 17:04:45 +0530 Subject: [PATCH 1517/1630] Create pending.yml --- configs/reports/configs/pending.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 configs/reports/configs/pending.yml diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/configs/reports/configs/pending.yml @@ -0,0 +1 @@ + From c940de15f50eb35b9e172d756ef65987ce128760 Mon Sep 17 00:00:00 2001 From: M125688 Date: Thu, 23 Jan 2025 17:30:09 +0530 Subject: [PATCH 1518/1630] Update pending.yml --- configs/reports/configs/pending.yml | 78 +++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index 8b1378917..6db433f19 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -1 +1,79 @@ +ReportDefinitions: + - reportName: PendingReport + summary: Pending Report Miscellaneous + version: 1.0.0 + moduleName: uc + sourceColumns: + - name: tenantid + label: reports.uc.tenantid + type: string + source: pd + total: false + - name: servicename + label: reports.uc.servicename + type: string + source: uc + total: false + - name: totalappl + label: reports.uc.totalappl + type: string + source: uc + total: false + - name: pendingappl + label: reports.uc.pendingappl + type: string + source: uc + total: false + searchParams: + - 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 ta.tenantid = $ulb + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH total_appl AS + (SELECT pp.tenantid, + CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' + WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' + WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' + WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' + WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' + --WHEN pp.businessservice IN ('PT.CREATE','PT.UPDATE','PT.MUTATION','PT.CREATEWITHWNS') THEN 'PT-Service' + END as servicename, + count(*) as total_appl + FROM public.eg_wf_processinstance_v2 pp + WHERE pp.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.MUTATION','PT.CREATEWITHWNS') + GROUP BY pp.tenantid,CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' + WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' + WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' + WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' + WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' + --WHEN pp.businessservice IN ('PT.CREATE','PT.UPDATE','PT.MUTATION','PT.CREATEWITHWNS') THEN 'PT-Service' END), + pending_appl AS + (SELECT p.tenantid, CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' + WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' + WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' + WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' + WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' + --WHEN b.businessservice IN ('PT.CREATE','PT.UPDATE','PT.MUTATION','PT.CREATEWITHWNS') THEN 'PT-Service' END as servicename, + count(*) as pending_appl + FROM public.eg_wf_processinstance_v2 + JOIN public.eg_wf_businessservice_v2 b ON p.businessservice=b.businessservice + WHERE (to_timestamp(p.lastmodifiedtime / 1000.0) - to_timestamp(p.createdtime / 1000.0)) > (b.businessservicesla / (1000 * 60 * 60 * 24)) * interval '1 day' + AND b.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.MUTATION','PT.CREATEWITHWNS') + GROUP BY p.tenantid,CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' + WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' + WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' + WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' + WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' + --WHEN b.businessservice IN ('PT.CREATE','PT.UPDATE','PT.MUTATION','PT.CREATEWITHWNS') THEN 'PT-Service' + END) + SELECT ta.tenantid as tenantid,ta.servicename as servicename,ta.total_appl as total_appl,COALESCE(pa.pending_appl,0) as pending_appl + FROM total_appl ta + LEFT JOIN pending_appl pa ON ta.tenantid=pa.tenantid AND ta.servicename=pa.servicename; + From a222416029c92e3aa97067d2ac22887eaf128308 Mon Sep 17 00:00:00 2001 From: M125688 Date: Thu, 23 Jan 2025 17:37:23 +0530 Subject: [PATCH 1519/1630] Update pending.yml --- configs/reports/configs/pending.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index 6db433f19..28f829a96 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -25,14 +25,21 @@ ReportDefinitions: source: uc total: false searchParams: - - name: ulb - label: reports.uc.ulb + - name: tenantid + label: reports.uc.tenantid 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 ta.tenantid = $ulb + searchClause: AND ta.tenantid = $tenantid + - name: servicename + label: servicename + type: singlevaluelist + pattern: 'list://TL%:TL-Renewal,SW%:SW-Service,WS%:WS-Service,FN%:FireNoc,BS%:Bill Amendment' + source: uc + isMandatory: true + searchClause: AND ta.servicename like $servicename query: | -- Use CTE to force query plan, compute & use CTE later WITH total_appl AS @@ -74,6 +81,6 @@ ReportDefinitions: END) SELECT ta.tenantid as tenantid,ta.servicename as servicename,ta.total_appl as total_appl,COALESCE(pa.pending_appl,0) as pending_appl FROM total_appl ta - LEFT JOIN pending_appl pa ON ta.tenantid=pa.tenantid AND ta.servicename=pa.servicename; + LEFT JOIN pending_appl pa ON ta.tenantid=pa.tenantid AND ta.servicename=pa.servicename WHERE 1=1; From b7c935160463c664becd9ae04923ac8e7cdd79dd Mon Sep 17 00:00:00 2001 From: M125688 Date: Fri, 24 Jan 2025 10:13:37 +0530 Subject: [PATCH 1520/1630] Update pending.yml --- configs/reports/configs/pending.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index 28f829a96..c4bb0ade9 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -1,6 +1,6 @@ ReportDefinitions: - - reportName: PendingReport - summary: Pending Report Miscellaneous + - reportName: PendencyReport + summary: Pendency Report Miscellaneous version: 1.0.0 moduleName: uc sourceColumns: From 1377c0e7dcd64849dccad43e9de4aef3ca514765 Mon Sep 17 00:00:00 2001 From: M125688 Date: Fri, 24 Jan 2025 16:22:19 +0530 Subject: [PATCH 1521/1630] Update pending.yml --- configs/reports/configs/pending.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index c4bb0ade9..456451c90 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -5,9 +5,9 @@ ReportDefinitions: moduleName: uc sourceColumns: - name: tenantid - label: reports.uc.tenantid + label: reports.rainmaker-uc.tenantid type: string - source: pd + source: uc total: false - name: servicename label: reports.uc.servicename From 2f4d0db901c116e7fb8090bb6fdd70099049d0f1 Mon Sep 17 00:00:00 2001 From: M125688 Date: Fri, 24 Jan 2025 16:33:20 +0530 Subject: [PATCH 1522/1630] Update pending.yml --- configs/reports/configs/pending.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index 456451c90..011ada048 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -2,7 +2,7 @@ ReportDefinitions: - reportName: PendencyReport summary: Pendency Report Miscellaneous version: 1.0.0 - moduleName: uc + moduleName: rainmaker-uc sourceColumns: - name: tenantid label: reports.rainmaker-uc.tenantid From dcdc270a686e7a8278d9662cb87c7cdd685b074e Mon Sep 17 00:00:00 2001 From: M125688 Date: Fri, 24 Jan 2025 17:30:34 +0530 Subject: [PATCH 1523/1630] Update report.config --- configs/reports/report.config | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/report.config b/configs/reports/report.config index d61eda0e0..0033260c1 100644 --- a/configs/reports/report.config +++ b/configs/reports/report.config @@ -5,3 +5,4 @@ rainmaker-uc=file:///work-dir/punjab-rainmaker-customization/configs/reports/con 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 +rainmaker-misc=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/pending.yml From 3aad8845a73773e270d4f17a9c93689d902ad6b1 Mon Sep 17 00:00:00 2001 From: M125688 Date: Fri, 24 Jan 2025 17:35:57 +0530 Subject: [PATCH 1524/1630] Update pending.yml --- configs/reports/configs/pending.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index 011ada048..458ab44e8 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -2,34 +2,34 @@ ReportDefinitions: - reportName: PendencyReport summary: Pendency Report Miscellaneous version: 1.0.0 - moduleName: rainmaker-uc + moduleName: rainmaker-misc sourceColumns: - name: tenantid - label: reports.rainmaker-uc.tenantid + label: reports.rainmaker-misc.tenantid type: string - source: uc + source: rainmaker-misc total: false - name: servicename - label: reports.uc.servicename + label: reports.rainmaker-misc.servicename type: string - source: uc + source: rainmaker-misc total: false - name: totalappl - label: reports.uc.totalappl + label: reports.rainmaker-misc.totalappl type: string - source: uc + source: rainmaker-misc total: false - name: pendingappl - label: reports.uc.pendingappl + label: reports.rainmaker-misc.pendingappl type: string - source: uc + source: rainmaker-misc total: false searchParams: - name: tenantid label: reports.uc.tenantid 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 + source: rainmaker-misc wrapper: true isMandatory: false searchClause: AND ta.tenantid = $tenantid @@ -37,7 +37,7 @@ ReportDefinitions: label: servicename type: singlevaluelist pattern: 'list://TL%:TL-Renewal,SW%:SW-Service,WS%:WS-Service,FN%:FireNoc,BS%:Bill Amendment' - source: uc + source: rainmaker-misc isMandatory: true searchClause: AND ta.servicename like $servicename query: | From 7e1d3fca0b592dd35a540d2d03862fa1933fd7f9 Mon Sep 17 00:00:00 2001 From: M125688 Date: Fri, 24 Jan 2025 18:57:54 +0530 Subject: [PATCH 1525/1630] Update pending.yml --- configs/reports/configs/pending.yml | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index 458ab44e8..8fc6eaec0 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -1,47 +1,46 @@ ReportDefinitions: - - reportName: PendencyReport + - reportName: PendencyReportMiscellaneous summary: Pendency Report Miscellaneous version: 1.0.0 moduleName: rainmaker-misc sourceColumns: - name: tenantid - label: reports.rainmaker-misc.tenantid + label: tenantid type: string source: rainmaker-misc total: false - name: servicename - label: reports.rainmaker-misc.servicename + label: servicename type: string source: rainmaker-misc total: false - name: totalappl - label: reports.rainmaker-misc.totalappl + label: totalappl type: string source: rainmaker-misc total: false - name: pendingappl - label: reports.rainmaker-misc.pendingappl + label: pendingappl type: string source: rainmaker-misc total: false searchParams: - name: tenantid - label: reports.uc.tenantid + label: tenantid 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: rainmaker-misc wrapper: true isMandatory: false - searchClause: AND ta.tenantid = $tenantid + searchClause: $tenantid - name: servicename label: servicename type: singlevaluelist pattern: 'list://TL%:TL-Renewal,SW%:SW-Service,WS%:WS-Service,FN%:FireNoc,BS%:Bill Amendment' source: rainmaker-misc - isMandatory: true - searchClause: AND ta.servicename like $servicename + isMandatory: false + searchClause: $servicename query: | - -- Use CTE to force query plan, compute & use CTE later WITH total_appl AS (SELECT pp.tenantid, CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' @@ -49,7 +48,6 @@ ReportDefinitions: WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' - --WHEN pp.businessservice IN ('PT.CREATE','PT.UPDATE','PT.MUTATION','PT.CREATEWITHWNS') THEN 'PT-Service' END as servicename, count(*) as total_appl FROM public.eg_wf_processinstance_v2 pp @@ -59,14 +57,12 @@ ReportDefinitions: WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' - --WHEN pp.businessservice IN ('PT.CREATE','PT.UPDATE','PT.MUTATION','PT.CREATEWITHWNS') THEN 'PT-Service' END), pending_appl AS (SELECT p.tenantid, CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' - --WHEN b.businessservice IN ('PT.CREATE','PT.UPDATE','PT.MUTATION','PT.CREATEWITHWNS') THEN 'PT-Service' END as servicename, count(*) as pending_appl FROM public.eg_wf_processinstance_v2 JOIN public.eg_wf_businessservice_v2 b ON p.businessservice=b.businessservice @@ -76,9 +72,7 @@ ReportDefinitions: WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' - --WHEN b.businessservice IN ('PT.CREATE','PT.UPDATE','PT.MUTATION','PT.CREATEWITHWNS') THEN 'PT-Service' - END) + WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' END) SELECT ta.tenantid as tenantid,ta.servicename as servicename,ta.total_appl as total_appl,COALESCE(pa.pending_appl,0) as pending_appl FROM total_appl ta LEFT JOIN pending_appl pa ON ta.tenantid=pa.tenantid AND ta.servicename=pa.servicename WHERE 1=1; From a9e6cfe8b7bb76214988dcbcbbf3c9a8d16cd639 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Mon, 27 Jan 2025 10:17:58 +0530 Subject: [PATCH 1526/1630] Update property-services-registry.yml --- configs/egov-persister/property-services-registry.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configs/egov-persister/property-services-registry.yml b/configs/egov-persister/property-services-registry.yml index 4cb28d11a..d72853d9d 100644 --- a/configs/egov-persister/property-services-registry.yml +++ b/configs/egov-persister/property-services-registry.yml @@ -307,7 +307,7 @@ serviceMaps: 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=?; + - query: UPDATE eg_pt_property SET propertyid=?, surveyid=?, accountid=?, oldpropertyid=?, status=?, propertytype=?, ownershipcategory=?, usagecategory=?, nooffloors=?, landarea=?, superbuiltuparea=?, linkedproperties=?, lastmodifiedby=?, lastmodifiedtime=?, additionaldetails=?, creationReason=? WHERE Id=? AND tenantId=?; basePath: Property jsonMaps: @@ -342,7 +342,9 @@ serviceMaps: - jsonPath: $.Property.additionalDetails type: JSON dbType: JSONB - + + - jsonPath: $.Property.creationReason + - jsonPath: $.Property.id - jsonPath: $.Property.tenantId From 8e2d43c72256a8ad0b736dd35b03c79c25eb3478 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Mon, 27 Jan 2025 10:24:12 +0530 Subject: [PATCH 1527/1630] Fixing changes from UAT to PROD --- configs/egov-persister/sewerage-persist.yml | 3 ++- configs/egov-persister/water-bill-scheduler.yml | 6 ++++-- configs/egov-persister/water-persist.yml | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/configs/egov-persister/sewerage-persist.yml b/configs/egov-persister/sewerage-persist.yml index 8508c5b08..0b4c1e53b 100644 --- a/configs/egov-persister/sewerage-persist.yml +++ b/configs/egov-persister/sewerage-persist.yml @@ -7,7 +7,7 @@ serviceMaps: 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 (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?); + - 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, channel) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?,?); basePath: $.SewerageConnection jsonMaps: - jsonPath: $.SewerageConnection.id @@ -51,6 +51,7 @@ serviceMaps: - jsonPath: $.SewerageConnection.additionalDetails type: JSON dbType: JSONB + - jsonPath: $.SewerageConnection.channel - query: INSERT INTO eg_sw_service(connection_id,connectionExecutionDate,noOfWaterClosets,noOfToilets,connectiontype,proposedWaterClosets,proposedToilets, appCreatedDate, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?); diff --git a/configs/egov-persister/water-bill-scheduler.yml b/configs/egov-persister/water-bill-scheduler.yml index f3e299b45..6fec6ff6b 100644 --- a/configs/egov-persister/water-bill-scheduler.yml +++ b/configs/egov-persister/water-bill-scheduler.yml @@ -7,7 +7,7 @@ serviceMaps: 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 (?, ?, ?, ?, ?, ?, ?,?,?,?,?); + - query: INSERT INTO eg_ws_scheduler (id, tenantid, transactiontype,locality,billingcyclestartdate,billingcycleenddate,status, createdby, lastmodifiedby, createdtime, lastmodifiedtime, groups) VALUES (?, ?, ?, ?, ?, ?, ?,?,?,?,?,?); basePath: $.billScheduler jsonMaps: - jsonPath: $.billScheduler.id @@ -30,4 +30,6 @@ serviceMaps: - jsonPath: $.billScheduler.auditDetails.createdTime - - jsonPath: $.billScheduler.auditDetails.lastModifiedTime \ No newline at end of file + - jsonPath: $.billScheduler.auditDetails.lastModifiedTime + + - jsonPath: $.billScheduler.grup \ No newline at end of file diff --git a/configs/egov-persister/water-persist.yml b/configs/egov-persister/water-persist.yml index d95437ff2..5986c9e71 100644 --- a/configs/egov-persister/water-persist.yml +++ b/configs/egov-persister/water-persist.yml @@ -7,7 +7,7 @@ serviceMaps: 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 (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?); + - 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, channel) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?,?); basePath: $.WaterConnection jsonMaps: - jsonPath: $.WaterConnection.id @@ -51,6 +51,7 @@ serviceMaps: - jsonPath: $.WaterConnection.additionalDetails type: JSON dbType: JSONB + - jsonPath: $.WaterConnection.channel - query: INSERT INTO eg_ws_service(connection_id,connectionCategory,connectionType,waterSource,meterId,meterInstallationDate,pipeSize,noOfTaps,connectionexecutiondate,proposedPipeSize,proposedTaps, appCreatedDate, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); From 8cda0f7417548ef4ee586ee3384eaafbf3543f74 Mon Sep 17 00:00:00 2001 From: M125688 Date: Mon, 27 Jan 2025 14:41:45 +0530 Subject: [PATCH 1528/1630] Update pending.yml for the pendency report --- configs/reports/configs/pending.yml | 45 ++++++++++++++++------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index 8fc6eaec0..801bd7f89 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -14,32 +14,37 @@ ReportDefinitions: type: string source: rainmaker-misc total: false - - name: totalappl - label: totalappl + - name: total_application + label: total_application type: string source: rainmaker-misc total: false - - name: pendingappl - label: pendingappl + - name: pending_application_out_of_sla + label: pending_application_out_of_sla type: string source: rainmaker-misc total: false - searchParams: - - name: tenantid - label: tenantid - 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: pendingapplpercentage + label: pendingapplpercentage + type: string source: rainmaker-misc - wrapper: true - isMandatory: false - searchClause: $tenantid + total: false + searchParams: - name: servicename label: servicename type: singlevaluelist pattern: 'list://TL%:TL-Renewal,SW%:SW-Service,WS%:WS-Service,FN%:FireNoc,BS%:Bill Amendment' source: rainmaker-misc isMandatory: false - searchClause: $servicename + searchClause: AND ta.servicename =$servicename + - name: tenantselected + label: tenantid + 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: rainmaker-misc + wrapper: true + isMandatory: false + searchClause: AND ta.tenantid =$tenantselected query: | WITH total_appl AS (SELECT pp.tenantid, @@ -57,14 +62,15 @@ ReportDefinitions: WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' + END), pending_appl AS - (SELECT p.tenantid, CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' + (SELECT p.tenantid, CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' + WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' END as servicename, count(*) as pending_appl - FROM public.eg_wf_processinstance_v2 + FROM public.eg_wf_processinstance_v2 p JOIN public.eg_wf_businessservice_v2 b ON p.businessservice=b.businessservice WHERE (to_timestamp(p.lastmodifiedtime / 1000.0) - to_timestamp(p.createdtime / 1000.0)) > (b.businessservicesla / (1000 * 60 * 60 * 24)) * interval '1 day' AND b.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.MUTATION','PT.CREATEWITHWNS') @@ -73,8 +79,7 @@ ReportDefinitions: WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' END) - SELECT ta.tenantid as tenantid,ta.servicename as servicename,ta.total_appl as total_appl,COALESCE(pa.pending_appl,0) as pending_appl + SELECT ta.tenantid as tenantid,ta.servicename as servicename,ta.total_appl as total_application,COALESCE(pa.pending_appl,0) as pending_application_out_of_sla, + ROUND(CASE WHEN ta.total_appl > 0 THEN (COALESCE(pa.pending_appl, 0) * 100.0 / ta.total_appl) ELSE 0 END, 2) AS pendingapplpercentage FROM total_appl ta - LEFT JOIN pending_appl pa ON ta.tenantid=pa.tenantid AND ta.servicename=pa.servicename WHERE 1=1; - - + LEFT JOIN pending_appl pa ON ta.tenantid=pa.tenantid AND ta.servicename=pa.servicename WHERE ta.tenantid NOT IN ('pb','pb.testing') From 55f285ce182ceacb130cd13d490b95dba02f08c8 Mon Sep 17 00:00:00 2001 From: M125688 Date: Tue, 28 Jan 2025 10:00:56 +0530 Subject: [PATCH 1529/1630] Update pending.yml revoked servicename as search parameter --- configs/reports/configs/pending.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index 801bd7f89..6a8d99331 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -30,13 +30,6 @@ ReportDefinitions: source: rainmaker-misc total: false searchParams: - - name: servicename - label: servicename - type: singlevaluelist - pattern: 'list://TL%:TL-Renewal,SW%:SW-Service,WS%:WS-Service,FN%:FireNoc,BS%:Bill Amendment' - source: rainmaker-misc - isMandatory: false - searchClause: AND ta.servicename =$servicename - name: tenantselected label: tenantid type: singlevaluelist From f4551074b5c74704ce4945a878bec410e5551ebc Mon Sep 17 00:00:00 2001 From: M125688 Date: Tue, 28 Jan 2025 14:59:57 +0530 Subject: [PATCH 1530/1630] Update pending.yml updated the summary name --- configs/reports/configs/pending.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index 6a8d99331..8c1bc3e6c 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -1,6 +1,6 @@ ReportDefinitions: - reportName: PendencyReportMiscellaneous - summary: Pendency Report Miscellaneous + summary: Pendency Report version: 1.0.0 moduleName: rainmaker-misc sourceColumns: From e1c5227a0229c21ddc236c527184fa7c84eb6a73 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 14 Feb 2025 10:23:45 +0530 Subject: [PATCH 1531/1630] Update uc-reports.yml change stat --- configs/reports/configs/uc-reports.yml | 143 +++++++++++++++++-------- 1 file changed, 97 insertions(+), 46 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index c3f33cb57..9aefa5e1e 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -864,12 +864,12 @@ ReportDefinitions: type: string source: uc total: false - - name: status + - name: receiptstatus label: reports.uc.receiptstatus type: string source: uc total: false - - name: servicecategory + - name: businessdetails label: reports.uc.businessdetails type: string source: uc @@ -894,8 +894,23 @@ ReportDefinitions: type: string source: uc total: true - - name: ddorchequenumber - label: reports.uc.ddorchequenumber + - name: cheque_dd_no + label: reports.uc.cheque_dd_no + type: string + source: uc + total: false + - name: cheque_dd_date + label: reports.uc.cheque_dd_date + 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 @@ -903,7 +918,7 @@ ReportDefinitions: label: reports.uc.collectiontype type: string source: uc - total: false + total: false - name: collectorname label: reports.uc.collectorname type: string @@ -919,62 +934,98 @@ ReportDefinitions: type: string source: uc total: false + - name: payername + label: reports.uc.payername + type: string + source: uc + total: false + - name: comments + label: reports.uc.comments + 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 searchParams: - name: fromDate label: reports.uc.fromDate type: epoch source: uc - isMandatory: true - searchClause: AND paydetail.receiptdate >= $fromDate + isMandatory: false + searchClause: AND eg_echallan.createdtime >= $fromDate - name: toDate label: reports.uc.toDate type: epoch source: uc - isMandatory: true - searchClause: AND paydetail.receiptdate <= $toDate - - name: ulb - label: reports.uc.ulb + 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?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + 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.tenantid = $ulb + searchClause: AND egcl_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 - 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 + SELECT + string_agg(distinct egcl_bill.status,',') as billstatus, + string_agg(distinct payment.paymentstatus,',') receiptstatus, + string_agg(distinct payment.tenantid,',') as ulb, + string_agg(distinct egcl_bill.totalamount::text,',') as totalamount, + eg_echallan.challanno, + string_agg(distinct eg_echallan.businessservice,',') as businessdetails, + string_agg(distinct eg_echallan.description,',') as comments, + 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 g8receiptno, + To_char((To_timestamp(egcl_paymentdetail.manualreceiptdate/ 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, + 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, + to_char((To_timestamp(payment.instrumentdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS cheque_dd_date, + string_agg(distinct payment.transactionnumber,',') as transactionnumber, + string_agg(distinct payment.paymentmode,',') as paymentmode, + 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 payment.payername,',') as payername, + string_agg(distinct eg_user.name,',') as collectorname, + 'System' as collectiontype, + 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!='pb.testing' and eg_echallan.challanno=egcl_bill.consumercode ) inner join egcl_paymentdetail on (egcl_paymentdetail.tenantid!='pb.testing' 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!='pb.testing' 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!='pb.testing' 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 ,payment.instrumentdate,egcl_paymentdetail.manualreceiptdate + - reportName: MiscReceiptULB_v2 From 3a8961cfa84b1f92ccd4bfdb8eb33ca3b3e893a0 Mon Sep 17 00:00:00 2001 From: hemendiranb Date: Mon, 17 Feb 2025 15:16:30 +0530 Subject: [PATCH 1532/1630] survey creation persister yml survey persister yml --- .../egov-survey-service-persister.yml | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/configs/egov-persister/egov-survey-service-persister.yml b/configs/egov-persister/egov-survey-service-persister.yml index 8823fa0e9..3deb3f68d 100644 --- a/configs/egov-persister/egov-survey-service-persister.yml +++ b/configs/egov-persister/egov-survey-service-persister.yml @@ -181,4 +181,36 @@ serviceMaps: jsonMaps: - jsonPath: $.SurveyEntity.active - - jsonPath: $.SurveyEntity.uuid \ No newline at end of file + - jsonPath: $.SurveyEntity.uuid + + - version: 1.0 + description: Insert into scorecard survey related tables + fromTopic: insert-scorecard-survey-entity + isTransaction: true + queryMaps: + - query: INSERT INTO eg_survey_entity (uuid,tenantid, title, category, description, startdate, enddate, postedby, active, answerscount, hasresponded) VALUES (?, ?, ?, ?, ?, NULL, NULL, NULL, NULL, NULL, NULL); + basePath: SurveyEntity + jsonMaps: + - jsonPath: $.SurveyEntity.uuid + - jsonPath: $.SurveyEntity.tenantId + - jsonPath: $.SurveyEntity.surveyTitle + - jsonPath: $.SurveyEntity.surveyCategory + - jsonPath: $.SurveyEntity.surveyDescription + + - query: INSERT INTO eg_survey_section(uuid, surveyuuid, title, weightage) VALUES (?, ?, ?, ?); + basePath: SurveyEntity + jsonMaps: + - jsonPath: $.SurveyEntity.sections.*.uuid + - jsonPath: $.SurveyEntity.uuid + - jsonPath: $.SurveyEntity.sections.*.title + - jsonPath: $.SurveyEntity.sections.*.weightage + + - query: INSERT INTO eg_question_weightage(weightage, qorder) VALUES (?, ?); + basePath: SurveyEntity + jsonMaps: + - jsonPath: $.SurveyEntity.sections.*.questions.*.questionUuid + - jsonPath: $.SurveyEntity.sections.*.uuid + - jsonPath: $.SurveyEntity.sections.*.questions.*.weightage + - jsonPath: $.SurveyEntity.sections.*.questions.*.qorder + + \ No newline at end of file From 1fae930f4fbe40a4f8b146f78c6060830a7ea30a Mon Sep 17 00:00:00 2001 From: palamgarg Date: Tue, 18 Feb 2025 10:21:26 +0530 Subject: [PATCH 1533/1630] Update pending.yml --- configs/reports/configs/pending.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index 8c1bc3e6c..929fe78e5 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -1,6 +1,6 @@ ReportDefinitions: - reportName: PendencyReportMiscellaneous - summary: Pendency Report + summary: Pendency Report Miscellaneous version: 1.0.0 moduleName: rainmaker-misc sourceColumns: @@ -30,6 +30,13 @@ ReportDefinitions: source: rainmaker-misc total: false searchParams: + - name: servicename + label: servicename + type: singlevaluelist + pattern: 'list://TL%:TL-Renewal,SW%:SW-Service,WS%:WS-Service,FN%:FireNoc,BS%:Bill Amendment' + source: rainmaker-misc + isMandatory: false + searchClause: AND ta.servicename =$servicename - name: tenantselected label: tenantid type: singlevaluelist @@ -50,6 +57,7 @@ ReportDefinitions: count(*) as total_appl FROM public.eg_wf_processinstance_v2 pp WHERE pp.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.MUTATION','PT.CREATEWITHWNS') + AND PP.ASSIGNEE IS NOT NULL GROUP BY pp.tenantid,CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' @@ -67,6 +75,7 @@ ReportDefinitions: JOIN public.eg_wf_businessservice_v2 b ON p.businessservice=b.businessservice WHERE (to_timestamp(p.lastmodifiedtime / 1000.0) - to_timestamp(p.createdtime / 1000.0)) > (b.businessservicesla / (1000 * 60 * 60 * 24)) * interval '1 day' AND b.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.MUTATION','PT.CREATEWITHWNS') + AND P.ASSIGNEE IS NOT NULL GROUP BY p.tenantid,CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' From 5389e0cf3b3ea14c0b218611945731a9ca7e5d8e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 24 Feb 2025 09:29:13 +0530 Subject: [PATCH 1534/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 212 +++++++++++++++++++++++++ 1 file changed, 212 insertions(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 869de2262..57b004e4a 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3703,5 +3703,217 @@ ReportDefinitions: WHERE pd.tenantid = $tenantid AND bill.status = 'ACTIVE' AND eu.type in ('EMPLOYEE','CITIZEN','SYSTEM') and pd.businessservice IN ('SW', 'SW.ONE_TIME_FEE') AND payment.paymentstatus != 'CANCELLED' groupby: GROUP BY eu.username, eu.name, CASE WHEN payment.paymentmode!= 'CASH' THEN 'ONLINE' ELSE payment.paymentmode END,eu.type orderby: ORDER BY CASE WHEN payment.paymentmode!= 'CASH' THEN 'ONLINE' ELSE payment.paymentmode END DESC,eu.username; + +- reportName: WSSWCancelledReceiptRegister_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 = 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode = 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode = 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode = 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode = 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode = 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode = 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode = 'PT_TAX' THEN bad.amount ELSE 0 END) as propertytax, + SUM(CASE WHEN taxheadcode = 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, + (SUM(CASE WHEN taxheadcode = 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) ) as exemption, + (SUM(CASE WHEN taxheadcode = 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = '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 = 'pb.fazilka' and payment.paymentstatus = 'CANCELLED' and pd.businessservice in ('WS','SW','WS.ONE_TIME_FEE','SW.ONE_TIME_FEE') + 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 in ('WS','SW','WS.ONE_TIME_FEE','SW.ONE_TIME_FEE') and payment.tenantid='pb.fazilka' + --and pt.propertyid = bill.consumercode + and receipt_breakup.pdid=pd.id + --and pt_addr.propertyid=pt.id + ORDER BY pd.receiptdate DESC; + From 7d69ff9a5a139a0df1fe75fd2e12afbf4bdeaf4a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 24 Feb 2025 09:33:34 +0530 Subject: [PATCH 1535/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 57b004e4a..4149cdb3d 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3884,7 +3884,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 payment.tenantid = 'pb.fazilka' and payment.paymentstatus = 'CANCELLED' and pd.businessservice in ('WS','SW','WS.ONE_TIME_FEE','SW.ONE_TIME_FEE') + WHERE payment.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice in ('WS','SW','WS.ONE_TIME_FEE','SW.ONE_TIME_FEE') GROUP BY pdid ) SELECT @@ -3909,11 +3909,8 @@ ReportDefinitions: 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 in ('WS','SW','WS.ONE_TIME_FEE','SW.ONE_TIME_FEE') and payment.tenantid='pb.fazilka' + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus = 'CANCELLED' and pd.businessservice in ('WS','SW','WS.ONE_TIME_FEE','SW.ONE_TIME_FEE') and payment.tenantid=$tenantid --and pt.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id --and pt_addr.propertyid=pt.id - ORDER BY pd.receiptdate DESC; - - - + orderby: ORDER BY pd.receiptdate DESC; From 86144c779fe01433f41380fc133aee4ab7ff2705 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 3 Mar 2025 11:40:12 +0530 Subject: [PATCH 1536/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 4149cdb3d..427a14a19 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3838,29 +3838,14 @@ ReportDefinitions: label: reports.pt.fromDate type: epoch source: pt - isMandatory: true + isMandatory: false 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,',','_') + searchClause: AND pd.receiptdate <= $toDate query: | -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( From 1d02166a285a174cf10fcfa44cb07ac9bdd9432b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 3 Mar 2025 12:50:50 +0530 Subject: [PATCH 1537/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 427a14a19..d696b07e5 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3708,7 +3708,7 @@ ReportDefinitions: decryptionPathId: CancelledReceiptRegister_V2 summary: Receipt Register for cancelled Receipts version: 1.0.0 - moduleName: rainmaker-pt + moduleName: rainmaker-ws additionalConfig: print: pdfPageSize: "A1" From 1703d54de3c2f58a486f327677fd19df4f5d8de4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 3 Mar 2025 15:22:05 +0530 Subject: [PATCH 1538/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 108 ++++++------------------- 1 file changed, 24 insertions(+), 84 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index d696b07e5..091b88f02 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3714,124 +3714,64 @@ ReportDefinitions: pdfPageSize: "A1" sourceColumns: - name: receiptnumber - label: reports.pt.receiptNo + label: reports.ws.receiptNo type: string - source: pt + source: ws total: false - name: receiptdate - label: reports.pt.receiptDate + label: reports.ws.receiptDate type: string - source: pt + source: ws total: false - name: g8issuedate - label: reports.pt.g8issuedate + label: reports.ws.g8issuedate type: string - source: pt + source: ws total: false - name: g8receiptno - label: reports.pt.g8receiptno + label: reports.ws.g8receiptno type: string - source: pt + source: ws 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 + label: reports.ws.amount type: string - source: pt + source: ws total: true - name: consumercode - label: reports.pt.propertyId + label: reports.ws.consumercode type: string - source: pt + source: ws total: false - name: instrumenttype - label: reports.pt.paymentMode + label: reports.ws.paymentMode type: string - source: pt + source: ws total: false - name: transactionnumber - label: reports.pt.ddChequeTransactionNo + label: reports.ws.ddChequeTransactionNo type: string - source: pt + source: ws total: false - name: transactiondate - label: reports.pt.ddChequeTransactionDate + label: reports.ws.ddChequeTransactionDate type: string - source: pt + source: ws total: false - name: bankname - label: reports.pt.bankName + label: reports.ws.bankName type: string - source: pt + source: ws total: false - name: collectorname - label: reports.pt.collectorname + label: reports.ws.collectorname type: string - source: pt + source: ws total: false - name: financialyear - label: reports.pt.financialyear - type: string - source: pt - total: false - - name: paymentstatus - label: reports.pt.paymentstatus + label: reports.ws.financialyear type: string - source: pt + source: ws total: false searchParams: - name: fromDate From a85baf4ccd3ed11bb04ddcad7f5697339278d2b8 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 3 Mar 2025 16:33:54 +0530 Subject: [PATCH 1539/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 091b88f02..bc833dca9 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3768,11 +3768,6 @@ ReportDefinitions: type: string source: ws total: false - - name: financialyear - label: reports.ws.financialyear - type: string - source: ws - total: false searchParams: - name: fromDate label: reports.pt.fromDate From 37ac395dd31e2f4181ec37d6e254e14bb660e7d4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 3 Mar 2025 17:01:38 +0530 Subject: [PATCH 1540/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index bc833dca9..a765c1e54 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3768,6 +3768,11 @@ ReportDefinitions: type: string source: ws total: false + - name: status + label: reports.ws.status + type: string + source: ws + total: false searchParams: - name: fromDate label: reports.pt.fromDate @@ -3815,7 +3820,8 @@ ReportDefinitions: --payment.ifsccode AS bankname, concat(bank_branches.bank_name,' ',bank_branches.branch) as bankname, receiptnumber, - payment.totalamountpaid as amount, + payment.totalamountpaid as amount, + payment.instrumentstatus as status, 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, From 963d7e683cb2261801552c51ba6e7a300cabbfc3 Mon Sep 17 00:00:00 2001 From: anujkit <46367271+anujkit@users.noreply.github.com> Date: Tue, 4 Mar 2025 15:31:04 +0530 Subject: [PATCH 1541/1630] Update sw-bill.json Update bill period issue --- configs/pdf-service/data-config/sw-bill.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/sw-bill.json b/configs/pdf-service/data-config/sw-bill.json index 3ce11c202..8b991a9a1 100644 --- a/configs/pdf-service/data-config/sw-bill.json +++ b/configs/pdf-service/data-config/sw-bill.json @@ -500,14 +500,14 @@ { "variable": "fromPeriod", "value": { - "path": "$.billDetails[?(@.amount > 0)].fromPeriod" + "path": "$.billDetails[0].fromPeriod" }, "type": "date" }, { "variable": "toPeriod", "value": { - "path": "$.billDetails[?(@.amount > 0)].toPeriod" + "path": "$.billDetails[0].toPeriod" }, "type": "date" }, From 157d550513a70765f5fbfa197428f20cfebe9f38 Mon Sep 17 00:00:00 2001 From: erlove000 <145665604+erlove000@users.noreply.github.com> Date: Tue, 4 Mar 2025 17:29:48 +0530 Subject: [PATCH 1542/1630] Changes for owner name wrong in bill --- 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 bac783382..e2ff3b940 100644 --- a/configs/egov-searcher/bill-genie.yml +++ b/configs/egov-searcher/bill-genie.yml @@ -129,7 +129,7 @@ SearchDefinitions: 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 ) + INNER JOIN eg_pt_owner ptown ON ptown.propertyid = pt.id $where and conn.status='Active' ) 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: @@ -214,7 +214,7 @@ SearchDefinitions: 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 ) + INNER JOIN eg_pt_owner ptown ON ptown.propertyid = pt.id $where and conn.status='Active' ) 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: From ae2da2a403c0085959aae3b77a7273327e9a13dc Mon Sep 17 00:00:00 2001 From: M125688 Date: Wed, 5 Mar 2025 17:36:33 +0530 Subject: [PATCH 1543/1630] Update pending.yml added the new pendency reports --- configs/reports/configs/pending.yml | 176 +++++++++++++++++++++++++++- 1 file changed, 173 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index 929fe78e5..ada041bd7 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -49,6 +49,7 @@ ReportDefinitions: WITH total_appl AS (SELECT pp.tenantid, CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' + WHEN pp.businessservice IN ('PT.MUTATION') THEN 'PT-Service' WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' @@ -56,16 +57,18 @@ ReportDefinitions: END as servicename, count(*) as total_appl FROM public.eg_wf_processinstance_v2 pp - WHERE pp.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.MUTATION','PT.CREATEWITHWNS') + WHERE pp.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') AND PP.ASSIGNEE IS NOT NULL GROUP BY pp.tenantid,CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' + WHEN pp.businessservice IN ('PT.MUTATION') THEN 'PT-Service' WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' END), pending_appl AS - (SELECT p.tenantid, CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' + (SELECT p.tenantid, CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' + WHEN p.businessservice IN ('PT.MUTATION') THEN 'PT-Service' WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' @@ -74,9 +77,10 @@ ReportDefinitions: FROM public.eg_wf_processinstance_v2 p JOIN public.eg_wf_businessservice_v2 b ON p.businessservice=b.businessservice WHERE (to_timestamp(p.lastmodifiedtime / 1000.0) - to_timestamp(p.createdtime / 1000.0)) > (b.businessservicesla / (1000 * 60 * 60 * 24)) * interval '1 day' - AND b.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.MUTATION','PT.CREATEWITHWNS') + AND b.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') AND P.ASSIGNEE IS NOT NULL GROUP BY p.tenantid,CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' + WHEN p.businessservice IN ('PT.MUTATION') THEN 'PT-Service' WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' @@ -85,3 +89,169 @@ ReportDefinitions: ROUND(CASE WHEN ta.total_appl > 0 THEN (COALESCE(pa.pending_appl, 0) * 100.0 / ta.total_appl) ELSE 0 END, 2) AS pendingapplpercentage FROM total_appl ta LEFT JOIN pending_appl pa ON ta.tenantid=pa.tenantid AND ta.servicename=pa.servicename WHERE ta.tenantid NOT IN ('pb','pb.testing') + + + - reportName: DepartmentReport + summary: Department Wise Pendency Report + version: 1.0.0 + moduleName: rainmaker-misc + sourceColumns: + - name: departmentid + label: departmentid + type: string + source: rainmaker-misc + total: false + - name: departmentname + label: departmentname + type: string + source: rainmaker-misc + total: false + - name: total_application + label: total_application + type: string + source: rainmaker-misc + total: false + - name: pending_application_out_of_sla + label: pending_application_out_of_sla + type: string + source: rainmaker-misc + total: false + query: | + WITH total_appl AS + (SELECT count(*) as total_appl + FROM public.eg_wf_processinstance_v2 pp + WHERE pp.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') + AND pp.ASSIGNEE IS NOT NULL + AND pp.tenantid NOT IN ('pb','pb.testing')), + pending_appl AS + (SELECT count(*) as pending_appl + FROM public.eg_wf_processinstance_v2 p + JOIN public.eg_wf_businessservice_v2 b ON p.businessservice=b.businessservice + WHERE (to_timestamp(p.lastmodifiedtime / 1000.0) - to_timestamp(p.createdtime / 1000.0)) > (b.businessservicesla / (1000 * 60 * 60 * 24)) * interval '1 day' + AND b.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') + AND P.ASSIGNEE IS NOT NULL + AND p.tenantid NOT IN ('pb','pb.testing')) + SELECT '1' as departmentid, 'Punjab Local Government' as departmentname,ta.total_appl as total_application,pa.pending_appl as pending_application_out_of_sla + FROM total_appl ta,pending_appl pa + + - reportName: TenantWisePendencyReport + summary: Tenant Wise Pendency Report + version: 1.0.0 + moduleName: rainmaker-misc + sourceColumns: + - name: tenantid + label: tenantid + type: string + source: rainmaker-misc + total: false + - name: total_application + label: total_application + type: string + source: rainmaker-misc + total: false + - name: pending_application_out_of_sla + label: pending_application_out_of_sla + type: string + source: rainmaker-misc + total: false + searchParams: + - name: tenantselected + label: tenantid + 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: rainmaker-misc + wrapper: true + isMandatory: false + searchClause: AND ta.tenantid =$tenantselected + query: | + WITH total_appl AS + (SELECT pp.tenantid,count(*) as total_appl + FROM public.eg_wf_processinstance_v2 pp + WHERE pp.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') + AND pp.ASSIGNEE IS NOT NULL + AND pp.tenantid NOT IN ('pb','pb.testing') + GROUP BY pp.tenantid), + pending_appl AS + (SELECT p.tenantid,count(*) as pending_appl + FROM public.eg_wf_processinstance_v2 p + JOIN public.eg_wf_businessservice_v2 b ON p.businessservice=b.businessservice + WHERE (to_timestamp(p.lastmodifiedtime / 1000.0) - to_timestamp(p.createdtime / 1000.0)) > (b.businessservicesla / (1000 * 60 * 60 * 24)) * interval '1 day' + AND b.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') + AND P.ASSIGNEE IS NOT NULL + AND p.tenantid NOT IN ('pb','pb.testing') + GROUP BY p.tenantid) + SELECT ta.tenantid as tenantid, + ta.total_appl as total_application,COALESCE(pa.pending_appl,0) as pending_application_out_of_sla + FROM total_appl ta LEFT JOIN pending_appl pa ON ta.tenantid=pa.tenantid WHERE 1=1 + + - reportName: ServiceWisePendencyReport + summary: Service Wise Pendency Report + version: 1.0.0 + moduleName: rainmaker-misc + sourceColumns: + - name: servicename + label: servicename + type: string + source: rainmaker-misc + total: false + - name: total_application + label: total_application + type: string + source: rainmaker-misc + total: false + - name: pending_application_out_of_sla + label: pending_application_out_of_sla + type: string + source: rainmaker-misc + total: false + searchParams: + - name: servicename + label: servicename + type: singlevaluelist + pattern: 'list://TL%:TL-Renewal,SW%:SW-Service,WS%:WS-Service,FN%:FireNoc,BS%:Bill Amendment' + source: rainmaker-misc + isMandatory: false + searchClause: AND ta.servicename =$servicename + query: | + WITH total_appl AS + (SELECT CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' + WHEN pp.businessservice IN ('PT.MUTATION') THEN 'PT-Service' + WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' + WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' + WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' + WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' + END as servicename, + count(*) as total_appl + FROM public.eg_wf_processinstance_v2 pp + WHERE pp.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') + AND PP.ASSIGNEE IS NOT NULL + AND pp.tenantid NOT IN ('pb','pb.testing') + GROUP BY CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' + WHEN pp.businessservice IN ('PT.MUTATION') THEN 'PT-Service' + WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' + WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' + WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' + WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' + END), + pending_appl AS + (SELECT CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' + WHEN p.businessservice IN ('PT.MUTATION') THEN 'PT-Service' + WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' + WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' + WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' + WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' END as servicename, + count(*) as pending_appl + FROM public.eg_wf_processinstance_v2 p + JOIN public.eg_wf_businessservice_v2 b ON p.businessservice=b.businessservice + WHERE (to_timestamp(p.lastmodifiedtime / 1000.0) - to_timestamp(p.createdtime / 1000.0)) > (b.businessservicesla / (1000 * 60 * 60 * 24)) * interval '1 day' + AND b.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') + AND P.ASSIGNEE IS NOT NULL + AND p.tenantid NOT IN ('pb','pb.testing') + GROUP BY CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' + WHEN p.businessservice IN ('PT.MUTATION') THEN 'PT-Service' + WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' + WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' + WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' + WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' END) + SELECT ta.servicename as servicename,ta.total_appl as total_application,COALESCE(pa.pending_appl,0) as pending_application_out_of_sla + FROM total_appl ta LEFT JOIN pending_appl pa ON ta.servicename=pa.servicename WHERE 1=1 From 212db811c48f13f709ecbc4cd704c2c29fd949f4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 6 Mar 2025 17:02:20 +0530 Subject: [PATCH 1544/1630] Update tl-reports.yml --- configs/reports/configs/tl-reports.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index b78d3a059..8ee9c440b 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -1326,14 +1326,6 @@ ReportDefinitions: 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, From 35aca8e362a05e9ba5726ed7726e9cb07a7c4feb Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 7 Mar 2025 09:28:24 +0530 Subject: [PATCH 1545/1630] Update tl-reports.yml --- configs/reports/configs/tl-reports.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 8ee9c440b..1985dc38f 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -1325,8 +1325,16 @@ ReportDefinitions: type: epoch source: tl isMandatory: false - searchClause: AND egcl_paymentdetail.receiptdate <= $toDate - query: | + 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: tl + 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, From 44978a72391b3dabaffbbe225eb21c0ccb9cbea5 Mon Sep 17 00:00:00 2001 From: M125688 Date: Fri, 7 Mar 2025 10:13:51 +0530 Subject: [PATCH 1546/1630] Update pending.yml upadted search parameter in service wise report --- configs/reports/configs/pending.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index ada041bd7..67fcbeafb 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -211,7 +211,7 @@ ReportDefinitions: pattern: 'list://TL%:TL-Renewal,SW%:SW-Service,WS%:WS-Service,FN%:FireNoc,BS%:Bill Amendment' source: rainmaker-misc isMandatory: false - searchClause: AND ta.servicename =$servicename + searchClause: AND TRIM(ta.servicename) =TRIM($servicename) query: | WITH total_appl AS (SELECT CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' From dc33c214388514966c7ce0288e25f11a9ae7df92 Mon Sep 17 00:00:00 2001 From: M125688 Date: Tue, 11 Mar 2025 17:11:17 +0530 Subject: [PATCH 1547/1630] Update pending.yml updated the search parameters for service name --- configs/reports/configs/pending.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index 67fcbeafb..81a1c9bd9 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -33,7 +33,7 @@ ReportDefinitions: - name: servicename label: servicename type: singlevaluelist - pattern: 'list://TL%:TL-Renewal,SW%:SW-Service,WS%:WS-Service,FN%:FireNoc,BS%:Bill Amendment' + pattern: 'list://TL:TL-Renewal,SW:SW-Service,WS:WS-Service,FN:FireNoc,BA:Bill Amendment' source: rainmaker-misc isMandatory: false searchClause: AND ta.servicename =$servicename @@ -208,7 +208,7 @@ ReportDefinitions: - name: servicename label: servicename type: singlevaluelist - pattern: 'list://TL%:TL-Renewal,SW%:SW-Service,WS%:WS-Service,FN%:FireNoc,BS%:Bill Amendment' + pattern: 'list://TL:TL-Renewal,SW:SW-Service,WS:WS-Service,FN:FireNoc,BA:Bill Amendment' source: rainmaker-misc isMandatory: false searchClause: AND TRIM(ta.servicename) =TRIM($servicename) From f8d44255a694eaf4c9843d7ca1a3626aadfb8b6e Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Thu, 13 Mar 2025 22:15:29 +0530 Subject: [PATCH 1548/1630] Update bill-genie.yml --- configs/egov-searcher/bill-genie.yml | 91 ++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/configs/egov-searcher/bill-genie.yml b/configs/egov-searcher/bill-genie.yml index e2ff3b940..a5d789c9d 100644 --- a/configs/egov-searcher/bill-genie.yml +++ b/configs/egov-searcher/bill-genie.yml @@ -336,3 +336,94 @@ SearchDefinitions: jsonFormat: {"ResponseInfo": {},"Bills": []} outJsonPath: $.Bills responseInfoPath: $.ResponseInfo + - name: groupbills + 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: conn.additionaldetails->>'group' + isMandatory: false + jsonPath: $.searchCriteria.group + - 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 + - name: b.status + isMandatory: false + jsonPath: $.searchCriteria.billActive + output: + jsonFormat: + ResponseInfo: {} + Bills: [] + outJsonPath: $.Bills + responseInfoPath: $.ResponseInfo From e1223e99098fe410b9abfef69f060b700e491249 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Mon, 17 Mar 2025 14:42:17 +0530 Subject: [PATCH 1549/1630] Update bill-genie.yml --- configs/egov-searcher/bill-genie.yml | 92 ++++++++++++++-------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/configs/egov-searcher/bill-genie.yml b/configs/egov-searcher/bill-genie.yml index a5d789c9d..21848293d 100644 --- a/configs/egov-searcher/bill-genie.yml +++ b/configs/egov-searcher/bill-genie.yml @@ -381,49 +381,49 @@ SearchDefinitions: 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: conn.additionaldetails->>'group' - isMandatory: false - jsonPath: $.searchCriteria.group - - 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 - - name: b.status - isMandatory: false - jsonPath: $.searchCriteria.billActive - output: - jsonFormat: - ResponseInfo: {} - Bills: [] - outJsonPath: $.Bills - responseInfoPath: $.ResponseInfo + 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: conn.additionaldetails->>'group' + isMandatory: false + jsonPath: $.searchCriteria.group + - 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 + - name: b.status + isMandatory: false + jsonPath: $.searchCriteria.billActive + output: + jsonFormat: + ResponseInfo: {} + Bills: [] + outJsonPath: $.Bills + responseInfoPath: $.ResponseInfo From 83fd4e7ac4852a3a936070861475b97bd332a359 Mon Sep 17 00:00:00 2001 From: M125688 Date: Mon, 24 Mar 2025 12:22:00 +0530 Subject: [PATCH 1550/1630] Update pending.yml --- configs/reports/configs/pending.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index 81a1c9bd9..d183656e4 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -58,7 +58,6 @@ ReportDefinitions: count(*) as total_appl FROM public.eg_wf_processinstance_v2 pp WHERE pp.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') - AND PP.ASSIGNEE IS NOT NULL GROUP BY pp.tenantid,CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' WHEN pp.businessservice IN ('PT.MUTATION') THEN 'PT-Service' WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' @@ -121,7 +120,6 @@ ReportDefinitions: (SELECT count(*) as total_appl FROM public.eg_wf_processinstance_v2 pp WHERE pp.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') - AND pp.ASSIGNEE IS NOT NULL AND pp.tenantid NOT IN ('pb','pb.testing')), pending_appl AS (SELECT count(*) as pending_appl @@ -168,7 +166,6 @@ ReportDefinitions: (SELECT pp.tenantid,count(*) as total_appl FROM public.eg_wf_processinstance_v2 pp WHERE pp.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') - AND pp.ASSIGNEE IS NOT NULL AND pp.tenantid NOT IN ('pb','pb.testing') GROUP BY pp.tenantid), pending_appl AS @@ -224,7 +221,6 @@ ReportDefinitions: count(*) as total_appl FROM public.eg_wf_processinstance_v2 pp WHERE pp.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') - AND PP.ASSIGNEE IS NOT NULL AND pp.tenantid NOT IN ('pb','pb.testing') GROUP BY CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' WHEN pp.businessservice IN ('PT.MUTATION') THEN 'PT-Service' @@ -254,4 +250,4 @@ ReportDefinitions: WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' END) SELECT ta.servicename as servicename,ta.total_appl as total_application,COALESCE(pa.pending_appl,0) as pending_application_out_of_sla - FROM total_appl ta LEFT JOIN pending_appl pa ON ta.servicename=pa.servicename WHERE 1=1 + FROM total_appl ta LEFT JOIN pending_appl pa ON ta.servicename=pa.servicename WHERE ta.servicename IS NOT NULL From f759a5eae355e5d7c943ffdd662d67f5fa927261 Mon Sep 17 00:00:00 2001 From: M125688 Date: Mon, 24 Mar 2025 13:06:06 +0530 Subject: [PATCH 1551/1630] Update pending.yml --- configs/reports/configs/pending.yml | 52 ++++++++++++++--------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index d183656e4..31aa1ec6f 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -33,7 +33,7 @@ ReportDefinitions: - name: servicename label: servicename type: singlevaluelist - pattern: 'list://TL:TL-Renewal,SW:SW-Service,WS:WS-Service,FN:FireNoc,BA:Bill Amendment' + pattern: 'list://TL:Issues and Renewal of TL,PT:Transfer of Property,SW:SW-Service,WS:WS-Service,FN:FireNoc,BA:WNS Bill Amendment' source: rainmaker-misc isMandatory: false searchClause: AND ta.servicename =$servicename @@ -48,42 +48,42 @@ ReportDefinitions: query: | WITH total_appl AS (SELECT pp.tenantid, - CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' - WHEN pp.businessservice IN ('PT.MUTATION') THEN 'PT-Service' + CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'Issues and Renewal of TL' + WHEN pp.businessservice IN ('PT.MUTATION') THEN 'Transfer of Property' WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' + WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'WNS Bill Amendment' END as servicename, count(*) as total_appl FROM public.eg_wf_processinstance_v2 pp WHERE pp.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') - GROUP BY pp.tenantid,CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' - WHEN pp.businessservice IN ('PT.MUTATION') THEN 'PT-Service' + GROUP BY pp.tenantid,CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'Issues and Renewal of TL' + WHEN pp.businessservice IN ('PT.MUTATION') THEN 'Transfer of Property' WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' + WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'WNS Bill Amendment' END), pending_appl AS - (SELECT p.tenantid, CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' - WHEN p.businessservice IN ('PT.MUTATION') THEN 'PT-Service' + (SELECT p.tenantid, CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'Issues and Renewal of TL' + WHEN p.businessservice IN ('PT.MUTATION') THEN 'Transfer of Property' WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' END as servicename, + WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'WNS Bill Amendment' END as servicename, count(*) as pending_appl FROM public.eg_wf_processinstance_v2 p JOIN public.eg_wf_businessservice_v2 b ON p.businessservice=b.businessservice WHERE (to_timestamp(p.lastmodifiedtime / 1000.0) - to_timestamp(p.createdtime / 1000.0)) > (b.businessservicesla / (1000 * 60 * 60 * 24)) * interval '1 day' AND b.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') AND P.ASSIGNEE IS NOT NULL - GROUP BY p.tenantid,CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' - WHEN p.businessservice IN ('PT.MUTATION') THEN 'PT-Service' + GROUP BY p.tenantid,CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'Issues and Renewal of TL' + WHEN p.businessservice IN ('PT.MUTATION') THEN 'Transfer of Property' WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' END) + WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'WNS Bill Amendment' END) SELECT ta.tenantid as tenantid,ta.servicename as servicename,ta.total_appl as total_application,COALESCE(pa.pending_appl,0) as pending_application_out_of_sla, ROUND(CASE WHEN ta.total_appl > 0 THEN (COALESCE(pa.pending_appl, 0) * 100.0 / ta.total_appl) ELSE 0 END, 2) AS pendingapplpercentage FROM total_appl ta @@ -205,37 +205,37 @@ ReportDefinitions: - name: servicename label: servicename type: singlevaluelist - pattern: 'list://TL:TL-Renewal,SW:SW-Service,WS:WS-Service,FN:FireNoc,BA:Bill Amendment' + pattern: 'list://TL:Issues and Renewal of TL,PT:Transfer of Property,SW:SW-Service,WS:WS-Service,FN:FireNoc,BA:WNS Bill Amendment' source: rainmaker-misc isMandatory: false searchClause: AND TRIM(ta.servicename) =TRIM($servicename) query: | WITH total_appl AS - (SELECT CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' - WHEN pp.businessservice IN ('PT.MUTATION') THEN 'PT-Service' + (SELECT CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'Issues and Renewal of TL' + WHEN pp.businessservice IN ('PT.MUTATION') THEN 'Transfer of Property' WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' + WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'WNS Bill Amendment' END as servicename, count(*) as total_appl FROM public.eg_wf_processinstance_v2 pp WHERE pp.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') AND pp.tenantid NOT IN ('pb','pb.testing') - GROUP BY CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' - WHEN pp.businessservice IN ('PT.MUTATION') THEN 'PT-Service' + GROUP BY CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'Issues and Renewal of TL' + WHEN pp.businessservice IN ('PT.MUTATION') THEN 'Transfer of Property' WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' + WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'WNS Bill Amendment' END), pending_appl AS - (SELECT CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' - WHEN p.businessservice IN ('PT.MUTATION') THEN 'PT-Service' + (SELECT CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'Issues and Renewal of TL' + WHEN p.businessservice IN ('PT.MUTATION') THEN 'Transfer of Property' WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' END as servicename, + WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'WNS Bill Amendment' END as servicename, count(*) as pending_appl FROM public.eg_wf_processinstance_v2 p JOIN public.eg_wf_businessservice_v2 b ON p.businessservice=b.businessservice @@ -243,11 +243,11 @@ ReportDefinitions: AND b.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') AND P.ASSIGNEE IS NOT NULL AND p.tenantid NOT IN ('pb','pb.testing') - GROUP BY CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' - WHEN p.businessservice IN ('PT.MUTATION') THEN 'PT-Service' + GROUP BY CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'Issues and Renewal of TL' + WHEN p.businessservice IN ('PT.MUTATION') THEN 'Transfer of Property' WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' END) + WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'WNS Bill Amendment' END) SELECT ta.servicename as servicename,ta.total_appl as total_application,COALESCE(pa.pending_appl,0) as pending_application_out_of_sla FROM total_appl ta LEFT JOIN pending_appl pa ON ta.servicename=pa.servicename WHERE ta.servicename IS NOT NULL From 0f05f315695654b3cfc2906475ac22f4c54dd0e4 Mon Sep 17 00:00:00 2001 From: anujkit <46367271+anujkit@users.noreply.github.com> Date: Tue, 25 Mar 2025 17:49:09 +0530 Subject: [PATCH 1552/1630] Update sw-bill.json --- configs/pdf-service/format-config/sw-bill.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/sw-bill.json b/configs/pdf-service/format-config/sw-bill.json index d56a70222..d0aafbff8 100644 --- a/configs/pdf-service/format-config/sw-bill.json +++ b/configs/pdf-service/format-config/sw-bill.json @@ -244,7 +244,7 @@ "style": "receipt-table-value2" }, { - "text": "Ledger Id", + "text": "Ledger Id / Group Id", "border": [ false, false, @@ -286,7 +286,7 @@ "style": "receipt-table2" }, { - "text":"{{ledgerId}}", + "text": "{{ledgerId}} {{groupId}}" "border": [ false, false, From ea438b0e4c08bc599a0dc99b6c39f3788e834123 Mon Sep 17 00:00:00 2001 From: anujkit <46367271+anujkit@users.noreply.github.com> Date: Tue, 25 Mar 2025 17:52:31 +0530 Subject: [PATCH 1553/1630] 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 3bebf3b97..fb1168f7e 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -244,7 +244,7 @@ "style": "receipt-table-value2" }, { - "text": "Ledger No", + "text": "Ledger No / Group ID", "border": [ false, false, @@ -286,7 +286,7 @@ "style": "receipt-table2" }, { - "text":"{{ledgerId}}", + "text": "{{ledgerId}} {{groupId}}", "border": [ false, false, From fbf0ccac04227fc6fcbe89b4d9e26ab6fc294bbe Mon Sep 17 00:00:00 2001 From: anujkit <46367271+anujkit@users.noreply.github.com> Date: Tue, 25 Mar 2025 17:57:06 +0530 Subject: [PATCH 1554/1630] Update ws-bill.json --- configs/pdf-service/data-config/ws-bill.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json index e108f2d4c..25f1babf5 100644 --- a/configs/pdf-service/data-config/ws-bill.json +++ b/configs/pdf-service/data-config/ws-bill.json @@ -476,7 +476,19 @@ { "variable": "ledgerId", "value": { - "path": "$.connection.additionalDetails.ledgerId" + "path": "$.connection.additionalDetails.value.ledgerId" + } + }, + { + "variable": "ledgerId", + "value": { + "path": "$.connection.additionalDetails.value.ledgerId" + } + }, + { + "variable": "groupId", + "value": { + "path": "$.connection.additionalDetails.value.groups" } }, { From 3c94c2e88cc442aca1ae49f1240f1666ff7e3a60 Mon Sep 17 00:00:00 2001 From: M125688 Date: Tue, 25 Mar 2025 18:12:08 +0530 Subject: [PATCH 1555/1630] Update pt-reports.yml updated USERNAME_PT --- configs/reports/configs/pt-reports.yml | 51 ++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 8134fa1dc..a80a01cad 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9665,7 +9665,22 @@ ReportDefinitions: label: reports.pt.mobileno type: string source: pt - total: false + total: false + - name: localitycode + label: reports.pt.localitycode + type: string + source: pt + total: false + - name: propertyusagetype + label: reports.pt.propertyusagetype + type: string + source: pt + total: false + - name: createdtime + label: reports.pt.createdtime + type: string + source: pt + total: false searchParams: - name: ulb label: ULB @@ -9674,7 +9689,35 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND rp.tenantid = $ulb + searchClause: AND rp.tenantid = $ulb + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + wrapper: true + isMandatory: false + searchClause: AND rp.localitycode IN ($localityArray) + - name: usageType + label: usageType + type: singlevaluelist + pattern: 'list://RESIDENTIAL:Residential,NONRESIDENTIAL:NonResidential,MIXED:Mixed' + source: pt + isMandatory: false + searchClause: AND split_part(rp.propertyusagetype,'.',1) = $usageType + - name: fromDate + label: reports.pt.fromDate + type: singlevaluelist + type: epoch + source: pt + isMandatory: false + searchClause: AND rp.createdtime >= $fromDate + - name: toDate + label: reports.pt.toDate + type: singlevaluelist + type: epoch + source: pt + isMandatory: false + searchClause: AND rp.createdtime <= $toDate query: | -- Use CTE to force query plan, compute & use CTE later SELECT @@ -9683,7 +9726,9 @@ ReportDefinitions: ownername as ownername, guardianname as guardianname, mobilenumber as mobileno, - rp.propertyusagetype + rp.localitycode as localitycode, + rp.propertyusagetype as propertyusagetype, + rp.createdtime as createdtime from report_owners ro inner join report_properties rp on (ro.propertyid=rp.propertyid and propertystatus='ACTIVE') where 1=1 From f2c6a4e78c2da8b8831aa267ee3fe16884256e62 Mon Sep 17 00:00:00 2001 From: M125688 Date: Wed, 26 Mar 2025 12:27:26 +0530 Subject: [PATCH 1556/1630] Update bill-genie.yml updated operator from ILIKE to = --- configs/egov-searcher/bill-genie.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/configs/egov-searcher/bill-genie.yml b/configs/egov-searcher/bill-genie.yml index 21848293d..9d765d01a 100644 --- a/configs/egov-searcher/bill-genie.yml +++ b/configs/egov-searcher/bill-genie.yml @@ -55,7 +55,7 @@ SearchDefinitions: - name: bd.consumercode isMandatory: false jsonPath: $.searchCriteria.consumerCode - operator: ILIKE + operator: = - name: bd.businessservice isMandatory: false jsonPath: $.searchCriteria.businesService @@ -64,7 +64,7 @@ SearchDefinitions: jsonPath: $.searchCriteria.mobileNumber - name: bd.billno isMandatory: false - operator: ILIKE + operator: = jsonPath: $.searchCriteria.billNo - name: ptadd.locality isMandatory: false @@ -141,7 +141,7 @@ SearchDefinitions: - name: bd.consumercode isMandatory: false jsonPath: $.searchCriteria.consumerCode - operator: ILIKE + operator: = - name: bd.businessservice isMandatory: false jsonPath: $.searchCriteria.businesService @@ -150,7 +150,7 @@ SearchDefinitions: jsonPath: $.searchCriteria.mobileNumber - name: bd.billno isMandatory: false - operator: ILIKE + operator: = jsonPath: $.searchCriteria.billNo - name: ptadd.locality isMandatory: false @@ -226,7 +226,7 @@ SearchDefinitions: - name: bd.consumercode isMandatory: false jsonPath: $.searchCriteria.consumerCode - operator: ILIKE + operator: = - name: bd.businessservice isMandatory: false jsonPath: $.searchCriteria.businesService @@ -235,7 +235,7 @@ SearchDefinitions: jsonPath: $.searchCriteria.mobileNumber - name: bd.billno isMandatory: false - operator: ILIKE + operator: = jsonPath: $.searchCriteria.billNo - name: ptadd.locality isMandatory: false @@ -306,7 +306,7 @@ SearchDefinitions: - name: bd.consumercode isMandatory: false jsonPath: $.searchCriteria.consumerCode - operator: ILIKE + operator: = - name: bd.businessservice isMandatory: false jsonPath: $.searchCriteria.businesService @@ -315,7 +315,7 @@ SearchDefinitions: jsonPath: $.searchCriteria.mobileNumber - name: bd.billno isMandatory: false - operator: ILIKE + operator: = jsonPath: $.searchCriteria.billNo - name: ptadd.locality isMandatory: false @@ -390,7 +390,7 @@ SearchDefinitions: - name: bd.consumercode isMandatory: false jsonPath: $.searchCriteria.consumerCode - operator: ILIKE + operator: = - name: bd.businessservice isMandatory: false jsonPath: $.searchCriteria.businesService @@ -399,7 +399,7 @@ SearchDefinitions: jsonPath: $.searchCriteria.mobileNumber - name: bd.billno isMandatory: false - operator: ILIKE + operator: = jsonPath: $.searchCriteria.billNo - name: conn.additionaldetails->>'group' isMandatory: false From 063715256c334b4eb5a08eb232438cba5b5cc682 Mon Sep 17 00:00:00 2001 From: anujkit <46367271+anujkit@users.noreply.github.com> Date: Wed, 26 Mar 2025 12:35:51 +0530 Subject: [PATCH 1557/1630] Update sw-bill.json --- configs/pdf-service/format-config/sw-bill.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/sw-bill.json b/configs/pdf-service/format-config/sw-bill.json index d0aafbff8..8c768092b 100644 --- a/configs/pdf-service/format-config/sw-bill.json +++ b/configs/pdf-service/format-config/sw-bill.json @@ -286,7 +286,7 @@ "style": "receipt-table2" }, { - "text": "{{ledgerId}} {{groupId}}" + "text": "{{ledgerId}} {{groupId}}", "border": [ false, false, From 296ef9c33c36afb30734d7acd3711c18199dfbc6 Mon Sep 17 00:00:00 2001 From: anujkit <46367271+anujkit@users.noreply.github.com> Date: Wed, 26 Mar 2025 17:13:55 +0530 Subject: [PATCH 1558/1630] Update ws-bill.json --- 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 fb1168f7e..1954b43c6 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -769,7 +769,7 @@ ], [ { - "text": "4. 10% surcharge charges will be applied after due date will reflect in next bill", + "text": "4. surcharge charges will be applied after due date will reflect in next bill", "border": [ true, false, From 3cd0f3a6c321a6c0419ed5422a65a1b1fe7033d4 Mon Sep 17 00:00:00 2001 From: anujkit <46367271+anujkit@users.noreply.github.com> Date: Wed, 26 Mar 2025 17:14:50 +0530 Subject: [PATCH 1559/1630] Update sw-bill.json --- configs/pdf-service/format-config/sw-bill.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/sw-bill.json b/configs/pdf-service/format-config/sw-bill.json index 8c768092b..8c8f17856 100644 --- a/configs/pdf-service/format-config/sw-bill.json +++ b/configs/pdf-service/format-config/sw-bill.json @@ -785,7 +785,7 @@ ], [ { - "text": "5. {{rate}}% Late payment charges will be applied after due date", + "text": "5. Late payment charges will be applied after due date", "border": [ true, false, From 84b7344b5f3b9bf67059860641f785b84a24aa38 Mon Sep 17 00:00:00 2001 From: anujkit <46367271+anujkit@users.noreply.github.com> Date: Wed, 26 Mar 2025 17:16:50 +0530 Subject: [PATCH 1560/1630] Update sw-bill.json --- configs/pdf-service/data-config/sw-bill.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/sw-bill.json b/configs/pdf-service/data-config/sw-bill.json index 8b991a9a1..37f9411c3 100644 --- a/configs/pdf-service/data-config/sw-bill.json +++ b/configs/pdf-service/data-config/sw-bill.json @@ -470,9 +470,15 @@ { "variable": "ledgerId", "value": { - "path": "$.connection.additionalDetails.ledgerId" + "path": "$.connection.additionalDetails.value.ledgerId" } }, + { + "variable": "groupId", + "value": { + "path": "$.connection.additionalDetails.value.groups" + } + }, { "variable": "payerAddress", "value": { From 56adc8de5d4dba941ea1a64476ff8cc5062bf8e2 Mon Sep 17 00:00:00 2001 From: M125688 Date: Thu, 27 Mar 2025 18:04:40 +0530 Subject: [PATCH 1561/1630] Update pt-reports.yml updated DEFAULTER_REPORT_WITH_LOCALITY_UNPAID_DEMAND_NEW --- configs/reports/configs/pt-reports.yml | 74 ++++++++++++++------------ 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index a80a01cad..b96c87da9 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9429,41 +9429,45 @@ ReportDefinitions: 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 + WITH owners AS ( + SELECT propertyid, + SPLIT_PART(STRING_AGG(ownername, ','), ',', 1) AS ownername, + SPLIT_PART(STRING_AGG(mobilenumber, ','), ',', 1) AS mobilenumber + FROM report_owners + WHERE tenantid = $tenantid + AND status = 'ACTIVE' + GROUP BY propertyid ), + units AS ( + SELECT + propertyid, + STRING_AGG(usagecategory, ',') AS unitusage + FROM report_units + 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, + COALESCE(o.ownername, 'N/A') AS ownername, + COALESCE(o.mobilenumber, 'N/A') AS mobileno + FROM report_unpaid_demand d + LEFT JOIN report_properties pt ON pt.propertyid = d.propertyid + AND pt.propertystatus != 'INACTIVE' + LEFT JOIN units u ON u.propertyid = d.propertyid + LEFT JOIN owners o ON o.propertyid = d.propertyid + WHERE d.tenantid = $tenantid + AND d.demand > 0 - reportName: STATEDEFAULTER_REPORT_WITH_LOCALITY_UNPAID_DEMAND_NEW From 1f3225e91dccc9d2c4d928f715a32e140e281a18 Mon Sep 17 00:00:00 2001 From: palamgarg Date: Sun, 30 Mar 2025 15:30:11 +0530 Subject: [PATCH 1562/1630] Added --- .../egov-persister/swach-v2-persist-batch.yml | 182 ++++++++++++++++++ 1 file changed, 182 insertions(+) create mode 100644 configs/egov-persister/swach-v2-persist-batch.yml diff --git a/configs/egov-persister/swach-v2-persist-batch.yml b/configs/egov-persister/swach-v2-persist-batch.yml new file mode 100644 index 000000000..1a66bcf79 --- /dev/null +++ b/configs/egov-persister/swach-v2-persist-batch.yml @@ -0,0 +1,182 @@ +serviceMaps: + serviceName: pgr-services + mappings: + - version: 1.0 + description: Persists pgr service request in tables + fromTopic: save-pgr-request-batch + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_swach_service_v2(id, tenantid, servicecode, servicerequestid, description, accountid, additionaldetails, applicationstatus, rating, source, createdby, createdtime, lastmodifiedby, lastmodifiedtime, active) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: service + jsonMaps: + - jsonPath: $.service.id + + - jsonPath: $.service.tenantId + + - jsonPath: $.service.serviceCode + + - jsonPath: $.service.serviceRequestId + + - jsonPath: $.service.description + + - jsonPath: $.service.accountId + + - jsonPath: $.service.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.service.applicationStatus + + - jsonPath: $.service.rating + + - jsonPath: $.service.source + + - jsonPath: $.service.auditDetails.createdBy + + - jsonPath: $.service.auditDetails.createdTime + + - jsonPath: $.service.auditDetails.lastModifiedBy + + - jsonPath: $.service.auditDetails.lastModifiedTime + + - jsonPath: $.service.active + + - query: INSERT INTO eg_swach_address_v2(id, tenantid, parentid, doorno, plotno, buildingname, street, landmark, city, pincode, locality, district, region, state, country, latitude, longitude, additionaldetails, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: service.address + jsonMaps: + - jsonPath: $.service.address.id + + - jsonPath: $.service.address.tenantId + + - jsonPath: $.service.id + + - jsonPath: $.service.address.doorNo + + - jsonPath: $.service.address.plotNo + + - jsonPath: $.service.address.buildingName + + - jsonPath: $.service.address.street + + - jsonPath: $.service.address.landmark + + - jsonPath: $.service.address.city + + - jsonPath: $.service.address.pincode + + - jsonPath: $.service.address.locality.code + + - jsonPath: $.service.address.district + + - jsonPath: $.service.address.region + + - jsonPath: $.service.address.state + + - jsonPath: $.service.address.country + + - jsonPath: $.service.address.geoLocation.latitude + + - jsonPath: $.service.address.geoLocation.longitude + + - jsonPath: $.service.address.additionDetails + type: JSON + dbType: JSONB + + - jsonPath: $.service.auditDetails.createdBy + + - jsonPath: $.service.auditDetails.createdTime + + - jsonPath: $.service.auditDetails.lastModifiedBy + + - jsonPath: $.service.auditDetails.lastModifiedTime + + - version: 1.0 + description: Persists workflow processInstanceFromRequest details in eg_workflow_v2 table + fromTopic: save-wf-transitions-batch + 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 + + + From c8ce127e978f5281fbda249663190c73497d3814 Mon Sep 17 00:00:00 2001 From: M125688 Date: Tue, 1 Apr 2025 18:07:23 +0530 Subject: [PATCH 1563/1630] Update and rename pending.yml to pending.yml upadted the pending reports --- configs/reports/configs/pending.yml | 253 -------------- .../pending.yml upadted the pending reports | 316 ++++++++++++++++++ 2 files changed, 316 insertions(+), 253 deletions(-) delete mode 100644 configs/reports/configs/pending.yml create mode 100644 configs/reports/configs/pending.yml upadted the pending reports diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml deleted file mode 100644 index 31aa1ec6f..000000000 --- a/configs/reports/configs/pending.yml +++ /dev/null @@ -1,253 +0,0 @@ -ReportDefinitions: - - reportName: PendencyReportMiscellaneous - summary: Pendency Report Miscellaneous - version: 1.0.0 - moduleName: rainmaker-misc - sourceColumns: - - name: tenantid - label: tenantid - type: string - source: rainmaker-misc - total: false - - name: servicename - label: servicename - type: string - source: rainmaker-misc - total: false - - name: total_application - label: total_application - type: string - source: rainmaker-misc - total: false - - name: pending_application_out_of_sla - label: pending_application_out_of_sla - type: string - source: rainmaker-misc - total: false - - name: pendingapplpercentage - label: pendingapplpercentage - type: string - source: rainmaker-misc - total: false - searchParams: - - name: servicename - label: servicename - type: singlevaluelist - pattern: 'list://TL:Issues and Renewal of TL,PT:Transfer of Property,SW:SW-Service,WS:WS-Service,FN:FireNoc,BA:WNS Bill Amendment' - source: rainmaker-misc - isMandatory: false - searchClause: AND ta.servicename =$servicename - - name: tenantselected - label: tenantid - 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: rainmaker-misc - wrapper: true - isMandatory: false - searchClause: AND ta.tenantid =$tenantselected - query: | - WITH total_appl AS - (SELECT pp.tenantid, - CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'Issues and Renewal of TL' - WHEN pp.businessservice IN ('PT.MUTATION') THEN 'Transfer of Property' - WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' - WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' - WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'WNS Bill Amendment' - END as servicename, - count(*) as total_appl - FROM public.eg_wf_processinstance_v2 pp - WHERE pp.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') - GROUP BY pp.tenantid,CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'Issues and Renewal of TL' - WHEN pp.businessservice IN ('PT.MUTATION') THEN 'Transfer of Property' - WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' - WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' - WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'WNS Bill Amendment' - END), - pending_appl AS - (SELECT p.tenantid, CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'Issues and Renewal of TL' - WHEN p.businessservice IN ('PT.MUTATION') THEN 'Transfer of Property' - WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' - WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' - WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'WNS Bill Amendment' END as servicename, - count(*) as pending_appl - FROM public.eg_wf_processinstance_v2 p - JOIN public.eg_wf_businessservice_v2 b ON p.businessservice=b.businessservice - WHERE (to_timestamp(p.lastmodifiedtime / 1000.0) - to_timestamp(p.createdtime / 1000.0)) > (b.businessservicesla / (1000 * 60 * 60 * 24)) * interval '1 day' - AND b.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') - AND P.ASSIGNEE IS NOT NULL - GROUP BY p.tenantid,CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'Issues and Renewal of TL' - WHEN p.businessservice IN ('PT.MUTATION') THEN 'Transfer of Property' - WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' - WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' - WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'WNS Bill Amendment' END) - SELECT ta.tenantid as tenantid,ta.servicename as servicename,ta.total_appl as total_application,COALESCE(pa.pending_appl,0) as pending_application_out_of_sla, - ROUND(CASE WHEN ta.total_appl > 0 THEN (COALESCE(pa.pending_appl, 0) * 100.0 / ta.total_appl) ELSE 0 END, 2) AS pendingapplpercentage - FROM total_appl ta - LEFT JOIN pending_appl pa ON ta.tenantid=pa.tenantid AND ta.servicename=pa.servicename WHERE ta.tenantid NOT IN ('pb','pb.testing') - - - - reportName: DepartmentReport - summary: Department Wise Pendency Report - version: 1.0.0 - moduleName: rainmaker-misc - sourceColumns: - - name: departmentid - label: departmentid - type: string - source: rainmaker-misc - total: false - - name: departmentname - label: departmentname - type: string - source: rainmaker-misc - total: false - - name: total_application - label: total_application - type: string - source: rainmaker-misc - total: false - - name: pending_application_out_of_sla - label: pending_application_out_of_sla - type: string - source: rainmaker-misc - total: false - query: | - WITH total_appl AS - (SELECT count(*) as total_appl - FROM public.eg_wf_processinstance_v2 pp - WHERE pp.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') - AND pp.tenantid NOT IN ('pb','pb.testing')), - pending_appl AS - (SELECT count(*) as pending_appl - FROM public.eg_wf_processinstance_v2 p - JOIN public.eg_wf_businessservice_v2 b ON p.businessservice=b.businessservice - WHERE (to_timestamp(p.lastmodifiedtime / 1000.0) - to_timestamp(p.createdtime / 1000.0)) > (b.businessservicesla / (1000 * 60 * 60 * 24)) * interval '1 day' - AND b.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') - AND P.ASSIGNEE IS NOT NULL - AND p.tenantid NOT IN ('pb','pb.testing')) - SELECT '1' as departmentid, 'Punjab Local Government' as departmentname,ta.total_appl as total_application,pa.pending_appl as pending_application_out_of_sla - FROM total_appl ta,pending_appl pa - - - reportName: TenantWisePendencyReport - summary: Tenant Wise Pendency Report - version: 1.0.0 - moduleName: rainmaker-misc - sourceColumns: - - name: tenantid - label: tenantid - type: string - source: rainmaker-misc - total: false - - name: total_application - label: total_application - type: string - source: rainmaker-misc - total: false - - name: pending_application_out_of_sla - label: pending_application_out_of_sla - type: string - source: rainmaker-misc - total: false - searchParams: - - name: tenantselected - label: tenantid - 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: rainmaker-misc - wrapper: true - isMandatory: false - searchClause: AND ta.tenantid =$tenantselected - query: | - WITH total_appl AS - (SELECT pp.tenantid,count(*) as total_appl - FROM public.eg_wf_processinstance_v2 pp - WHERE pp.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') - AND pp.tenantid NOT IN ('pb','pb.testing') - GROUP BY pp.tenantid), - pending_appl AS - (SELECT p.tenantid,count(*) as pending_appl - FROM public.eg_wf_processinstance_v2 p - JOIN public.eg_wf_businessservice_v2 b ON p.businessservice=b.businessservice - WHERE (to_timestamp(p.lastmodifiedtime / 1000.0) - to_timestamp(p.createdtime / 1000.0)) > (b.businessservicesla / (1000 * 60 * 60 * 24)) * interval '1 day' - AND b.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') - AND P.ASSIGNEE IS NOT NULL - AND p.tenantid NOT IN ('pb','pb.testing') - GROUP BY p.tenantid) - SELECT ta.tenantid as tenantid, - ta.total_appl as total_application,COALESCE(pa.pending_appl,0) as pending_application_out_of_sla - FROM total_appl ta LEFT JOIN pending_appl pa ON ta.tenantid=pa.tenantid WHERE 1=1 - - - reportName: ServiceWisePendencyReport - summary: Service Wise Pendency Report - version: 1.0.0 - moduleName: rainmaker-misc - sourceColumns: - - name: servicename - label: servicename - type: string - source: rainmaker-misc - total: false - - name: total_application - label: total_application - type: string - source: rainmaker-misc - total: false - - name: pending_application_out_of_sla - label: pending_application_out_of_sla - type: string - source: rainmaker-misc - total: false - searchParams: - - name: servicename - label: servicename - type: singlevaluelist - pattern: 'list://TL:Issues and Renewal of TL,PT:Transfer of Property,SW:SW-Service,WS:WS-Service,FN:FireNoc,BA:WNS Bill Amendment' - source: rainmaker-misc - isMandatory: false - searchClause: AND TRIM(ta.servicename) =TRIM($servicename) - query: | - WITH total_appl AS - (SELECT CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'Issues and Renewal of TL' - WHEN pp.businessservice IN ('PT.MUTATION') THEN 'Transfer of Property' - WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' - WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' - WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'WNS Bill Amendment' - END as servicename, - count(*) as total_appl - FROM public.eg_wf_processinstance_v2 pp - WHERE pp.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') - AND pp.tenantid NOT IN ('pb','pb.testing') - GROUP BY CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'Issues and Renewal of TL' - WHEN pp.businessservice IN ('PT.MUTATION') THEN 'Transfer of Property' - WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' - WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' - WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'WNS Bill Amendment' - END), - pending_appl AS - (SELECT CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'Issues and Renewal of TL' - WHEN p.businessservice IN ('PT.MUTATION') THEN 'Transfer of Property' - WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' - WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' - WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'WNS Bill Amendment' END as servicename, - count(*) as pending_appl - FROM public.eg_wf_processinstance_v2 p - JOIN public.eg_wf_businessservice_v2 b ON p.businessservice=b.businessservice - WHERE (to_timestamp(p.lastmodifiedtime / 1000.0) - to_timestamp(p.createdtime / 1000.0)) > (b.businessservicesla / (1000 * 60 * 60 * 24)) * interval '1 day' - AND b.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') - AND P.ASSIGNEE IS NOT NULL - AND p.tenantid NOT IN ('pb','pb.testing') - GROUP BY CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'Issues and Renewal of TL' - WHEN p.businessservice IN ('PT.MUTATION') THEN 'Transfer of Property' - WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' - WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' - WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'WNS Bill Amendment' END) - SELECT ta.servicename as servicename,ta.total_appl as total_application,COALESCE(pa.pending_appl,0) as pending_application_out_of_sla - FROM total_appl ta LEFT JOIN pending_appl pa ON ta.servicename=pa.servicename WHERE ta.servicename IS NOT NULL diff --git a/configs/reports/configs/pending.yml upadted the pending reports b/configs/reports/configs/pending.yml upadted the pending reports new file mode 100644 index 000000000..0adfe0fb6 --- /dev/null +++ b/configs/reports/configs/pending.yml upadted the pending reports @@ -0,0 +1,316 @@ +ReportDefinitions: + - reportName: PendencyReportMiscellaneous + summary: Pendency Report Miscellaneous + version: 1.0.0 + moduleName: rainmaker-misc + sourceColumns: + - name: tenantid + label: tenantid + type: string + source: rainmaker-misc + total: false + - name: servicename + label: servicename + type: string + source: rainmaker-misc + total: false + - name: total_application + label: total_application + type: string + source: rainmaker-misc + total: false + - name: pending_application_out_of_sla + label: pending_application_out_of_sla + type: string + source: rainmaker-misc + total: false + - name: pendingapplpercentage + label: pendingapplpercentage + type: string + source: rainmaker-misc + total: false + searchParams: + - name: serviceselected + label: serviceselected + type: singlevaluelist + pattern: 'list://TL%:TL-Renewal,SW%:SW-Service,WS%:WS-Service,FN%:FireNoc,BS%:Bill Amendment' + source: rainmaker-misc + isMandatory: false + searchClause: AND ta.servicename =$serviceselected + - name: tenantselected + label: tenantid + 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: rainmaker-misc + wrapper: true + isMandatory: false + searchClause: AND ta.tenantid =$tenantselected + query: | + WITH total_appl AS + (SELECT pp.tenantid, + CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' + WHEN pp.businessservice IN ('PT.MUTATION') THEN 'PT-Service' + WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' + WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' + WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' + WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' + END as servicename, + count(*) as total_appl + FROM public.eg_wf_processinstance_v2 pp + WHERE pp.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') + AND PP.ASSIGNEE IS NOT NULL + GROUP BY pp.tenantid,CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' + WHEN pp.businessservice IN ('PT.MUTATION') THEN 'PT-Service' + WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' + WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' + WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' + WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' + END), + pending_appl AS + (SELECT p.tenantid, CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' + WHEN p.businessservice IN ('PT.MUTATION') THEN 'PT-Service' + WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' + WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' + WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' + WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' END as servicename, + count(*) as pending_appl + FROM public.eg_wf_processinstance_v2 p + JOIN public.eg_wf_businessservice_v2 b ON p.businessservice=b.businessservice + WHERE (to_timestamp(p.lastmodifiedtime / 1000.0) - to_timestamp(p.createdtime / 1000.0)) > (b.businessservicesla / (1000 * 60 * 60 * 24)) * interval '1 day' + AND b.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') + AND P.ASSIGNEE IS NOT NULL + GROUP BY p.tenantid,CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' + WHEN p.businessservice IN ('PT.MUTATION') THEN 'PT-Service' + WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' + WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' + WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' + WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' END) + SELECT ta.tenantid as tenantid,ta.servicename as servicename,ta.total_appl as total_application,COALESCE(pa.pending_appl,0) as pending_application_out_of_sla, + ROUND(CASE WHEN ta.total_appl > 0 THEN (COALESCE(pa.pending_appl, 0) * 100.0 / ta.total_appl) ELSE 0 END, 2) AS pendingapplpercentage + FROM total_appl ta + LEFT JOIN pending_appl pa ON ta.tenantid=pa.tenantid AND ta.servicename=pa.servicename WHERE ta.tenantid NOT IN ('pb','pb.testing') + + + - reportName: department + summary: Department Wise Pendency Report + version: 1.0.0 + moduleName: department + sourceColumns: + - name: departmentID + label: departmentID + type: string + source: rainmaker-misc + total: false + - name: departmentName + label: departmentName + type: string + source: rainmaker-misc + total: false + - name: TotalApplicationReceived + label: TotalApplicationReceived + type: string + source: rainmaker-misc + total: false + - name: PendingBeyondTimelineApplicationCount + label: PendingBeyondTimelineApplicationCount + type: string + source: rainmaker-misc + total: false + query: | + WITH total_appl AS + (SELECT count(*) as total_appl + FROM public.eg_wf_processinstance_v2 pp + WHERE pp.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') + AND pp.ASSIGNEE IS NOT NULL + AND pp.tenantid NOT IN ('pb','pb.testing')), + pending_appl AS + (SELECT count(*) as pending_appl + FROM public.eg_wf_processinstance_v2 p + JOIN public.eg_wf_businessservice_v2 b ON p.businessservice=b.businessservice + WHERE (to_timestamp(p.lastmodifiedtime / 1000.0) - to_timestamp(p.createdtime / 1000.0)) > (b.businessservicesla / (1000 * 60 * 60 * 24)) * interval '1 day' + AND b.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') + AND P.ASSIGNEE IS NOT NULL + AND p.tenantid NOT IN ('pb','pb.testing')) + SELECT 'pb.punjab' as departmentID, 'Punjab Local Government' as departmentName,ta.total_appl as TotalApplicationReceived,pa.pending_appl as PendingBeyondTimelineApplicationCount + FROM total_appl ta,pending_appl pa + + - reportName: authority + summary: Tenant Wise Pendency Report + version: 1.0.0 + moduleName: authority + sourceColumns: + - name: authorityID + label: authorityID + type: string + source: rainmaker-misc + total: false + - name: authorityName + label: authorityName + type: string + source: rainmaker-misc + total: false + - name: departmentID + label: departmentID + type: string + source: rainmaker-misc + total: false + - name: TotalApplicationReceived + label: TotalApplicationReceived + type: string + source: rainmaker-misc + total: false + - name: PendingBeyondTimelineApplicationCount + label: PendingBeyondTimelineApplicationCount + type: string + source: rainmaker-misc + total: false + searchParams: + - name: tenantId + label: tenantid + type: singlevaluelist + pattern: http://localhost:8094/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: rainmaker-misc + wrapper: true + isMandatory: false + searchClause: AND ta.tenantid =$tenantid + query: | + WITH total_appl AS + (SELECT pp.tenantid,count(*) as total_appl + FROM public.eg_wf_processinstance_v2 pp + WHERE pp.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') + AND pp.ASSIGNEE IS NOT NULL + AND pp.tenantid NOT IN ('pb','pb.testing') + GROUP BY pp.tenantid), + pending_appl AS + (SELECT p.tenantid,count(*) as pending_appl + FROM public.eg_wf_processinstance_v2 p + JOIN public.eg_wf_businessservice_v2 b ON p.businessservice=b.businessservice + WHERE (to_timestamp(p.lastmodifiedtime / 1000.0) - to_timestamp(p.createdtime / 1000.0)) > (b.businessservicesla / (1000 * 60 * 60 * 24)) * interval '1 day' + AND b.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') + AND P.ASSIGNEE IS NOT NULL + AND p.tenantid NOT IN ('pb','pb.testing') + GROUP BY p.tenantid) + SELECT ta.tenantid as authorityID, + UPPER(SUBSTR(REPLACE(ta.tenantid, 'pb.', ''), 1, 1)) || LOWER(SUBSTR(REPLACE(ta.tenantid, 'pb.', ''), 2)) AS authorityName, + '1' as departmentID, ta.total_appl as TotalApplicationReceived,COALESCE(pa.pending_appl,0) as PendingBeyondTimelineApplicationCount + FROM total_appl ta LEFT JOIN pending_appl pa ON ta.tenantid=pa.tenantid WHERE 1=1 + + - reportName: service + summary: Service Wise Pendency Report + version: 1.0.0 + moduleName: service + sourceColumns: + - name: serviceID + label: serviceID + type: string + source: rainmaker-misc + total: false + - name: serviceName + label: serviceName + type: string + source: rainmaker-misc + total: false + - name: authorityID + label: authorityID + type: string + source: rainmaker-misc + total: false + - name: departmentID + label: departmentID + type: string + source: rainmaker-misc + total: false + - name: TotalApplicationReceived + label: TotalApplicationReceived + type: string + source: rainmaker-misc + total: false + - name: PendingBeyondTimelineApplicationCount + label: PendingBeyondTimelineApplicationCount + type: string + source: rainmaker-misc + total: false + searchParams: + - name: serviceID + label: servicename + type: singlevaluelist + pattern: 'list://TL%:TL-Renewal,SW%:SW-Service,WS%:WS-Service,FN%:FireNoc,BS%:Bill Amendment' + source: rainmaker-misc + isMandatory: false + searchClause: AND ta.servicename =$serviceID + - name: tenantId + label: tenantid + type: singlevaluelist + pattern: http://localhost:8094/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: rainmaker-misc + wrapper: true + isMandatory: false + searchClause: AND ta.tenantid =$tenantid + query: | + WITH total_appl AS ( + SELECT + CASE + WHEN pp.businessservice IN ('NEWTL.HAZ', 'DIRECTRENEWAL', 'EDITRENEWAL', 'NewTL') THEN 'TL-Renewal' + WHEN pp.businessservice IN ('PT.MUTATION') THEN 'PT-Service' + WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' + WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' + WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' + WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' + END AS servicename, + pp.tenantid, -- Added tenantid + COUNT(*) AS total_appl + FROM public.eg_wf_processinstance_v2 pp + WHERE pp.businessservice NOT IN ('ModifyWSConnection', 'ModifySWConnection', 'PT.CREATE', 'PT.UPDATE', 'PT.CREATEWITHWNS') + AND pp.assignee IS NOT NULL + AND pp.tenantid NOT IN ('pb', 'pb.testing') + GROUP BY pp.tenantid, + CASE + WHEN pp.businessservice IN ('NEWTL.HAZ', 'DIRECTRENEWAL', 'EDITRENEWAL', 'NewTL') THEN 'TL-Renewal' + WHEN pp.businessservice IN ('PT.MUTATION') THEN 'PT-Service' + WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' + WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' + WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' + WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' + END + ), + pending_appl AS ( + SELECT + CASE + WHEN p.businessservice IN ('NEWTL.HAZ', 'DIRECTRENEWAL', 'EDITRENEWAL', 'NewTL') THEN 'TL-Renewal' + WHEN p.businessservice IN ('PT.MUTATION') THEN 'PT-Service' + WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' + WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' + WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' + WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' + END AS servicename, + p.tenantid, -- Added tenantid + COUNT(*) AS pending_appl + FROM public.eg_wf_processinstance_v2 p + JOIN public.eg_wf_businessservice_v2 b ON p.businessservice = b.businessservice + WHERE (TO_TIMESTAMP(p.lastmodifiedtime / 1000.0) - TO_TIMESTAMP(p.createdtime / 1000.0)) > + (b.businessservicesla / (1000 * 60 * 60 * 24)) * INTERVAL '1 day' + AND b.businessservice NOT IN ('ModifyWSConnection', 'ModifySWConnection', 'PT.CREATE', 'PT.UPDATE', 'PT.CREATEWITHWNS') + AND p.assignee IS NOT NULL + AND p.tenantid NOT IN ('pb', 'pb.testing') + GROUP BY p.tenantid, + CASE + WHEN p.businessservice IN ('NEWTL.HAZ', 'DIRECTRENEWAL', 'EDITRENEWAL', 'NewTL') THEN 'TL-Renewal' + WHEN p.businessservice IN ('PT.MUTATION') THEN 'PT-Service' + WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' + WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' + WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' + WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' + END + ) + SELECT + '' as serviceID, + ta.servicename AS serviceName, + ta.tenantid AS authorityID, + '1' as departmentID, + ta.total_appl AS TotalApplicationReceived, + COALESCE(pa.pending_appl, 0) AS PendingBeyondTimelineApplicationCount + FROM total_appl ta + LEFT JOIN pending_appl pa + ON ta.servicename = pa.servicename + AND ta.tenantid = pa.tenantid + WHERE 1=1 From 752f3358638601d3d9a576197f0f886fb3c48029 Mon Sep 17 00:00:00 2001 From: M125688 Date: Tue, 1 Apr 2025 18:12:34 +0530 Subject: [PATCH 1564/1630] Update pending.yml upadted the pending reports From 52d585413c3be48ce68eb9741e7db8980f1bb07f Mon Sep 17 00:00:00 2001 From: M125688 Date: Tue, 1 Apr 2025 18:14:35 +0530 Subject: [PATCH 1565/1630] Rename pending.yml upadted the pending reports to pending.yml --- .../{pending.yml upadted the pending reports => pending.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename configs/reports/configs/{pending.yml upadted the pending reports => pending.yml} (100%) diff --git a/configs/reports/configs/pending.yml upadted the pending reports b/configs/reports/configs/pending.yml similarity index 100% rename from configs/reports/configs/pending.yml upadted the pending reports rename to configs/reports/configs/pending.yml From adf179120fabd9ab9b8767909d2548ebd420d5f9 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Wed, 9 Apr 2025 15:35:21 +0530 Subject: [PATCH 1566/1630] Update bill change WS and SW --- configs/pdf-service/data-config/sw-bill.json | 27 ++++++---- configs/pdf-service/data-config/ws-bill.json | 28 ++++++---- .../pdf-service/format-config/sw-bill.json | 51 +++++++++--------- .../pdf-service/format-config/ws-bill.json | 53 +++++++++---------- 4 files changed, 84 insertions(+), 75 deletions(-) diff --git a/configs/pdf-service/data-config/sw-bill.json b/configs/pdf-service/data-config/sw-bill.json index 37f9411c3..01235844d 100644 --- a/configs/pdf-service/data-config/sw-bill.json +++ b/configs/pdf-service/data-config/sw-bill.json @@ -461,12 +461,19 @@ "value": { "path": "$.connection.oldConnectionNo" } - }, { + }, + { "variable": "rate", "value": { "path": "$.additionalDetails.penaltyRate" } }, + { + "variable": "latePaymentc", + "value": { + "path": "$.additionalDetails.latePaymentc" + } + }, { "variable": "ledgerId", "value": { @@ -474,11 +481,11 @@ } }, { - "variable": "groupId", - "value": { + "variable": "groupId", + "value": { "path": "$.connection.additionalDetails.value.groups" - } - }, + } + }, { "variable": "payerAddress", "value": { @@ -740,9 +747,10 @@ { "variable": "phoneNumber", "value": "$.MdmsRes.tenant.tenants[0].contactNumber" - }, { - "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, + { + "variable": "mcGrade", + "value": "$.MdmsRes.tenant.tenants[0].city.pwssbGrade" }, { "variable": "website", @@ -836,7 +844,6 @@ "variable": "guardianName", "value": "$.Properties[0].owners[0].fatherOrHusbandName" } - ] } ] @@ -845,4 +852,4 @@ } ] } -} +} \ No newline at end of file diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json index 25f1babf5..ea1b2b441 100644 --- a/configs/pdf-service/data-config/ws-bill.json +++ b/configs/pdf-service/data-config/ws-bill.json @@ -4,7 +4,7 @@ "serviceName": "rainmaker-common", "version": "1.0.0", "baseKeyPath": "$.Bill.*", - "entityIdPath": "$.billNumber" , + "entityIdPath": "$.billNumber", "isCommonTableBorderRequired": true, "mappings": [ { @@ -467,7 +467,8 @@ "value": { "path": "$.connection.oldConnectionNo" } - }, { + }, + { "variable": "rate", "value": { "path": "$.additionalDetails.penaltyRate" @@ -476,19 +477,25 @@ { "variable": "ledgerId", "value": { - "path": "$.connection.additionalDetails.value.ledgerId" + "path": "$.connection.additionalDetails.value.ledgerId" + } + }, + { + "variable": "latePaymentc", + "value": { + "path": "$.additionalDetails.latePaymentc" } }, { "variable": "ledgerId", "value": { - "path": "$.connection.additionalDetails.value.ledgerId" + "path": "$.connection.additionalDetails.value.ledgerId" } }, { "variable": "groupId", "value": { - "path": "$.connection.additionalDetails.value.groups" + "path": "$.connection.additionalDetails.value.groups" } }, { @@ -752,9 +759,10 @@ { "variable": "phoneNumber", "value": "$.MdmsRes.tenant.tenants[0].contactNumber" - }, { - "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, + { + "variable": "mcGrade", + "value": "$.MdmsRes.tenant.tenants[0].city.pwssbGrade" }, { "variable": "website", @@ -848,8 +856,6 @@ "variable": "guardianName", "value": "$.Properties[0].owners[0].fatherOrHusbandName" } - - ] } ] @@ -858,4 +864,4 @@ } ] } -} +} \ No newline at end of file diff --git a/configs/pdf-service/format-config/sw-bill.json b/configs/pdf-service/format-config/sw-bill.json index 8c8f17856..2ac3aa26a 100644 --- a/configs/pdf-service/format-config/sw-bill.json +++ b/configs/pdf-service/format-config/sw-bill.json @@ -74,7 +74,7 @@ ] }, "layout": "noBorders" - }, + }, { "style": "noc-table2", "table": { @@ -92,7 +92,7 @@ false ], "style": "receipt-table-value2", - "alignment":"center" + "alignment": "center" } ] ] @@ -190,7 +190,6 @@ ] } ] - ] }, "layout": {} @@ -370,7 +369,7 @@ "style": "receipt-table2" }, { - "text":"{{locality}}", + "text": "{{locality}}", "border": [ false, false, @@ -433,7 +432,6 @@ ], "style": "receipt-table2" }, - { "text": "{{mobileNo}}", "border": [ @@ -445,7 +443,7 @@ "style": "receipt-table2" }, { - "text":"{{streetName}}{{landmark}}", + "text": "{{streetName}}{{landmark}}", "border": [ false, false, @@ -542,7 +540,8 @@ false ], "style": "receipt-table-value2" - },{ + }, + { "text": "{{charge_label}}", "border": [ false, @@ -605,7 +604,7 @@ "style": "receipt-table2" }, { - "text":"{{advanceAdjusted}}", + "text": "{{advanceAdjusted}}", "border": [ false, false, @@ -781,11 +780,11 @@ 0, 0.5 ] - } + } ], [ { - "text": "5. Late payment charges will be applied after due date", + "text": "5. {{latePaymentc}}", "border": [ true, false, @@ -853,7 +852,7 @@ } ] }, - { + { "text": "Authorized Signatory", "style": "footer-bottom" }, @@ -870,7 +869,7 @@ }, { "text": "{{acknowledgement_for}}", - "style": "footer-header" + "style": "footer-header" }, { "style": "noc-table4", @@ -1033,7 +1032,7 @@ "letterSpacing": 0.74, "margin": [ 0, - -10, + -10, 0, 1 ] @@ -1048,7 +1047,7 @@ "fontSize": 10, "color": "#484848", "margin": [ - -25, + -25, 13, -8, -8 @@ -1058,7 +1057,7 @@ "fontSize": 10, "color": "#484848", "margin": [ - -25, + -25, 40, -8, -8 @@ -1068,7 +1067,7 @@ "fontSize": 10, "color": "#484848", "margin": [ - -25, + -25, 8, -8, -8 @@ -1078,7 +1077,7 @@ "fontSize": 10, "color": "#484848", "margin": [ - -25, + -25, 13, -8, -8 @@ -1114,7 +1113,7 @@ "fontSize": 10, "fontWeight": 400, "margin": [ - -30, + -30, 1, 0, 0 @@ -1150,7 +1149,7 @@ "fontSize": 10, "fontWeight": 400, "margin": [ - -30, + -30, 5, 0, 0 @@ -1160,9 +1159,9 @@ "fontSize": 10, "bold": true, "margin": [ - -27, + -27, 30, - -10, + -10, 0 ], "color": "#484848" @@ -1170,9 +1169,9 @@ "no-signature": { "fontSize": 10, "margin": [ - -27, + -27, 25, - -10, + -10, 0 ], "color": "#484848" @@ -1186,9 +1185,9 @@ "pt-disclaimer": { "fontSize": 8, "margin": [ - -27, + -27, 20, - -10, + -10, 0 ], "color": "#484848" @@ -1248,4 +1247,4 @@ } } } -} +} \ 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 index 1954b43c6..19eae34e9 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -31,7 +31,7 @@ { "text": "{{address}}", "style": "receipt-logo-sub-header" - }, + }, { "text": "{{website}}", "style": "receipt-logo-sub-header" @@ -74,7 +74,7 @@ ] }, "layout": "noBorders" - }, + }, { "style": "noc-table2", "table": { @@ -92,7 +92,7 @@ false ], "style": "receipt-table-value2", - "alignment":"center" + "alignment": "center" } ] ] @@ -190,7 +190,6 @@ ] } ] - ] }, "layout": {} @@ -370,7 +369,7 @@ "style": "receipt-table2" }, { - "text":"{{locality}}", + "text": "{{locality}}", "border": [ false, false, @@ -433,7 +432,6 @@ ], "style": "receipt-table2" }, - { "text": "{{mobileNo}}", "border": [ @@ -445,7 +443,7 @@ "style": "receipt-table2" }, { - "text":"{{streetName}}{{landmark}}", + "text": "{{streetName}}{{landmark}}", "border": [ false, false, @@ -542,7 +540,8 @@ false ], "style": "receipt-table-value2" - },{ + }, + { "text": "{{charge_label}}", "border": [ false, @@ -605,7 +604,7 @@ "style": "receipt-table2" }, { - "text":"{{advanceAdjusted}}", + "text": "{{advanceAdjusted}}", "border": [ false, false, @@ -749,7 +748,6 @@ ] } ], - [ { "text": "3. Please bring this bill while making payment at office counter during collection hours i.e. 9.00AM to 1:30PM", @@ -765,11 +763,11 @@ 0, 0.5 ] - } + } ], [ { - "text": "4. surcharge charges will be applied after due date will reflect in next bill", + "text": "4. {{latePaymentc}}", "border": [ true, false, @@ -784,7 +782,6 @@ ] } ], - [ { "text": "5.To report any financial cybercrime call 1930 immediately or register any cybercrime at www.cybercrime.gov.in . For latest updates on cybercrime, follow official social media handle Cyberdost of Ministry of Home Affairs ", @@ -838,7 +835,7 @@ }, { "text": "{{acknowledgement_for}}", - "style": "footer-header" + "style": "footer-header" }, { "style": "noc-table4", @@ -1001,7 +998,7 @@ "letterSpacing": 0.74, "margin": [ 0, - -10, + -10, 0, 1 ] @@ -1016,7 +1013,7 @@ "fontSize": 10, "color": "#484848", "margin": [ - -25, + -25, 13, -8, -8 @@ -1026,7 +1023,7 @@ "fontSize": 10, "color": "#484848", "margin": [ - -25, + -25, 40, -8, -8 @@ -1036,7 +1033,7 @@ "fontSize": 10, "color": "#484848", "margin": [ - -25, + -25, 8, -8, -8 @@ -1046,7 +1043,7 @@ "fontSize": 10, "color": "#484848", "margin": [ - -25, + -25, 13, -8, -8 @@ -1082,7 +1079,7 @@ "fontSize": 10, "fontWeight": 400, "margin": [ - -30, + -30, 1, 0, 0 @@ -1118,7 +1115,7 @@ "fontSize": 10, "fontWeight": 400, "margin": [ - -30, + -30, 5, 0, 0 @@ -1128,9 +1125,9 @@ "fontSize": 10, "bold": true, "margin": [ - -27, + -27, 30, - -10, + -10, 0 ], "color": "#484848" @@ -1138,9 +1135,9 @@ "no-signature": { "fontSize": 10, "margin": [ - -27, + -27, 25, - -10, + -10, 0 ], "color": "#484848" @@ -1154,9 +1151,9 @@ "pt-disclaimer": { "fontSize": 8, "margin": [ - -27, + -27, 20, - -10, + -10, 0 ], "color": "#484848" @@ -1216,4 +1213,4 @@ } } } -} +} \ No newline at end of file From 3a681678bd67a9b7dbed4664c949b628d3d63c06 Mon Sep 17 00:00:00 2001 From: M125688 Date: Wed, 9 Apr 2025 17:48:34 +0530 Subject: [PATCH 1567/1630] Update pt-reports.yml upadted the query for ReceiptRegister_without_locality_V2 --- configs/reports/configs/pt-reports.yml | 112 ++++++++++++++----------- 1 file changed, 63 insertions(+), 49 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index b96c87da9..0336d9368 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2464,57 +2464,71 @@ ReportDefinitions: query: | -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( - SELECT - pd.id as pdid, - SUM(CASE WHEN taxheadcode = 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode = 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode = 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode = 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode = 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode = 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode = 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode = 'PT_TAX' THEN bad.amount ELSE 0 END) as propertytax, - SUM(CASE WHEN taxheadcode = 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, - (SUM(CASE WHEN taxheadcode = 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) - + SUM(CASE WHEN taxheadcode = 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) ) as exemption, - (SUM(CASE WHEN taxheadcode = 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode = 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode = '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.id AS pdid, + SUM(CASE WHEN taxheadcode = 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) AS adhocpenalty, + SUM(CASE WHEN taxheadcode = 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) AS adhocrebate, + SUM(CASE WHEN taxheadcode = 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) AS firecess, + SUM(CASE WHEN taxheadcode = 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) AS cancercess, + SUM(CASE WHEN taxheadcode = 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) AS interest, + SUM(CASE WHEN taxheadcode = 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) AS penalty, + SUM(CASE WHEN taxheadcode = 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) AS rebate, + SUM(CASE WHEN taxheadcode = 'PT_TAX' THEN bad.amount ELSE 0 END) AS propertytax, + SUM(CASE WHEN taxheadcode = 'PT_TAX' THEN adjustedamount ELSE 0 END) AS paidpropertytax, + (SUM(CASE WHEN taxheadcode = 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END)) AS exemption, + (SUM(CASE WHEN taxheadcode = 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode = '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 and bd.tenantid=bad.tenantid + INNER JOIN egcl_paymentdetail AS pd ON pd.billid = bd.billid and bd.tenantid=pd.billid + INNER JOIN egcl_payment AS payment ON pd.paymentid = payment.id and payment.tenantid =bad.tenantid + 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 + 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, + 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, + COALESCE(eg_user.name, '30048|21Fj+c3k2ldB0X3AzIh7atXB') 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 + LEFT OUTER JOIN egcl_payment payment ON pd.paymentid = payment.id + LEFT OUTER JOIN bank_branches ON bank_branches.ifsc = payment.ifsccode + LEFT OUTER JOIN ( + 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 ON pt.propertyid = pd.billid + LEFT JOIN receipt_breakup ON receipt_breakup.pdid = pd.id + WHERE payment.paymentstatus != 'CANCELLED' + AND pd.businessservice = 'PT' + AND payment.tenantid = $tenantid AND pd.tenantid = $tenantid + AND pd.receiptdate >= $fromDate + AND pd.receiptdate <= $toDate orderby: ORDER BY pd.receiptdate DESC; From 05e22ec84997f665f4242e0642436c27db762e14 Mon Sep 17 00:00:00 2001 From: palamgarg Date: Thu, 10 Apr 2025 21:51:25 +0530 Subject: [PATCH 1568/1630] Update pt-reports.yml --- 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 0336d9368..9b62cef83 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2709,9 +2709,9 @@ ReportDefinitions: + SUM(CASE WHEN taxheadcode = 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + SUM(CASE WHEN taxheadcode = '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 + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid and bd.tenantid=bad.tenantid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid and bd.tenantid=pd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id and payment.tenantid =bad.tenantid WHERE payment.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' GROUP BY pdid ) From 04f1682737044e2df0d09534c4bba80c2e99e88e Mon Sep 17 00:00:00 2001 From: palamgarg Date: Thu, 10 Apr 2025 22:06:35 +0530 Subject: [PATCH 1569/1630] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 86 +++++++++++++------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 9b62cef83..ad41a6256 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -485,7 +485,7 @@ ReportDefinitions: (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' + and ih.instrumentstatus != 'CANCELLED' where rh.status != 'Cancelled' ) AS instrument_data ON (pd.property || ':' || pd.assessmentnumber) = instrument_data.consumercode WHERE tenantid = $tenantid @@ -784,7 +784,7 @@ ReportDefinitions: 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' + 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') @@ -874,7 +874,7 @@ ReportDefinitions: 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' + 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 @@ -1006,7 +1006,7 @@ ReportDefinitions: 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 + --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, @@ -1363,7 +1363,7 @@ ReportDefinitions: 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 + --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, @@ -2038,7 +2038,7 @@ ReportDefinitions: 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 + --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, @@ -2792,7 +2792,7 @@ ReportDefinitions: (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' + and ih.instrumentstatus != 'CANCELLED' where rh.status != 'Cancelled' ) AS instrument_data ON (pd.property || ':' || pd.assessmentnumber) = instrument_data.consumercode WHERE tenantid = $tenantid @@ -2999,7 +2999,7 @@ 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 '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, + 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 @@ -3280,20 +3280,20 @@ ReportDefinitions: 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, + 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, + --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, @@ -3418,7 +3418,7 @@ ReportDefinitions: searchClause: AND eg_user.id = $collectorname::INTEGER query: | -- Use CTE to force query plan, compute & use CTE later - SELECT + SELECT pt.propertyid as propertyid, oldpropertyid, to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as transactiondate, @@ -3545,7 +3545,7 @@ ReportDefinitions: 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 + --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 @@ -3586,7 +3586,7 @@ ReportDefinitions: 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 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 @@ -4437,7 +4437,7 @@ ReportDefinitions: 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 + --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, @@ -4465,7 +4465,7 @@ ReportDefinitions: 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 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 @@ -4519,7 +4519,7 @@ ReportDefinitions: 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 + --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, @@ -4548,7 +4548,7 @@ ReportDefinitions: 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 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 @@ -4613,7 +4613,7 @@ ReportDefinitions: 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 + --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", @@ -4740,7 +4740,7 @@ ReportDefinitions: 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 + --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", @@ -4842,7 +4842,7 @@ ReportDefinitions: 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 + --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, @@ -4880,7 +4880,7 @@ ReportDefinitions: 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 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 @@ -4919,7 +4919,7 @@ ReportDefinitions: 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 + --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 @@ -5734,7 +5734,7 @@ ReportDefinitions: 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 + --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 @@ -6213,7 +6213,7 @@ ReportDefinitions: label: reports.pt.transactiondate type: string source: pt - total: false + total: false - name: g8issuedate label: reports.pt.g8issuedate type: string @@ -6460,7 +6460,7 @@ ReportDefinitions: 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 + --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 @@ -8416,7 +8416,7 @@ ReportDefinitions: 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 + --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 @@ -8493,7 +8493,7 @@ ReportDefinitions: 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 + --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 @@ -8594,7 +8594,7 @@ ReportDefinitions: searchClause: AND eg_user.id = $collectorname::INTEGER query: | -- Use CTE to force query plan, compute & use CTE later - SELECT + SELECT pt.propertyid as propertyid, to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as transactiondate, receiptnumber, @@ -8799,14 +8799,14 @@ ReportDefinitions: 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 + --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, + split_part(string_agg(emailid,','),',',1) as emailid, propertyid from report_owners where status='ACTIVE' and tenantid =$ulb group by propertyid @@ -8952,7 +8952,7 @@ ReportDefinitions: 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 + --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%' @@ -9109,7 +9109,7 @@ ReportDefinitions: 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 + --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%' @@ -9275,7 +9275,7 @@ ReportDefinitions: 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 + --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 @@ -9442,7 +9442,7 @@ ReportDefinitions: 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 + --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 propertyid, SPLIT_PART(STRING_AGG(ownername, ','), ',', 1) AS ownername, @@ -9613,7 +9613,7 @@ ReportDefinitions: 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 + --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 From b78733a956d30e3f1b941c9e72cfe1588d918f16 Mon Sep 17 00:00:00 2001 From: palamgarg Date: Fri, 11 Apr 2025 06:58:53 +0530 Subject: [PATCH 1570/1630] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index ad41a6256..6cbf9a09c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -10064,7 +10064,4 @@ ReportDefinitions: 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 - - - + orderby: ORDER BY p.propertyid From 43d13dc323c6fdf3d603a56d388695fbccbd7843 Mon Sep 17 00:00:00 2001 From: M125688 Date: Fri, 11 Apr 2025 14:32:34 +0530 Subject: [PATCH 1571/1630] Update pt-reports.yml upadted the join condition in ReceiptRegister_without_locality_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 6cbf9a09c..63adceb3a 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2482,7 +2482,7 @@ ReportDefinitions: + SUM(CASE WHEN taxheadcode = '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 and bd.tenantid=bad.tenantid - INNER JOIN egcl_paymentdetail AS pd ON pd.billid = bd.billid and bd.tenantid=pd.billid + INNER JOIN egcl_paymentdetail AS pd ON pd.billid = bd.billid and bd.tenantid=pd.tenantid INNER JOIN egcl_payment AS payment ON pd.paymentid = payment.id and payment.tenantid =bad.tenantid WHERE payment.tenantid = $tenantid AND payment.paymentstatus != 'CANCELLED' From 27f139d9cf9dfda04d806d6f19934d232d0a2331 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 12 Apr 2025 18:02:33 +0530 Subject: [PATCH 1572/1630] enable fetch by status --- configs/reports/configs/pgr-reports.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 2193f6184..867e0cc5a 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2019,7 +2019,13 @@ ReportDefinitions: wrapper: true isMandatory: false searchClause: AND eg_pgr_service.tenantid = $ulb - + - name: appstatus + label: reports.rainmaker-pgr.status + type: singlevaluelist + pattern: 'list://assigned:assigned,closed:closed,open:open,reassignrequested:reassignrequested,rejected:rejected,resolved:resolved' + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.status=$appstatus query: | SELECT DISTINCT ON (servicerequestid) @@ -2047,7 +2053,7 @@ ReportDefinitions: 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') + --AND eg_pgr_service.status IN ('open','assigned','reassigrequested','rejected','closed','resolved') orderby: ORDER BY servicerequestid, epa."when" desc - reportName: UlbwisePgrSlaReport_v2 From 32994399fba8caad73b09f5435dcb39c8a701d1c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 12 Apr 2025 18:14:49 +0530 Subject: [PATCH 1573/1630] updated tenant filter --- 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 867e0cc5a..29366b17d 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2014,7 +2014,7 @@ ReportDefinitions: - 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 + 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 From 249fb677bea75d12d40120bd5f1c00387cf3cf1a Mon Sep 17 00:00:00 2001 From: palamgarg Date: Tue, 15 Apr 2025 07:16:41 +0530 Subject: [PATCH 1574/1630] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 76 +++----------------------- 1 file changed, 9 insertions(+), 67 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 63adceb3a..3c6b819dc 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2462,73 +2462,15 @@ ReportDefinitions: 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 = 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) AS adhocpenalty, - SUM(CASE WHEN taxheadcode = 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) AS adhocrebate, - SUM(CASE WHEN taxheadcode = 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) AS firecess, - SUM(CASE WHEN taxheadcode = 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) AS cancercess, - SUM(CASE WHEN taxheadcode = 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) AS interest, - SUM(CASE WHEN taxheadcode = 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) AS penalty, - SUM(CASE WHEN taxheadcode = 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) AS rebate, - SUM(CASE WHEN taxheadcode = 'PT_TAX' THEN bad.amount ELSE 0 END) AS propertytax, - SUM(CASE WHEN taxheadcode = 'PT_TAX' THEN adjustedamount ELSE 0 END) AS paidpropertytax, - (SUM(CASE WHEN taxheadcode = 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) - + SUM(CASE WHEN taxheadcode = 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END)) AS exemption, - (SUM(CASE WHEN taxheadcode = 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode = 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode = '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 and bd.tenantid=bad.tenantid - INNER JOIN egcl_paymentdetail AS pd ON pd.billid = bd.billid and bd.tenantid=pd.tenantid - INNER JOIN egcl_payment AS payment ON pd.paymentid = payment.id and payment.tenantid =bad.tenantid - 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, - 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, - COALESCE(eg_user.name, '30048|21Fj+c3k2ldB0X3AzIh7atXB') 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 - LEFT OUTER JOIN egcl_payment payment ON pd.paymentid = payment.id - LEFT OUTER JOIN bank_branches ON bank_branches.ifsc = payment.ifsccode - LEFT OUTER JOIN ( - 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 ON pt.propertyid = pd.billid - LEFT JOIN receipt_breakup ON receipt_breakup.pdid = pd.id - WHERE payment.paymentstatus != 'CANCELLED' - AND pd.businessservice = 'PT' - AND payment.tenantid = $tenantid AND pd.tenantid = $tenantid - AND pd.receiptdate >= $fromDate - AND pd.receiptdate <= $toDate + -- Use CTE to force query plan, compute & use CTE later + Select receiptnumber as receiptnumber,receiptdate as receiptdate,g8issuedate as g8issuedate, + g8receiptno as g8receiptno,amount as amount,propertytax as propertytax,firecess as firecess, + cancercess as cancercess,rebate as rebate,adhocrebate as adhocrebate,penalty as penalty, + adhocpenalty as adhocpenalty,interest as interest,exemption as exemption,adjustment as adjustment, + pendingamount as pendingamount,consumercode as consumercode,usagetype as usagetype, + instrumenttype as instrumenttype,transactionnumber as transactionnumber,transactiondate as transactiondate, + bankname as bankname, collectorname as collectorname,financialyear as financialyear from public.mv_pt_receipt_regiester + where tenantid=$tenantid orderby: ORDER BY pd.receiptdate DESC; From af0937013f37d7866fcee10c3ca1a0c046d7ed9b Mon Sep 17 00:00:00 2001 From: palamgarg Date: Tue, 15 Apr 2025 07:27:01 +0530 Subject: [PATCH 1575/1630] 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 3c6b819dc..a262cba78 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2439,13 +2439,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate + searchClause: AND receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND pd.receiptdate <= $toDate + searchClause: AND receiptdate <= $toDate - name: financialyear label: Financial Year type: singlevaluelist From 2a7e265fcb8a2a6f0afb80cb6f652810c71cb4a8 Mon Sep 17 00:00:00 2001 From: palamgarg Date: Tue, 15 Apr 2025 07:34:51 +0530 Subject: [PATCH 1576/1630] 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 a262cba78..d23ba03be 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2439,13 +2439,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND receiptdate >= $fromDate + searchClause: AND (EXTRACT(EPOCH FROM TO_TIMESTAMP(receiptdate, 'DD-MM-YYYY')) * 1000) >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND receiptdate <= $toDate + searchClause: AND (EXTRACT(EPOCH FROM TO_TIMESTAMP(receiptdate, 'DD-MM-YYYY')) * 1000) <= $toDate - name: financialyear label: Financial Year type: singlevaluelist From 0a71e177cc7208aa752345a444320ef8b9e9bbc8 Mon Sep 17 00:00:00 2001 From: palamgarg Date: Tue, 15 Apr 2025 07:40:38 +0530 Subject: [PATCH 1577/1630] 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 d23ba03be..61585b3ac 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2471,7 +2471,7 @@ ReportDefinitions: instrumenttype as instrumenttype,transactionnumber as transactionnumber,transactiondate as transactiondate, bankname as bankname, collectorname as collectorname,financialyear as financialyear from public.mv_pt_receipt_regiester where tenantid=$tenantid - orderby: ORDER BY pd.receiptdate DESC; + orderby: ORDER BY receiptdate DESC; - reportName: CancelledReceiptRegister_V2 From 7d5684fd1ea22bdde0acc4070a509925e2fa2e60 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Wed, 16 Apr 2025 10:14:09 +0530 Subject: [PATCH 1578/1630] change font size WS and SW bill --- configs/pdf-service/format-config/sw-bill.json | 7 ++----- configs/pdf-service/format-config/ws-bill.json | 6 +----- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/configs/pdf-service/format-config/sw-bill.json b/configs/pdf-service/format-config/sw-bill.json index 2ac3aa26a..691644eaf 100644 --- a/configs/pdf-service/format-config/sw-bill.json +++ b/configs/pdf-service/format-config/sw-bill.json @@ -35,10 +35,7 @@ "text": "{{phoneNumber}}" }, { - "text": "{{website}}" - }, - { - "text": "{{email}}" + "text": "{{website}} {{email}}" } ] } @@ -1027,7 +1024,7 @@ "receipt-logo-header": { "color": "#484848", "fontFamily": "Roboto", - "fontSize": 14, + "fontSize": 12, "bold": true, "letterSpacing": 0.74, "margin": [ diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index 19eae34e9..93647aee4 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -33,11 +33,7 @@ "style": "receipt-logo-sub-header" }, { - "text": "{{website}}", - "style": "receipt-logo-sub-header" - }, - { - "text": "{{email}}", + "text": "{{website}} {{email}}", "style": "receipt-logo-sub-header" } ] From b262ca78d4c0210a9f0393eec23528de82f0ae32 Mon Sep 17 00:00:00 2001 From: palamgarg Date: Wed, 16 Apr 2025 11:25:43 +0530 Subject: [PATCH 1579/1630] 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 9aefa5e1e..a2509f0cf 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1143,7 +1143,7 @@ ReportDefinitions: type: epoch source: uc isMandatory: true - searchClause: AND paydetail.receiptdate >= $fromDate + searchClause: AND (EXTRACT(EPOCH FROM TO_TIMESTAMP(receiptdate, 'DD-MM-YYYY')) * 1000) >= $fromDate - name: toDate label: reports.uc.toDate type: epoch From 68dd5b91cb06dac992e43411582d89d3543bedf7 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 16 Apr 2025 12:13:49 +0530 Subject: [PATCH 1580/1630] Update pgr-reports.yml --- configs/reports/configs/pgr-reports.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 29366b17d..a895f924a 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -1057,6 +1057,13 @@ ReportDefinitions: source: eg_pgr_service isMandatory: false searchClause: AND eg_pgr_service.createdtime <= $toDate + - name: appstatus + label: reports.rainmaker-pgr.status + type: singlevaluelist + pattern: 'list://assigned:assigned,closed:closed,open:open,reassignrequested:reassignrequested,rejected:rejected,resolved:resolved' + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.status=$appstatus query: | SELECT DISTINCT ON (servicerequestid) From bfd4739968c324145f67240c38f576e5cedfd021 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 16 Apr 2025 12:26:35 +0530 Subject: [PATCH 1581/1630] Update pgr-reports.yml --- 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 a895f924a..c4df602a2 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -1090,7 +1090,7 @@ ReportDefinitions: 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') + --AND eg_pgr_service.status IN ('open','assigned','reassigrequested','rejected','closed','resolved') orderby: ORDER BY servicerequestid, epa."when" desc - reportName: StateSourceReport_v2 From d7a04137dc52df8cc7110a73979654597b37ba95 Mon Sep 17 00:00:00 2001 From: M125688 Date: Wed, 16 Apr 2025 12:31:06 +0530 Subject: [PATCH 1582/1630] Update uc-reports.yml updated MiscReceiptULB_v2 --- configs/reports/configs/uc-reports.yml | 53 +++++++------------------- 1 file changed, 14 insertions(+), 39 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index a2509f0cf..196c8f13c 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -965,13 +965,13 @@ ReportDefinitions: type: epoch source: uc isMandatory: false - searchClause: AND eg_echallan.createdtime >= $fromDate + searchClause: AND (EXTRACT(EPOCH FROM TO_TIMESTAMP(receiptdate, 'DD-MM-YYYY')) * 1000) >= $fromDate - name: toDate label: reports.uc.toDate type: epoch source: uc isMandatory: false - searchClause: AND eg_echallan.createdtime <= $toDate + searchClause: AND (EXTRACT(EPOCH FROM TO_TIMESTAMP(receiptdate, 'DD-MM-YYYY')) * 1000) <= $toDate - name: businessservice label: reports.uc.businessservice type: singlevaluelist @@ -979,7 +979,7 @@ ReportDefinitions: source: uc wrapper: true isMandatory: false - searchClause: AND egcl_bill.businessservice = $businessservice + searchClause: AND businessdetails = $businessdetails - name: collectorname label: reports.uc.collectorname type: singlevaluelist @@ -987,44 +987,19 @@ ReportDefinitions: source: uc wrapper: true isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER + searchClause: AND collectorname = $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 payment.paymentstatus,',') receiptstatus, - string_agg(distinct payment.tenantid,',') as ulb, - string_agg(distinct egcl_bill.totalamount::text,',') as totalamount, - eg_echallan.challanno, - string_agg(distinct eg_echallan.businessservice,',') as businessdetails, - string_agg(distinct eg_echallan.description,',') as comments, - 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 g8receiptno, - To_char((To_timestamp(egcl_paymentdetail.manualreceiptdate/ 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, - 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, - to_char((To_timestamp(payment.instrumentdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS cheque_dd_date, - string_agg(distinct payment.transactionnumber,',') as transactionnumber, - string_agg(distinct payment.paymentmode,',') as paymentmode, - 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 payment.payername,',') as payername, - string_agg(distinct eg_user.name,',') as collectorname, - 'System' as collectiontype, - 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!='pb.testing' and eg_echallan.challanno=egcl_bill.consumercode ) inner join egcl_paymentdetail on (egcl_paymentdetail.tenantid!='pb.testing' 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!='pb.testing' 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!='pb.testing' 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 ,payment.instrumentdate,egcl_paymentdetail.manualreceiptdate + select billstatus as billstatus, receiptstatus as receiptstatus, ulb as ulb, + totalamount as totalamount, challanno as challanno, businessdetails as businessdetails, + comments as comments, status as status, receiptnumber as receiptnumber, doorno as doorno, + buildingname as buildingname, street as street, mobilenumber as mobilenumber,g8receiptno as g8receiptno, + g8issuedate as g8issuedate, ifsc as ifsc, bankname as bankname, branchname as branchname, cheque_dd_no as cheque_dd_no, + cheque_dd_date as cheque_dd_date, transactionnumber as transactionnumber, paymentmode as paymentmode, + cgst as cgst, sgst as sgst, tax as tax, fieldcollection as fieldcollection, payername as payername, + collectorname as collectorname, collectiontype as collectiontype, receiptdate as receiptdate + from public.echalan_receipt_register1 where ulb=$tenantid + orderby: ORDER BY receiptdate DESC; From 88390715ccb0ee495e32a969a24ae7a473568019 Mon Sep 17 00:00:00 2001 From: M125688 Date: Wed, 16 Apr 2025 12:47:22 +0530 Subject: [PATCH 1583/1630] Update uc-reports.yml --- configs/reports/configs/uc-reports.yml | 53 +++++++------------------- 1 file changed, 14 insertions(+), 39 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 196c8f13c..361e1e20d 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1919,13 +1919,13 @@ ReportDefinitions: type: epoch source: uc isMandatory: false - searchClause: AND eg_echallan.createdtime >= $fromDate + searchClause: AND (EXTRACT(EPOCH FROM TO_TIMESTAMP(receiptdate, 'DD-MM-YYYY')) * 1000) >= $fromDate - name: toDate label: reports.uc.toDate type: epoch source: uc isMandatory: false - searchClause: AND eg_echallan.createdtime <= $toDate + searchClause: AND (EXTRACT(EPOCH FROM TO_TIMESTAMP(receiptdate, 'DD-MM-YYYY')) * 1000) <= $toDate - name: businessservice label: reports.uc.businessservice type: singlevaluelist @@ -1933,7 +1933,7 @@ ReportDefinitions: source: uc wrapper: true isMandatory: false - searchClause: AND egcl_bill.businessservice = $businessservice + searchClause: AND businessdetails = $businessdetails - name: collectorname label: reports.uc.collectorname type: singlevaluelist @@ -1941,44 +1941,19 @@ ReportDefinitions: source: uc wrapper: true isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER + searchClause: AND collectorname = $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 payment.paymentstatus,',') receiptstatus, - string_agg(distinct payment.tenantid,',') as ulb, - string_agg(distinct egcl_bill.totalamount::text,',') as totalamount, - eg_echallan.challanno, - string_agg(distinct eg_echallan.businessservice,',') as businessdetails, - string_agg(distinct eg_echallan.description,',') as comments, - 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 g8receiptno, - To_char((To_timestamp(egcl_paymentdetail.manualreceiptdate/ 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, - 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, - to_char((To_timestamp(payment.instrumentdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS cheque_dd_date, - string_agg(distinct payment.transactionnumber,',') as transactionnumber, - string_agg(distinct payment.paymentmode,',') as paymentmode, - 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 payment.payername,',') as payername, - string_agg(distinct eg_user.name,',') as collectorname, - 'System' as collectiontype, - 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 ,payment.instrumentdate,egcl_paymentdetail.manualreceiptdate + select ulb as ulb, receiptnumber as receiptnumber,receiptdate as receiptdate, + receiptdate as receiptdate,g8issuedate as g8issuedate,g8receiptno as g8receiptno, + receiptstatus as receiptstatus,businessdetails as businessdetails,cgst as cgst, + tax as tax,fieldcollection as fieldcollection,sgst as sgst,cheque_dd_no as cheque_dd_no, + cheque_dd_date as cheque_dd_date,bankname as bankname, branchname as branchname, + collectiontype as collectiontype,collectorname as collectorname,totalamount as totalamount, + paymentmode as paymentmode,payername as payername,comments as comments,doorno as doorno, + buildingname as buildingname, street as street + from public.echalan_receipt_register1 where ulb=$tenantid + orderby: ORDER BY receiptdate DESC - reportName: NewMiscReceiptULB_v2 decryptionPathId: MiscReceiptULB_v2 From dd44bc8f58eb976d27b8d38b86b9217eb2dd5258 Mon Sep 17 00:00:00 2001 From: M125688 Date: Wed, 16 Apr 2025 14:33:11 +0530 Subject: [PATCH 1584/1630] 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 361e1e20d..1e999a482 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -987,7 +987,7 @@ ReportDefinitions: source: uc wrapper: true isMandatory: false - searchClause: AND collectorname = $collectorname::INTEGER + searchClause: AND collectorname = $collectorname query: | -- Use CTE to force query plan, compute & use CTE later select billstatus as billstatus, receiptstatus as receiptstatus, ulb as ulb, @@ -1941,7 +1941,7 @@ ReportDefinitions: source: uc wrapper: true isMandatory: false - searchClause: AND collectorname = $collectorname::INTEGER + searchClause: AND collectorname = $collectorname query: | -- Use CTE to force query plan, compute & use CTE later select ulb as ulb, receiptnumber as receiptnumber,receiptdate as receiptdate, From 34cca81175cc94bd40237626eeaad75cecb0816d Mon Sep 17 00:00:00 2001 From: M125688 Date: Wed, 16 Apr 2025 15:56:25 +0530 Subject: [PATCH 1585/1630] Update uc-reports.yml --- configs/reports/configs/uc-reports.yml | 106 ++++++++++++------------- 1 file changed, 50 insertions(+), 56 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 1e999a482..858860a0b 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -965,13 +965,13 @@ ReportDefinitions: type: epoch source: uc isMandatory: false - searchClause: AND (EXTRACT(EPOCH FROM TO_TIMESTAMP(receiptdate, 'DD-MM-YYYY')) * 1000) >= $fromDate + searchClause: AND eg_echallan.createdtime >= $fromDate - name: toDate label: reports.uc.toDate type: epoch source: uc isMandatory: false - searchClause: AND (EXTRACT(EPOCH FROM TO_TIMESTAMP(receiptdate, 'DD-MM-YYYY')) * 1000) <= $toDate + searchClause: AND eg_echallan.createdtime <= $toDate - name: businessservice label: reports.uc.businessservice type: singlevaluelist @@ -979,7 +979,7 @@ ReportDefinitions: source: uc wrapper: true isMandatory: false - searchClause: AND businessdetails = $businessdetails + searchClause: AND egcl_bill.businessservice = $businessservice - name: collectorname label: reports.uc.collectorname type: singlevaluelist @@ -987,19 +987,44 @@ ReportDefinitions: source: uc wrapper: true isMandatory: false - searchClause: AND collectorname = $collectorname + searchClause: AND eg_user.id = $collectorname::INTEGER query: | -- Use CTE to force query plan, compute & use CTE later - select billstatus as billstatus, receiptstatus as receiptstatus, ulb as ulb, - totalamount as totalamount, challanno as challanno, businessdetails as businessdetails, - comments as comments, status as status, receiptnumber as receiptnumber, doorno as doorno, - buildingname as buildingname, street as street, mobilenumber as mobilenumber,g8receiptno as g8receiptno, - g8issuedate as g8issuedate, ifsc as ifsc, bankname as bankname, branchname as branchname, cheque_dd_no as cheque_dd_no, - cheque_dd_date as cheque_dd_date, transactionnumber as transactionnumber, paymentmode as paymentmode, - cgst as cgst, sgst as sgst, tax as tax, fieldcollection as fieldcollection, payername as payername, - collectorname as collectorname, collectiontype as collectiontype, receiptdate as receiptdate - from public.echalan_receipt_register1 where ulb=$tenantid - orderby: ORDER BY receiptdate DESC; + SELECT + string_agg(distinct egcl_bill.status,',') as billstatus, + string_agg(distinct payment.paymentstatus,',') receiptstatus, + string_agg(distinct payment.tenantid,',') as ulb, + string_agg(distinct egcl_bill.totalamount::text,',') as totalamount, + eg_echallan.challanno, + string_agg(distinct eg_echallan.businessservice,',') as businessdetails, + string_agg(distinct eg_echallan.description,',') as comments, + 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 g8receiptno, + To_char((To_timestamp(egcl_paymentdetail.manualreceiptdate/ 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, + 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, + to_char((To_timestamp(payment.instrumentdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS cheque_dd_date, + string_agg(distinct payment.transactionnumber,',') as transactionnumber, + string_agg(distinct payment.paymentmode,',') as paymentmode, + 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 payment.payername,',') as payername, + string_agg(distinct eg_user.name,',') as collectorname, + 'System' as collectiontype, + 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!='pb.testing' and eg_echallan.challanno=egcl_bill.consumercode ) inner join egcl_paymentdetail on (egcl_paymentdetail.tenantid!='pb.testing' 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!='pb.testing' 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!='pb.testing' 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 ,payment.instrumentdate,egcl_paymentdetail.manualreceiptdate @@ -1124,7 +1149,7 @@ ReportDefinitions: type: epoch source: uc isMandatory: true - searchClause: AND paydetail.receiptdate <= $toDate + searchClause: AND (EXTRACT(EPOCH FROM TO_TIMESTAMP(receiptdate, 'DD-MM-YYYY')) * 1000) <= $toDate - name: businessservice label: reports.uc.businessservice type: singlevaluelist @@ -1132,7 +1157,7 @@ ReportDefinitions: source: uc wrapper: true isMandatory: false - searchClause: AND businessservice = $businessservice + searchClause: AND businessdetails = $businessdetails - name: collectorname label: reports.uc.collectorname type: singlevaluelist @@ -1140,48 +1165,17 @@ ReportDefinitions: source: uc wrapper: true isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER + searchClause: AND collectorname = $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 + select ulb as ulb,receiptnumber as receiptnumber,receiptdate as receiptdate, + g8issuedate as g8issuedate,g8receiptno as g8receiptno,status as status, + businessdetails as servicecategory,cgst as cgst,tax as tax, fieldcollection as fieldcollection, + sgst as sgst,cheque_dd_no as ddorchequenumber,cheque_dd_date as ddchequedate,bankname as bankname, + branchname as branchname,collectiontype as collectiontype,collectorname as collectorname, + totalamount as totalamount,paymentmode as paymentmode,comments as remarks + from public.echalan_receipt_register1 where ulb=$tenantid + orderby: ORDER BY receiptdate DESC; - reportName: MiscReceiptStateWide_v2 From 98b27af8890a3d7c3a691e96cb054081ecaf3884 Mon Sep 17 00:00:00 2001 From: M125688 Date: Wed, 16 Apr 2025 16:30:15 +0530 Subject: [PATCH 1586/1630] 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 858860a0b..78f386a73 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1175,7 +1175,7 @@ ReportDefinitions: branchname as branchname,collectiontype as collectiontype,collectorname as collectorname, totalamount as totalamount,paymentmode as paymentmode,comments as remarks from public.echalan_receipt_register1 where ulb=$tenantid - orderby: ORDER BY receiptdate DESC; + orderby: ORDER BY receiptdate DESC - reportName: MiscReceiptStateWide_v2 From a7b1cccdfd09bfe3b9b10fa0a8df948b85036530 Mon Sep 17 00:00:00 2001 From: M125688 Date: Wed, 16 Apr 2025 16:33:49 +0530 Subject: [PATCH 1587/1630] Update uc-reports.yml --- configs/reports/configs/uc-reports.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 78f386a73..164c8ba0a 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1168,13 +1168,13 @@ ReportDefinitions: searchClause: AND collectorname = $collectorname::INTEGER query: | -- Use CTE to force query plan, compute & use CTE later - select ulb as ulb,receiptnumber as receiptnumber,receiptdate as receiptdate, - g8issuedate as g8issuedate,g8receiptno as g8receiptno,status as status, - businessdetails as servicecategory,cgst as cgst,tax as tax, fieldcollection as fieldcollection, - sgst as sgst,cheque_dd_no as ddorchequenumber,cheque_dd_date as ddchequedate,bankname as bankname, - branchname as branchname,collectiontype as collectiontype,collectorname as collectorname, - totalamount as totalamount,paymentmode as paymentmode,comments as remarks - from public.echalan_receipt_register1 where ulb=$tenantid + select ulb as ulb,receiptnumber as receiptnumber,receiptdate as receiptdate, + g8issuedate as g8issuedate,g8receiptno as g8receiptno,status as status, + businessdetails as servicecategory,cgst as cgst,tax as tax, fieldcollection as fieldcollection, + sgst as sgst,cheque_dd_no as ddorchequenumber,cheque_dd_date as ddchequedate,bankname as bankname, + branchname as branchname,collectiontype as collectiontype,collectorname as collectorname, + totalamount as totalamount,paymentmode as paymentmode,comments as remarks + from public.echalan_receipt_register1 where ulb=$tenantid orderby: ORDER BY receiptdate DESC From eb3f64a1244d38f842ddc544183953be7a794645 Mon Sep 17 00:00:00 2001 From: M125688 Date: Thu, 17 Apr 2025 12:27:06 +0530 Subject: [PATCH 1588/1630] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 56 +++++++++++--------------- 1 file changed, 23 insertions(+), 33 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 61585b3ac..08932d99f 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2471,7 +2471,7 @@ ReportDefinitions: instrumenttype as instrumenttype,transactionnumber as transactionnumber,transactiondate as transactiondate, bankname as bankname, collectorname as collectorname,financialyear as financialyear from public.mv_pt_receipt_regiester where tenantid=$tenantid - orderby: ORDER BY receiptdate DESC; + orderby: ORDER BY receiptnumber DESC; - reportName: CancelledReceiptRegister_V2 @@ -3784,6 +3784,11 @@ ReportDefinitions: type: string source: pt total: false + - name: paymentmode + label: reports.pt.paymentmode + type: string + source: pt + total: false - name: adhocpenalty label: reports.pt.adhocpenalty type: string @@ -3875,13 +3880,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate + searchClause: AND (EXTRACT(EPOCH FROM TO_TIMESTAMP(receiptdate, 'DD-MM-YYYY')) * 1000) >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND pd.receiptdate <= $toDate + searchClause: AND (EXTRACT(EPOCH FROM TO_TIMESTAMP(receiptdate, 'DD-MM-YYYY')) * 1000) <= $toDate - name: collectorname label: reports.pt.collectorname type: singlevaluelist @@ -3889,38 +3894,23 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER + searchClause: AND collectorname = $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 = 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode = 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode = 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode = 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode = 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode = 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode = 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode = 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode = 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode = 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode = 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode = 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode = '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(bad.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 + SELECT tenantid AS ulb,instrumenttype AS paymentmode,COUNT(DISTINCT pdid) AS noofassessments, + SUM(adhocpenalty) AS adhocpenalty,SUM(adhocrebate) AS adhocrebate, + SUM(firecess) AS firecess,SUM(cancercess) AS cancercess,SUM(interest) AS interest, + SUM(penalty) AS penalty,SUM(rebate) AS rebate,SUM(propertytax) AS propertytax, + SUM(exemption) AS exemption,SUM(adjustment) AS adjustment, + SUM(CASE WHEN instrumenttype = 'CASH' THEN adjustment ELSE 0 END) AS sumcash, + SUM(CASE WHEN instrumenttype = 'CHEQUE' THEN adjustment ELSE 0 END) AS sumcheque, + COUNT(DISTINCT CASE WHEN instrumenttype = 'CHEQUE' THEN CONCAT(instrumenttype, amount) END) AS countcheque, + SUM(CASE WHEN instrumenttype = 'ONLINE' THEN adjustment ELSE 0 END) AS sumonline, + CASE WHEN instrumenttype != 'ONLINE' THEN collectorname ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END AS collectorname, + SUM(adjustment) AS totalamount + FROM public.mv_pt_receipt_regiester + WHERE tenantid = $tenantid + groupby: group by CASE WHEN instrumenttype != 'ONLINE' THEN collectorname ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END,tenantid,instrumenttype - reportName: StateReceiptRegisterSummary_V2 summary: Receipt Register Summary From d38e34a430f4c6689944417cd3925a9a15f91ed1 Mon Sep 17 00:00:00 2001 From: M125688 Date: Thu, 17 Apr 2025 12:31:06 +0530 Subject: [PATCH 1589/1630] 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 164c8ba0a..771bab585 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1175,7 +1175,7 @@ ReportDefinitions: branchname as branchname,collectiontype as collectiontype,collectorname as collectorname, totalamount as totalamount,paymentmode as paymentmode,comments as remarks from public.echalan_receipt_register1 where ulb=$tenantid - orderby: ORDER BY receiptdate DESC + orderby: ORDER BY receiptnumber DESC - reportName: MiscReceiptStateWide_v2 From 4e388357724cde017e1d096203350944a6fb8fa0 Mon Sep 17 00:00:00 2001 From: M125688 Date: Thu, 17 Apr 2025 12:39:41 +0530 Subject: [PATCH 1590/1630] Update pt-reports.yml --- 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 08932d99f..ae8e57102 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9656,14 +9656,12 @@ ReportDefinitions: searchClause: AND split_part(rp.propertyusagetype,'.',1) = $usageType - name: fromDate label: reports.pt.fromDate - type: singlevaluelist type: epoch source: pt isMandatory: false searchClause: AND rp.createdtime >= $fromDate - name: toDate label: reports.pt.toDate - type: singlevaluelist type: epoch source: pt isMandatory: false From c012185fc68cd19e2d305a10ce238aed5bf0f4e5 Mon Sep 17 00:00:00 2001 From: M125688 Date: Thu, 17 Apr 2025 15:05:04 +0530 Subject: [PATCH 1591/1630] 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 771bab585..d9965140f 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1935,7 +1935,7 @@ ReportDefinitions: source: uc wrapper: true isMandatory: false - searchClause: AND collectorname = $collectorname + searchClause: AND collectorname = $collectorname::INTEGER query: | -- Use CTE to force query plan, compute & use CTE later select ulb as ulb, receiptnumber as receiptnumber,receiptdate as receiptdate, From 3dfaf2d19f0df512b1e83058f514776438db9c73 Mon Sep 17 00:00:00 2001 From: M125688 Date: Thu, 17 Apr 2025 15:14:06 +0530 Subject: [PATCH 1592/1630] 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 ae8e57102..e81c57c82 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2453,14 +2453,14 @@ ReportDefinitions: 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 financialyear =$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,',','_') + searchClause: AND instrumenttype = replace($paymentMode,',','_') query: | -- Use CTE to force query plan, compute & use CTE later Select receiptnumber as receiptnumber,receiptdate as receiptdate,g8issuedate as g8issuedate, From 38eaeda0bf97ab51c992a9222a23450aac3521d6 Mon Sep 17 00:00:00 2001 From: M125688 Date: Thu, 17 Apr 2025 15:59:24 +0530 Subject: [PATCH 1593/1630] 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 d9965140f..20c7e4739 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1157,7 +1157,7 @@ ReportDefinitions: source: uc wrapper: true isMandatory: false - searchClause: AND businessdetails = $businessdetails + searchClause: AND businessdetails = $businessservice - name: collectorname label: reports.uc.collectorname type: singlevaluelist From 63829aebd073a6ccf0e58e2291415a31b8a18ee7 Mon Sep 17 00:00:00 2001 From: palamgarg Date: Mon, 21 Apr 2025 13:12:11 +0530 Subject: [PATCH 1594/1630] fixed summary quer --- 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 e81c57c82..87aac8bbe 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3902,12 +3902,12 @@ ReportDefinitions: SUM(firecess) AS firecess,SUM(cancercess) AS cancercess,SUM(interest) AS interest, SUM(penalty) AS penalty,SUM(rebate) AS rebate,SUM(propertytax) AS propertytax, SUM(exemption) AS exemption,SUM(adjustment) AS adjustment, - SUM(CASE WHEN instrumenttype = 'CASH' THEN adjustment ELSE 0 END) AS sumcash, - SUM(CASE WHEN instrumenttype = 'CHEQUE' THEN adjustment ELSE 0 END) AS sumcheque, + SUM(CASE WHEN instrumenttype = 'CASH' THEN amount ELSE 0 END) AS sumcash, + SUM(CASE WHEN instrumenttype = 'CHEQUE' THEN amount ELSE 0 END) AS sumcheque, COUNT(DISTINCT CASE WHEN instrumenttype = 'CHEQUE' THEN CONCAT(instrumenttype, amount) END) AS countcheque, - SUM(CASE WHEN instrumenttype = 'ONLINE' THEN adjustment ELSE 0 END) AS sumonline, + SUM(CASE WHEN instrumenttype = 'ONLINE' THEN amount ELSE 0 END) AS sumonline, CASE WHEN instrumenttype != 'ONLINE' THEN collectorname ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END AS collectorname, - SUM(adjustment) AS totalamount + SUM(amount) AS totalamount FROM public.mv_pt_receipt_regiester WHERE tenantid = $tenantid groupby: group by CASE WHEN instrumenttype != 'ONLINE' THEN collectorname ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END,tenantid,instrumenttype From a7c9d9d54dd2f8c7754f3a7e663d0ce6d876563f Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Thu, 24 Apr 2025 15:45:57 +0530 Subject: [PATCH 1595/1630] Fixed issues WS and SW bill issues --- configs/pdf-service/data-config/sw-bill.json | 2 +- configs/pdf-service/data-config/ws-bill.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/sw-bill.json b/configs/pdf-service/data-config/sw-bill.json index 01235844d..3384a28d7 100644 --- a/configs/pdf-service/data-config/sw-bill.json +++ b/configs/pdf-service/data-config/sw-bill.json @@ -520,7 +520,7 @@ { "variable": "toPeriod", "value": { - "path": "$.billDetails[0].toPeriod" + "path": "$.billDetails[(@.length-1)].toPeriod" }, "type": "date" }, diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json index ea1b2b441..47908270b 100644 --- a/configs/pdf-service/data-config/ws-bill.json +++ b/configs/pdf-service/data-config/ws-bill.json @@ -532,7 +532,7 @@ { "variable": "toPeriod", "value": { - "path": "$.billDetails[0].toPeriod" + "path": "$.billDetails[(@.length-1)].toPeriod" }, "type": "date" }, From 4c78e6d044c22a319e7cd30ccbcb83c3bb5e31aa Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Thu, 24 Apr 2025 17:50:46 +0530 Subject: [PATCH 1596/1630] Fixed issues SW and WS bills dates --- configs/pdf-service/data-config/sw-bill.json | 4 ++-- configs/pdf-service/data-config/ws-bill.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/data-config/sw-bill.json b/configs/pdf-service/data-config/sw-bill.json index 3384a28d7..52617101f 100644 --- a/configs/pdf-service/data-config/sw-bill.json +++ b/configs/pdf-service/data-config/sw-bill.json @@ -513,14 +513,14 @@ { "variable": "fromPeriod", "value": { - "path": "$.billDetails[0].fromPeriod" + "path": "$.billDetails[(@.length-1)].fromPeriod" }, "type": "date" }, { "variable": "toPeriod", "value": { - "path": "$.billDetails[(@.length-1)].toPeriod" + "path": "$.billDetails[0].toPeriod" }, "type": "date" }, diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json index 47908270b..80fc2ade5 100644 --- a/configs/pdf-service/data-config/ws-bill.json +++ b/configs/pdf-service/data-config/ws-bill.json @@ -525,14 +525,14 @@ { "variable": "fromPeriod", "value": { - "path": "$.billDetails[0].fromPeriod" + "path": "$.billDetails[(@.length-1)].fromPeriod" }, "type": "date" }, { "variable": "toPeriod", "value": { - "path": "$.billDetails[(@.length-1)].toPeriod" + "path": "$.billDetails[0].toPeriod" }, "type": "date" }, From 533b96023d0539e2eaeb3472c32e71c1a0eceed8 Mon Sep 17 00:00:00 2001 From: M125688 Date: Fri, 25 Apr 2025 16:00:02 +0530 Subject: [PATCH 1597/1630] 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 20c7e4739..5a6af19be 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1935,7 +1935,7 @@ ReportDefinitions: source: uc wrapper: true isMandatory: false - searchClause: AND collectorname = $collectorname::INTEGER + searchClause: AND collectorname = $collectorname query: | -- Use CTE to force query plan, compute & use CTE later select ulb as ulb, receiptnumber as receiptnumber,receiptdate as receiptdate, From 44a3ee76546ba243e9286f80864c236fae1822a4 Mon Sep 17 00:00:00 2001 From: M125688 Date: Fri, 25 Apr 2025 16:19:17 +0530 Subject: [PATCH 1598/1630] 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 5a6af19be..f88de89d3 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1165,7 +1165,7 @@ ReportDefinitions: source: uc wrapper: true isMandatory: false - searchClause: AND collectorname = $collectorname::INTEGER + searchClause: AND collectorname = $collectorname query: | -- Use CTE to force query plan, compute & use CTE later select ulb as ulb,receiptnumber as receiptnumber,receiptdate as receiptdate, From 3af47037b825530072cd31e873b13bebfaad22ef Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 28 Apr 2025 15:06:44 +0530 Subject: [PATCH 1599/1630] GenratedDemandReport FY dates --- configs/reports/configs/ws-reports.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index a765c1e54..82a839779 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1901,12 +1901,13 @@ ReportDefinitions: source: ws total: false searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt + - name: fy + label: FY + type: singlevaluelist + pattern: 'list://1680201000000 and 1711823400000:2023-24,1711823400000 and 1743359400000:2024-25' + source: ws isMandatory: true - searchClause: and 1=1 + searchClause: 1=1 query: | WITH quarterly_data AS ( SELECT @@ -1924,7 +1925,7 @@ ReportDefinitions: LEFT JOIN eg_ws_connection d4 ON d4.connectionno = d1.consumercode LEFT JOIN eg_ws_service ser ON d4.id = ser.connection_id LEFT JOIN eg_pt_property d5 ON d4.property_id = d5.propertyid - WHERE d1.taxperiodfrom >= $fromDate + WHERE d1.taxperiodfrom between $fy AND d1.tenantid = $tenantid AND d1.status != 'CANCELLED' AND d1.businessservice = 'WS' and ser.connectiontype!='Metered' From 4b920184712a8558938f6cac5c75c753a5b85eee Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 28 Apr 2025 15:10:35 +0530 Subject: [PATCH 1600/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 82a839779..5d399f8f5 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1907,7 +1907,7 @@ ReportDefinitions: pattern: 'list://1680201000000 and 1711823400000:2023-24,1711823400000 and 1743359400000:2024-25' source: ws isMandatory: true - searchClause: 1=1 + searchClause: and 1=1 query: | WITH quarterly_data AS ( SELECT From 43ebdec4d6a40e2ac155942f43aac8eff777fe3a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 28 Apr 2025 16:13:10 +0530 Subject: [PATCH 1601/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 5d399f8f5..c18c66a0b 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1904,7 +1904,7 @@ ReportDefinitions: - name: fy label: FY type: singlevaluelist - pattern: 'list://1680201000000 and 1711823400000:2023-24,1711823400000 and 1743359400000:2024-25' + pattern: 'list://1680201000000' and '1711823400000:2023-24,1711823400000' and '1743359400000:2024-25' source: ws isMandatory: true searchClause: and 1=1 From 3d14770cf42c5330bb70e3448c28c29fff890da1 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 28 Apr 2025 16:25:38 +0530 Subject: [PATCH 1602/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index c18c66a0b..5d399f8f5 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1904,7 +1904,7 @@ ReportDefinitions: - name: fy label: FY type: singlevaluelist - pattern: 'list://1680201000000' and '1711823400000:2023-24,1711823400000' and '1743359400000:2024-25' + pattern: 'list://1680201000000 and 1711823400000:2023-24,1711823400000 and 1743359400000:2024-25' source: ws isMandatory: true searchClause: and 1=1 From 571b36be379f5bc432a0f39d22157b088cf2490f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 28 Apr 2025 17:00:46 +0530 Subject: [PATCH 1603/1630] from fy and to fy paramaters in GenerateWaterDemand Report --- configs/reports/configs/ws-reports.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 5d399f8f5..f148918c1 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1901,10 +1901,17 @@ ReportDefinitions: source: ws total: false searchParams: - - name: fy - label: FY + - name: fromfy + label: From_FY type: singlevaluelist - pattern: 'list://1680201000000 and 1711823400000:2023-24,1711823400000 and 1743359400000:2024-25' + pattern: 'list://1617129000000:2021,1648665000000:2022,1680201000000:2023,1711823400000:2024,1743359400000:2025' + source: ws + isMandatory: true + searchClause: and 1=1 + - name: tofy + label: To_FY + type: singlevaluelist + pattern: 'list://1648665000000:2022,1680201000000:2023,1711823400000:2024,1743359400000:2025,1774895400000:2026' source: ws isMandatory: true searchClause: and 1=1 @@ -1925,7 +1932,7 @@ ReportDefinitions: LEFT JOIN eg_ws_connection d4 ON d4.connectionno = d1.consumercode LEFT JOIN eg_ws_service ser ON d4.id = ser.connection_id LEFT JOIN eg_pt_property d5 ON d4.property_id = d5.propertyid - WHERE d1.taxperiodfrom between $fy + WHERE d1.taxperiodfrom >= $fromfy and d1.taxperiodfrom <= $tofy AND d1.tenantid = $tenantid AND d1.status != 'CANCELLED' AND d1.businessservice = 'WS' and ser.connectiontype!='Metered' From da6ea4d350880f20d035dacf579ba09ca9453094 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 28 Apr 2025 17:15:15 +0530 Subject: [PATCH 1604/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index f148918c1..5da826e51 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1932,7 +1932,7 @@ ReportDefinitions: LEFT JOIN eg_ws_connection d4 ON d4.connectionno = d1.consumercode LEFT JOIN eg_ws_service ser ON d4.id = ser.connection_id LEFT JOIN eg_pt_property d5 ON d4.property_id = d5.propertyid - WHERE d1.taxperiodfrom >= $fromfy and d1.taxperiodfrom <= $tofy + WHERE d1.taxperiodfrom::text >= $fromfy and d1.taxperiodfrom::text <= $tofy AND d1.tenantid = $tenantid AND d1.status != 'CANCELLED' AND d1.businessservice = 'WS' and ser.connectiontype!='Metered' From 628c96d3ee55f7c420c74b4738feec298ea3d195 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 28 Apr 2025 17:34:03 +0530 Subject: [PATCH 1605/1630] Update ws-reports.yml --- configs/reports/configs/ws-reports.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 5da826e51..a5b287893 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1973,12 +1973,20 @@ ReportDefinitions: source: ws total: false searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt + - name: fromfy + label: From_FY + type: singlevaluelist + pattern: 'list://1617129000000:2021,1648665000000:2022,1680201000000:2023,1711823400000:2024,1743359400000:2025' + source: ws isMandatory: true searchClause: and 1=1 + - name: tofy + label: To_FY + type: singlevaluelist + pattern: 'list://1648665000000:2022,1680201000000:2023,1711823400000:2024,1743359400000:2025,1774895400000:2026' + source: ws + isMandatory: true + searchClause: and 1=1 query: | WITH quarterly_data AS ( SELECT @@ -1996,7 +2004,7 @@ ReportDefinitions: LEFT JOIN eg_sw_connection d4 ON d4.connectionno = d1.consumercode LEFT JOIN eg_sw_service ser ON d4.id = ser.connection_id LEFT JOIN eg_pt_property d5 ON d4.property_id = d5.propertyid - WHERE d1.taxperiodfrom >= $fromDate + WHERE d1.taxperiodfrom::text >= $fromfy and d1.taxperiodfrom::text <= $tofy AND d1.tenantid = $tenantid AND d1.status != 'CANCELLED' AND d1.businessservice = 'SW' and ser.connectiontype!='Metered' From e7c5767476d30b9bb6314f2f43f298cec5f5d590 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Wed, 30 Apr 2025 10:11:57 +0530 Subject: [PATCH 1606/1630] Create swach-persister.yml --- configs/egov-persister/swach-persister.yml | 136 +++++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 configs/egov-persister/swach-persister.yml diff --git a/configs/egov-persister/swach-persister.yml b/configs/egov-persister/swach-persister.yml new file mode 100644 index 000000000..cf6376737 --- /dev/null +++ b/configs/egov-persister/swach-persister.yml @@ -0,0 +1,136 @@ +serviceMaps: + serviceName: swach-services + mappings: + - version: 1.0 + description: Persists swach service request in tables + fromTopic: save-swach-request + isTransaction: true + queryMaps: + - query: > + INSERT INTO eg_swach_service_v2(id, tenantid, servicecode, servicerequestid, description, + accountid, additionaldetails, applicationstatus, source, createdby, createdtime, + lastmodifiedby, lastmodifiedtime) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: service + jsonMaps: + - jsonPath: $.service.id + - jsonPath: $.service.tenantId + - jsonPath: $.service.serviceCode + - jsonPath: $.service.serviceRequestId + - jsonPath: $.service.description + - jsonPath: $.service.accountId + - jsonPath: $.service.additionalDetail + type: JSON + dbType: JSONB + - jsonPath: $.service.applicationStatus + - jsonPath: $.service.source + - jsonPath: $.service.auditDetails.createdBy + - jsonPath: $.service.auditDetails.createdTime + - jsonPath: $.service.auditDetails.lastModifiedBy + - jsonPath: $.service.auditDetails.lastModifiedTime + + - query: > + INSERT INTO eg_swach_address_v2(id, tenantid, parentid, doorno, plotno, buildingname, + street, landmark, city, pincode, locality, district, region, state, country, latitude, + longitude, additionaldetails, createdby, createdtime, lastmodifiedby, lastmodifiedtime) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: service.address + jsonMaps: + - jsonPath: $.service.address.id + - jsonPath: $.service.address.tenantId + - jsonPath: $.service.id + - jsonPath: $.service.address.doorNo + - jsonPath: $.service.address.plotNo + - jsonPath: $.service.address.buildingName + - jsonPath: $.service.address.street + - jsonPath: $.service.address.landmark + - jsonPath: $.service.address.city + - jsonPath: $.service.address.pincode + - jsonPath: $.service.address.locality.code + - jsonPath: $.service.address.district + - jsonPath: $.service.address.region + - jsonPath: $.service.address.state + - jsonPath: $.service.address.country + - jsonPath: $.service.address.geoLocation.latitude + - jsonPath: $.service.address.geoLocation.longitude + - jsonPath: $.service.address.additionalDetails + type: JSON + dbType: JSONB + - jsonPath: $.service.auditDetails.createdBy + - jsonPath: $.service.auditDetails.createdTime + - jsonPath: $.service.auditDetails.lastModifiedBy + - jsonPath: $.service.auditDetails.lastModifiedTime + + - version: 1.0 + description: Updates swach service request in tables + fromTopic: update-swach-request + isTransaction: true + queryMaps: + - query: > + UPDATE eg_swach_service_v2 SET servicecode=?, rating=?, servicerequestid=?, + description=?, accountid=?, additionaldetails=?, applicationstatus=?, + lastmodifiedby=?, lastmodifiedtime=? WHERE id=?; + basePath: service + jsonMaps: + - jsonPath: $.service.serviceCode + - jsonPath: $.service.rating + - jsonPath: $.service.serviceRequestId + - jsonPath: $.service.description + - jsonPath: $.service.accountId + - jsonPath: $.service.additionalDetail + type: JSON + dbType: JSONB + - jsonPath: $.service.applicationStatus + - jsonPath: $.service.auditDetails.lastModifiedBy + - jsonPath: $.service.auditDetails.lastModifiedTime + - jsonPath: $.service.id + + - query: > + UPDATE eg_swach_address_v2 SET doorno=?, plotno=?, buildingname=?, street=?, landmark=?, + city=?, pincode=?, locality=?, district=?, region=?, state=?, country=?, latitude=?, + longitude=?, additionaldetails=?, lastmodifiedby=?, lastmodifiedtime=? WHERE id=?; + basePath: service.address + jsonMaps: + - jsonPath: $.service.address.doorNo + - jsonPath: $.service.address.plotNo + - jsonPath: $.service.address.buildingName + - jsonPath: $.service.address.street + - jsonPath: $.service.address.landmark + - jsonPath: $.service.address.city + - jsonPath: $.service.address.pincode + - jsonPath: $.service.address.locality.code + - jsonPath: $.service.address.district + - jsonPath: $.service.address.region + - jsonPath: $.service.address.state + - jsonPath: $.service.address.country + - jsonPath: $.service.address.geoLocation.latitude + - jsonPath: $.service.address.geoLocation.longitude + - jsonPath: $.service.address.additionalDetails + type: JSON + dbType: JSONB + - jsonPath: $.service.auditDetails.lastModifiedBy + - jsonPath: $.service.auditDetails.lastModifiedTime + - jsonPath: $.service.address.id + + - version: 1.0 + description: Persists image data service request in tables + fromTopic: save-image-request + isTransaction: true + queryMaps: + - query: > + INSERT INTO egov_swach_imagedata(tenant_id, uuid, latitude, longitude, locality, + imagerurl, created_time, created_by, last_updated_time, last_updated_by) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: ImageData + jsonMaps: + - jsonPath: $.ImageData.tenantId + - jsonPath: $.ImageData.useruuid + - jsonPath: $.ImageData.latitude + - jsonPath: $.ImageData.longitude + - jsonPath: $.ImageData.locality + - jsonPath: $.ImageData.imagerurl + - jsonPath: $.ImageData.auditDetails.createdTime + - jsonPath: $.ImageData.auditDetails.createdBy + - jsonPath: $.ImageData.auditDetails.lastModifiedTime + - jsonPath: $.ImageData.auditDetails.lastModifiedBy + From 9909008f61a9d47890cf41ecfde5b15c828f89d6 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Wed, 30 Apr 2025 12:54:34 +0530 Subject: [PATCH 1607/1630] Update swach-persister.yml --- configs/egov-persister/swach-persister.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/configs/egov-persister/swach-persister.yml b/configs/egov-persister/swach-persister.yml index cf6376737..4e5f4e4a5 100644 --- a/configs/egov-persister/swach-persister.yml +++ b/configs/egov-persister/swach-persister.yml @@ -32,8 +32,8 @@ serviceMaps: - query: > INSERT INTO eg_swach_address_v2(id, tenantid, parentid, doorno, plotno, buildingname, street, landmark, city, pincode, locality, district, region, state, country, latitude, - longitude, additionaldetails, createdby, createdtime, lastmodifiedby, lastmodifiedtime) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + longitude, createdby, createdtime, lastmodifiedby, lastmodifiedtime) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); basePath: service.address jsonMaps: - jsonPath: $.service.address.id @@ -53,9 +53,6 @@ serviceMaps: - jsonPath: $.service.address.country - jsonPath: $.service.address.geoLocation.latitude - jsonPath: $.service.address.geoLocation.longitude - - jsonPath: $.service.address.additionalDetails - type: JSON - dbType: JSONB - jsonPath: $.service.auditDetails.createdBy - jsonPath: $.service.auditDetails.createdTime - jsonPath: $.service.auditDetails.lastModifiedBy @@ -88,7 +85,7 @@ serviceMaps: - query: > UPDATE eg_swach_address_v2 SET doorno=?, plotno=?, buildingname=?, street=?, landmark=?, city=?, pincode=?, locality=?, district=?, region=?, state=?, country=?, latitude=?, - longitude=?, additionaldetails=?, lastmodifiedby=?, lastmodifiedtime=? WHERE id=?; + longitude=?, lastmodifiedby=?, lastmodifiedtime=? WHERE id=?; basePath: service.address jsonMaps: - jsonPath: $.service.address.doorNo @@ -105,9 +102,6 @@ serviceMaps: - jsonPath: $.service.address.country - jsonPath: $.service.address.geoLocation.latitude - jsonPath: $.service.address.geoLocation.longitude - - jsonPath: $.service.address.additionalDetails - type: JSON - dbType: JSONB - jsonPath: $.service.auditDetails.lastModifiedBy - jsonPath: $.service.auditDetails.lastModifiedTime - jsonPath: $.service.address.id From bc9d66a61688ed95ba589f790805a51863295cc2 Mon Sep 17 00:00:00 2001 From: simar1977 <70640496+simar1977@users.noreply.github.com> Date: Thu, 1 May 2025 13:47:31 +0530 Subject: [PATCH 1608/1630] Update ws-reports.yml Updated query for Water Demand Report --- configs/reports/configs/ws-reports.yml | 37 +++++++++++++++----------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index a5b287893..fe4bba5e1 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1923,31 +1923,38 @@ ReportDefinitions: WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) BETWEEN 4 AND 6 THEN 'Quarter 1' WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) BETWEEN 7 AND 9 THEN 'Quarter 2' WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) BETWEEN 10 AND 12 THEN 'Quarter 3' - ELSE 'Quarter 4' + ELSE 'Quarter 4' END AS quarter, - COUNT(DISTINCT d1.consumercode) AS distinct_consumercode_count, - d5.usagecategory AS UsageType + to_char(to_timestamp(d1.taxperiodfrom / 1000), 'YYYY-MM-DD') AS tax_period_from_date, + COUNT(DISTINCT d1.consumercode) AS distinct_consumercode_count, + SUM(d2.taxamount) AS total_demand_amount, + SUM(d2.collectionamount) AS total_collected_amount, + SUM(d2.taxamount - d2.collectionamount ) AS arrears, + d5.usagecategory AS UsageType FROM egbs_demand_v1 d1 - LEFT JOIN eg_ws_connection d4 ON d4.connectionno = d1.consumercode - LEFT JOIN eg_ws_service ser ON d4.id = ser.connection_id - LEFT JOIN eg_pt_property d5 ON d4.property_id = d5.propertyid + LEFT JOIN egbs_demanddetail_v1 d2 ON d1.id = d2.demandid + LEFT JOIN eg_ws_connection d4 ON d4.connectionno = d1.consumercode + LEFT JOIN eg_pt_property d5 ON d4.property_id = d5.propertyid WHERE d1.taxperiodfrom::text >= $fromfy and d1.taxperiodfrom::text <= $tofy - AND d1.tenantid = $tenantid + AND d1.tenantid = $tenantid AND d1.status != 'CANCELLED' - AND d1.businessservice = 'WS' and ser.connectiontype!='Metered' - AND d5.usagecategory IS NOT NULL + AND d4.status = 'Active' + AND d1.businessservice = 'WS' GROUP BY - year, quarter, ser.connectiontype, d5.usagecategory + year, quarter, tax_period_from_date ,UsageType ) SELECT - year || '->' || quarter AS quarter, - COALESCE(CAST(distinct_consumercode_count AS TEXT), '0') AS distinct_consumercode_count, - UsageType + year || '->' || quarter AS quarter, + tax_period_from_date, + COALESCE(CAST(total_demand_amount AS TEXT), 'No Tax amount') AS total_demand_amount, + COALESCE(CAST(total_collected_amount AS TEXT), 'No Collection Amount') AS total_collected_amount, + COALESCE(CAST(arrears AS TEXT), 'Nill') AS Arrears, + COALESCE(CAST(distinct_consumercode_count AS TEXT), '0') AS distinct_consumercode_count, + UsageType FROM - quarterly_data - where 1=1 + quarterly_data where 1=1 - reportName: GeneratSWDemandReport summary: Sewerage Demand Report From a824ea730736b6b5d10090c205aa23f231385926 Mon Sep 17 00:00:00 2001 From: M125688 Date: Thu, 1 May 2025 14:22:12 +0530 Subject: [PATCH 1609/1630] Update pending.yml added wspendencydetails reports in this --- configs/reports/configs/pending.yml | 61 +++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index 0adfe0fb6..078d95bc3 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -314,3 +314,64 @@ ReportDefinitions: ON ta.servicename = pa.servicename AND ta.tenantid = pa.tenantid WHERE 1=1 + + + - reportName: wspendencydetails + summary: Pendency Details - Water Service + version: 1.0.0 + moduleName: service + sourceColumns: + - name: tenantid + label: tenantid + type: string + source: rainmaker-misc + total: false + - name: applicationno + label: applicationno + type: string + source: rainmaker-misc + total: false + - name: applicationstatus + label: applicationstatus + type: string + source: rainmaker-misc + total: false + - name: created_on + label: created_on + type: string + source: rainmaker-misc + total: false + - name: assigned_to_employee + label: assigned_to_employee + type: string + source: rainmaker-misc + total: false + - name: assigned_on + label: assigned_on + type: string + source: rainmaker-misc + total: false + searchParams: + - name: tenantId + label: tenantid + type: singlevaluelist + pattern: http://localhost:8094/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: rainmaker-misc + wrapper: true + isMandatory: false + searchClause: AND ta.tenantid =$tenantid + query: | + SELECT c.tenantid as tenantid, applicationno, applicationstatus, + TO_CHAR(TO_TIMESTAMP(c.createdtime / 1000) AT TIME ZONE 'Asia/Kolkata', 'DD-MM-YYYY') as created_on, + u.name as assigned_to_employee, + TO_CHAR(TO_TIMESTAMP(assigned.createdtime / 1000) AT TIME ZONE 'Asia/Kolkata', 'DD-MM-YYYY') as assigned_on + FROM eg_ws_connection c INNER JOIN ( SELECT id,businessid + FROM eg_wf_processinstance_v2 pi + WHERE (businessid, createdtime) IN (SELECT businessid, MAX(createdtime) + FROM eg_wf_processinstance_v2 + GROUP BY businessid)) pi ON pi.businessid = c.applicationno + left outer join eg_wf_assignee_v2 assigned on assigned.processinstanceid=pi.id + left outer join eg_user u on u.uuid=assigned.assignee + WHERE c.applicationstatus in ('PENDING_FOR_DOCUMENT_VERIFICATION','PENDING_FOR_FIELD_INSPECTION','PENDING_FOR_APPROVAL','PENDING_APPROVAL_FOR_CONNECTION') + and c.createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 15 * 24 * 60 * 60 * 1000) + AND c.tenantid = $tenantid From 862110896b8c26cb6a58f046b28c9afc0d6f8781 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 May 2025 10:33:36 +0530 Subject: [PATCH 1610/1630] Update pt-reports.yml added 2025-26 fy pt --- 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 87aac8bbe..701cb1472 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4667,7 +4667,7 @@ ReportDefinitions: - 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,2024-25:2024-25' + 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,2024-25:2024-25,2025-26:2025-26' source: pt isMandatory: true searchClause: AND 1=1 @@ -6064,7 +6064,7 @@ ReportDefinitions: - 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,2024-25:2024-25' + 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,2024-25:2024-25,2025-26:2025-26' source: pt isMandatory: false searchClause: AND 1=1 @@ -8336,7 +8336,7 @@ ReportDefinitions: - 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,2024-25:2024-25' + 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,2024-25:2024-25,2025-26:2025-26' 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 @@ -9036,7 +9036,7 @@ ReportDefinitions: - 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,2024-25:2024-25' + 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,2024-25:2024-25,2025-26:2025-26' source: pt isMandatory: true searchClause: AND 1=1 @@ -9344,7 +9344,7 @@ ReportDefinitions: - 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,2024-25:2024-25' + 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,2024-25:2024-25,2025-26:2025-26' source: pt isMandatory: false searchClause: and d.fy like concat('%',$fy,'%') @@ -9507,7 +9507,7 @@ ReportDefinitions: - 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,2024-25:2024-25' + 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,2024-25:2024-25,2025-26:2025-26' source: pt isMandatory: false searchClause: and d.fy like concat('%',$fy,'%') From 31d67950680a3d82fa09f782f0e01fd0c30f14d1 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 May 2025 10:35:35 +0530 Subject: [PATCH 1611/1630] 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 701cb1472..bb6596fe6 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -9202,7 +9202,7 @@ ReportDefinitions: - 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,2024-25:2024-25' + 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,2024-25:2024-25,2025-26:2025-26' source: pt isMandatory: true searchClause: AND 1=1 From e1d532ac3b51df1da45baf5640dcf30c3906a6d7 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 May 2025 17:20:52 +0530 Subject: [PATCH 1612/1630] added water and sewerage SLA pendency report --- configs/reports/configs/ws-reports.yml | 304 +++++++++++++++++++++++++ 1 file changed, 304 insertions(+) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index fe4bba5e1..4b8fea7a9 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -3863,3 +3863,307 @@ ReportDefinitions: and receipt_breakup.pdid=pd.id --and pt_addr.propertyid=pt.id orderby: ORDER BY pd.receiptdate DESC; + +- reportName: waterPendingSlaReport + summary: Water SLA Pendency Report + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: tenantid + label: reports.ws.tenantid + type: string + source: ws + total: false + - name: applicationno + label: reports.ws.applicationno + type: string + source: ws + total: false + - name: applicationstatus + label: reports.ws.applicationstatus + type: string + source: ws + total: false + - name: connectionno + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: ledgerid + label: reports.ws.ledgerid + type: string + source: ws + total: false + - name: group + label: reports.ws.group + type: string + source: ws + total: false + - name: usagecategory + label: reports.ws.usagecategory + type: string + source: ws + total: false + - name: connectioncategory + label: reports.ws.connectioncategory + type: string + source: ws + total: false + - name: createdon + label: reports.ws.createdon + type: string + source: ws + total: false + - name: executiondate + label: reports.ws.executiondate + type: string + source: ws + total: false + - name: paymentdate + label: reports.ws.paymentdate + type: string + source: ws + total: false + - name: assignedemployee + label: reports.ws.assignedemployee + type: string + source: ws + total: false + - name: assignedon + label: reports.ws.assignedon + type: string + source: ws + total: false + - name: dayspendency + label: reports.ws.dayspendency + type: string + source: ws + total: false + - name: assignedfordays + label: reports.ws.assignedfordays + type: string + source: ws + total: false + - name: plotsize + label: reports.ws.plotsize + type: string + source: ws + total: false + - name: oldpropertyid + label: reports.ws.oldpropertyid + type: string + source: ws + total: false + - name: address + label: reports.ws.address + type: string + source: ws + total: false + - name: localityname + label: reports.ws.locality + type: string + source: ws + total: false + - name: propertyusagetype + label: reports.ws.propertyusagetype + type: string + source: ws + total: false + searchParams: + query: | + SELECT + c.tenantid as tenantid, + c.applicationno as applicationno, + c.applicationstatus as applicationstatus, + c.connectionno as connectionno, + c.additionaldetails->>'ledgerId' as ledgerid, + c.additionaldetails->>'groups' as group, + c.additionaldetails->>'waterSubUsageType' as usagecategory, + c.additionaldetails->>'connectionCategory' as connctionCategory, + TO_CHAR(TO_TIMESTAMP(c.createdtime / 1000), 'dd-MM-yyyy') AS createdon, + TO_CHAR(TO_TIMESTAMP(s.connectionexecutiondate / 1000), 'dd-MM-yyyy') as executiondate, + TO_CHAR(TO_TIMESTAMP(pist.createdtime / 1000), 'dd-MM-yyyy') as paymentdate, + e.code AS assignedemployee, + TO_CHAR(TO_TIMESTAMP(assigned.createdtime / 1000), 'dd-MM-yyyy') AS assignedon, + FLOOR((EXTRACT(EPOCH FROM NOW()) - c.createdtime / 1000) / 86400) AS dayspendency, + FLOOR((EXTRACT(EPOCH FROM NOW()) - assigned.createdtime / 1000) / 86400) AS assignedfordays, + pt.plotsize, + pt.oldpropertyid as oldpropertyid, + pt.address as address, + pt.localityname as localityname, + pt.propertyusagetype as propertyusagetype + FROM eg_ws_connection c + INNER JOIN ( + SELECT id, businessid + FROM eg_wf_processinstance_v2 pi + WHERE (businessid, createdtime) IN ( + SELECT businessid, MAX(createdtime) + FROM eg_wf_processinstance_v2 + GROUP BY businessid + ) + ) pi ON pi.businessid = c.applicationno + LEFT OUTER JOIN eg_wf_assignee_v2 assigned ON assigned.processinstanceid = pi.id + LEFT OUTER JOIN eg_hrms_employee e ON e.uuid = assigned.assignee + inner join report_properties pt on (pt.propertyid=c.property_id and pt.propertystatus='ACTIVE') + inner join eg_ws_service s on s.connection_id=c.id + left outer join eg_wf_processinstance_v2 pist on (pist.businessid=c.applicationno and pist.action='PAY') + WHERE c.tenantid = 'pb.patiala' + and c.applicationstatus in ('PENDING_FOR_DOCUMENT_VERIFICATION','PENDING_FOR_FIELD_INSPECTION','PENDING_FOR_APPROVAL','PENDING_APPROVAL_FOR_CONNECTION') + and c.createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 9 * 24 * 60 * 60 * 1000) + + +- reportName: seweragePendingSlaReport + summary: Sewerage SLA Pendency Report + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: tenantid + label: reports.ws.tenantid + type: string + source: ws + total: false + - name: applicationno + label: reports.ws.applicationno + type: string + source: ws + total: false + - name: applicationstatus + label: reports.ws.applicationstatus + type: string + source: ws + total: false + - name: connectionno + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: ledgerid + label: reports.ws.ledgerid + type: string + source: ws + total: false + - name: group + label: reports.ws.group + type: string + source: ws + total: false + - name: usagecategory + label: reports.ws.usagecategory + type: string + source: ws + total: false + - name: connectioncategory + label: reports.ws.connectioncategory + type: string + source: ws + total: false + - name: createdon + label: reports.ws.createdon + type: string + source: ws + total: false + - name: executiondate + label: reports.ws.executiondate + type: string + source: ws + total: false + - name: paymentdate + label: reports.ws.paymentdate + type: string + source: ws + total: false + - name: assignedemployee + label: reports.ws.assignedemployee + type: string + source: ws + total: false + - name: assignedon + label: reports.ws.assignedon + type: string + source: ws + total: false + - name: dayspendency + label: reports.ws.dayspendency + type: string + source: ws + total: false + - name: assignedfordays + label: reports.ws.assignedfordays + type: string + source: ws + total: false + - name: plotsize + label: reports.ws.plotsize + type: string + source: ws + total: false + - name: oldpropertyid + label: reports.ws.oldpropertyid + type: string + source: ws + total: false + - name: address + label: reports.ws.address + type: string + source: ws + total: false + - name: localityname + label: reports.ws.locality + type: string + source: ws + total: false + - name: propertyusagetype + label: reports.ws.propertyusagetype + type: string + source: ws + total: false + searchParams: + query: | + SELECT + c.tenantid as tenantid, + c.applicationno as applicationno, + c.applicationstatus as applicationstatus, + c.connectionno as connectionno, + c.additionaldetails->>'ledgerId' as ledgerid, + c.additionaldetails->>'groups' as group, + c.additionaldetails->>'waterSubUsageType' as usagecategory, + c.additionaldetails->>'connectionCategory' as connctionCategory, + TO_CHAR(TO_TIMESTAMP(c.createdtime / 1000), 'dd-MM-yyyy') AS createdon, + TO_CHAR(TO_TIMESTAMP(s.connectionexecutiondate / 1000), 'dd-MM-yyyy') as executiondate, + TO_CHAR(TO_TIMESTAMP(pist.createdtime / 1000), 'dd-MM-yyyy') as paymentdate, + e.code AS assignedemployee, + TO_CHAR(TO_TIMESTAMP(assigned.createdtime / 1000), 'dd-MM-yyyy') AS assignedon, + FLOOR((EXTRACT(EPOCH FROM NOW()) - c.createdtime / 1000) / 86400) AS dayspendency, + FLOOR((EXTRACT(EPOCH FROM NOW()) - assigned.createdtime / 1000) / 86400) AS assignedfordays, + pt.plotsize, + pt.oldpropertyid as oldpropertyid, + pt.address as address, + pt.localityname as localityname, + pt.propertyusagetype as propertyusagetype + FROM eg_sw_connection c + INNER JOIN ( + SELECT id, businessid + FROM eg_wf_processinstance_v2 pi + WHERE (businessid, createdtime) IN ( + SELECT businessid, MAX(createdtime) + FROM eg_wf_processinstance_v2 + GROUP BY businessid + ) + ) pi ON pi.businessid = c.applicationno + LEFT OUTER JOIN eg_wf_assignee_v2 assigned ON assigned.processinstanceid = pi.id + LEFT OUTER JOIN eg_hrms_employee e ON e.uuid = assigned.assignee + inner join report_properties pt on (pt.propertyid=c.property_id and pt.propertystatus='ACTIVE') + inner join eg_sw_service s on s.connection_id=c.id + left outer join eg_wf_processinstance_v2 pist on (pist.businessid=c.applicationno and pist.action='PAY') + WHERE c.tenantid = 'pb.patiala' + and c.applicationstatus in ('PENDING_FOR_DOCUMENT_VERIFICATION','PENDING_FOR_FIELD_INSPECTION','PENDING_FOR_APPROVAL','PENDING_APPROVAL_FOR_CONNECTION') + and c.createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 9 * 24 * 60 * 60 * 1000) + + + From 2fae401d3f05e10fa0e632a9e46c30d9ffafcb7f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 6 May 2025 18:02:47 +0530 Subject: [PATCH 1613/1630] optimised waterPendingSlaApplications and seweragePendingSlaApplications --- configs/reports/configs/ws-reports.yml | 113 ++++++++++++------------- 1 file changed, 55 insertions(+), 58 deletions(-) diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml index 4b8fea7a9..31f0b085f 100644 --- a/configs/reports/configs/ws-reports.yml +++ b/configs/reports/configs/ws-reports.yml @@ -1923,25 +1923,25 @@ ReportDefinitions: WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) BETWEEN 4 AND 6 THEN 'Quarter 1' WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) BETWEEN 7 AND 9 THEN 'Quarter 2' WHEN EXTRACT(MONTH FROM to_timestamp(d1.taxperiodfrom / 1000)) BETWEEN 10 AND 12 THEN 'Quarter 3' - ELSE 'Quarter 4' - END AS quarter, - to_char(to_timestamp(d1.taxperiodfrom / 1000), 'YYYY-MM-DD') AS tax_period_from_date, - COUNT(DISTINCT d1.consumercode) AS distinct_consumercode_count, - SUM(d2.taxamount) AS total_demand_amount, - SUM(d2.collectionamount) AS total_collected_amount, - SUM(d2.taxamount - d2.collectionamount ) AS arrears, - d5.usagecategory AS UsageType - FROM + ELSE 'Quarter 4' + END AS quarter, + to_char(to_timestamp(d1.taxperiodfrom / 1000), 'YYYY-MM-DD') AS tax_period_from_date, + COUNT(DISTINCT d1.consumercode) AS distinct_consumercode_count, + SUM(d2.taxamount) AS total_demand_amount, + SUM(d2.collectionamount) AS total_collected_amount, + SUM(d2.taxamount - d2.collectionamount ) AS arrears, + d5.usagecategory AS UsageType + FROM egbs_demand_v1 d1 LEFT JOIN egbs_demanddetail_v1 d2 ON d1.id = d2.demandid LEFT JOIN eg_ws_connection d4 ON d4.connectionno = d1.consumercode - LEFT JOIN eg_pt_property d5 ON d4.property_id = d5.propertyid - WHERE d1.taxperiodfrom::text >= $fromfy and d1.taxperiodfrom::text <= $tofy - AND d1.tenantid = $tenantid - AND d1.status != 'CANCELLED' - AND d4.status = 'Active' - AND d1.businessservice = 'WS' - GROUP BY + LEFT JOIN eg_pt_property d5 ON d4.property_id = d5.propertyid + WHERE d1.taxperiodfrom::text >= $fromfy and d1.taxperiodfrom::text <= $tofy + AND d1.tenantid = $tenantid + AND d1.status != 'CANCELLED' + AND d4.status = 'Active' + AND d1.businessservice = 'WS' + GROUP BY year, quarter, tax_period_from_date ,UsageType ) @@ -1950,12 +1950,12 @@ ReportDefinitions: tax_period_from_date, COALESCE(CAST(total_demand_amount AS TEXT), 'No Tax amount') AS total_demand_amount, COALESCE(CAST(total_collected_amount AS TEXT), 'No Collection Amount') AS total_collected_amount, - COALESCE(CAST(arrears AS TEXT), 'Nill') AS Arrears, + COALESCE(CAST(arrears AS TEXT), 'Nill') AS Arrears, COALESCE(CAST(distinct_consumercode_count AS TEXT), '0') AS distinct_consumercode_count, - UsageType + UsageType FROM quarterly_data where 1=1 - + - reportName: GeneratSWDemandReport summary: Sewerage Demand Report version: 1.0.0 @@ -3864,7 +3864,7 @@ ReportDefinitions: --and pt_addr.propertyid=pt.id orderby: ORDER BY pd.receiptdate DESC; -- reportName: waterPendingSlaReport +- reportName: waterPendingSlaApplications summary: Water SLA Pendency Report version: 1.0.0 moduleName: rainmaker-ws @@ -3978,30 +3978,30 @@ ReportDefinitions: c.tenantid as tenantid, c.applicationno as applicationno, c.applicationstatus as applicationstatus, - c.connectionno as connectionno, - c.additionaldetails->>'ledgerId' as ledgerid, - c.additionaldetails->>'groups' as group, - c.additionaldetails->>'waterSubUsageType' as usagecategory, - c.additionaldetails->>'connectionCategory' as connctionCategory, + c.connectionno as connectionno, + c.additionaldetails->>'ledgerId' as ledgerid, + c.additionaldetails->>'groups' as group, + c.additionaldetails->>'waterSubUsageType' as usagecategory, + c.additionaldetails->>'connectionCategory' as connctionCategory, TO_CHAR(TO_TIMESTAMP(c.createdtime / 1000), 'dd-MM-yyyy') AS createdon, - TO_CHAR(TO_TIMESTAMP(s.connectionexecutiondate / 1000), 'dd-MM-yyyy') as executiondate, - TO_CHAR(TO_TIMESTAMP(pist.createdtime / 1000), 'dd-MM-yyyy') as paymentdate, + TO_CHAR(TO_TIMESTAMP(s.connectionexecutiondate / 1000), 'dd-MM-yyyy') as executiondate, + TO_CHAR(TO_TIMESTAMP(pist.createdtime / 1000), 'dd-MM-yyyy') as paymentdate, e.code AS assignedemployee, TO_CHAR(TO_TIMESTAMP(assigned.createdtime / 1000), 'dd-MM-yyyy') AS assignedon, FLOOR((EXTRACT(EPOCH FROM NOW()) - c.createdtime / 1000) / 86400) AS dayspendency, FLOOR((EXTRACT(EPOCH FROM NOW()) - assigned.createdtime / 1000) / 86400) AS assignedfordays, - pt.plotsize, - pt.oldpropertyid as oldpropertyid, - pt.address as address, - pt.localityname as localityname, - pt.propertyusagetype as propertyusagetype - FROM eg_ws_connection c - INNER JOIN ( + pt.plotsize, + pt.oldpropertyid as oldpropertyid, + pt.address as address, + pt.localityname as localityname, + pt.propertyusagetype as propertyusagetype + FROM eg_ws_connection c + INNER JOIN ( SELECT id, businessid FROM eg_wf_processinstance_v2 pi - WHERE (businessid, createdtime) IN ( + WHERE tenantid=$tenantid and (businessid, createdtime) IN ( SELECT businessid, MAX(createdtime) - FROM eg_wf_processinstance_v2 + FROM eg_wf_processinstance_v2 where tenantid=$tenantid GROUP BY businessid ) ) pi ON pi.businessid = c.applicationno @@ -4010,12 +4010,12 @@ ReportDefinitions: inner join report_properties pt on (pt.propertyid=c.property_id and pt.propertystatus='ACTIVE') inner join eg_ws_service s on s.connection_id=c.id left outer join eg_wf_processinstance_v2 pist on (pist.businessid=c.applicationno and pist.action='PAY') - WHERE c.tenantid = 'pb.patiala' + WHERE c.tenantid = $tenantid and c.applicationstatus in ('PENDING_FOR_DOCUMENT_VERIFICATION','PENDING_FOR_FIELD_INSPECTION','PENDING_FOR_APPROVAL','PENDING_APPROVAL_FOR_CONNECTION') and c.createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 9 * 24 * 60 * 60 * 1000) -- reportName: seweragePendingSlaReport +- reportName: seweragePendingSlaApplications summary: Sewerage SLA Pendency Report version: 1.0.0 moduleName: rainmaker-ws @@ -4129,30 +4129,30 @@ ReportDefinitions: c.tenantid as tenantid, c.applicationno as applicationno, c.applicationstatus as applicationstatus, - c.connectionno as connectionno, - c.additionaldetails->>'ledgerId' as ledgerid, - c.additionaldetails->>'groups' as group, - c.additionaldetails->>'waterSubUsageType' as usagecategory, - c.additionaldetails->>'connectionCategory' as connctionCategory, + c.connectionno as connectionno, + c.additionaldetails->>'ledgerId' as ledgerid, + c.additionaldetails->>'groups' as group, + c.additionaldetails->>'waterSubUsageType' as usagecategory, + c.additionaldetails->>'connectionCategory' as connctionCategory, TO_CHAR(TO_TIMESTAMP(c.createdtime / 1000), 'dd-MM-yyyy') AS createdon, - TO_CHAR(TO_TIMESTAMP(s.connectionexecutiondate / 1000), 'dd-MM-yyyy') as executiondate, - TO_CHAR(TO_TIMESTAMP(pist.createdtime / 1000), 'dd-MM-yyyy') as paymentdate, + TO_CHAR(TO_TIMESTAMP(s.connectionexecutiondate / 1000), 'dd-MM-yyyy') as executiondate, + TO_CHAR(TO_TIMESTAMP(pist.createdtime / 1000), 'dd-MM-yyyy') as paymentdate, e.code AS assignedemployee, TO_CHAR(TO_TIMESTAMP(assigned.createdtime / 1000), 'dd-MM-yyyy') AS assignedon, FLOOR((EXTRACT(EPOCH FROM NOW()) - c.createdtime / 1000) / 86400) AS dayspendency, FLOOR((EXTRACT(EPOCH FROM NOW()) - assigned.createdtime / 1000) / 86400) AS assignedfordays, - pt.plotsize, - pt.oldpropertyid as oldpropertyid, - pt.address as address, - pt.localityname as localityname, - pt.propertyusagetype as propertyusagetype - FROM eg_sw_connection c - INNER JOIN ( + pt.plotsize, + pt.oldpropertyid as oldpropertyid, + pt.address as address, + pt.localityname as localityname, + pt.propertyusagetype as propertyusagetype + FROM eg_sw_connection c + INNER JOIN ( SELECT id, businessid FROM eg_wf_processinstance_v2 pi - WHERE (businessid, createdtime) IN ( + WHERE tenantid=$tenantid and (businessid, createdtime) IN ( SELECT businessid, MAX(createdtime) - FROM eg_wf_processinstance_v2 + FROM eg_wf_processinstance_v2 where tenantid=$tenantid GROUP BY businessid ) ) pi ON pi.businessid = c.applicationno @@ -4161,9 +4161,6 @@ ReportDefinitions: inner join report_properties pt on (pt.propertyid=c.property_id and pt.propertystatus='ACTIVE') inner join eg_sw_service s on s.connection_id=c.id left outer join eg_wf_processinstance_v2 pist on (pist.businessid=c.applicationno and pist.action='PAY') - WHERE c.tenantid = 'pb.patiala' + WHERE c.tenantid = $tenantid and c.applicationstatus in ('PENDING_FOR_DOCUMENT_VERIFICATION','PENDING_FOR_FIELD_INSPECTION','PENDING_FOR_APPROVAL','PENDING_APPROVAL_FOR_CONNECTION') and c.createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 9 * 24 * 60 * 60 * 1000) - - - From be05b8771a1edf051a4add16385717f3e243205e Mon Sep 17 00:00:00 2001 From: M125688 Date: Tue, 6 May 2025 23:21:58 +0530 Subject: [PATCH 1614/1630] Update pending.yml --- configs/reports/configs/pending.yml | 105 ++++++++++++++++------------ 1 file changed, 61 insertions(+), 44 deletions(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index 078d95bc3..f740abb08 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -45,51 +45,68 @@ ReportDefinitions: wrapper: true isMandatory: false searchClause: AND ta.tenantid =$tenantselected + - name: financialyear + 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,1680287400000:2023-24,1711909800000:2024-25' + source: rainmaker-misc + isMandatory: false + searchClause: and ta.financialyear not like concat('%',$financialyear,'%') query: | - WITH total_appl AS - (SELECT pp.tenantid, - CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' - WHEN pp.businessservice IN ('PT.MUTATION') THEN 'PT-Service' - WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' - WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' - WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' - END as servicename, - count(*) as total_appl - FROM public.eg_wf_processinstance_v2 pp - WHERE pp.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') - AND PP.ASSIGNEE IS NOT NULL - GROUP BY pp.tenantid,CASE WHEN pp.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' - WHEN pp.businessservice IN ('PT.MUTATION') THEN 'PT-Service' - WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' - WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' - WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' - END), - pending_appl AS - (SELECT p.tenantid, CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' - WHEN p.businessservice IN ('PT.MUTATION') THEN 'PT-Service' - WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' - WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' - WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' END as servicename, - count(*) as pending_appl - FROM public.eg_wf_processinstance_v2 p - JOIN public.eg_wf_businessservice_v2 b ON p.businessservice=b.businessservice - WHERE (to_timestamp(p.lastmodifiedtime / 1000.0) - to_timestamp(p.createdtime / 1000.0)) > (b.businessservicesla / (1000 * 60 * 60 * 24)) * interval '1 day' - AND b.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') - AND P.ASSIGNEE IS NOT NULL - GROUP BY p.tenantid,CASE WHEN p.businessservice IN ('NEWTL.HAZ','DIRECTRENEWAL','EDITRENEWAL','NewTL') THEN 'TL-Renewal' - WHEN p.businessservice IN ('PT.MUTATION') THEN 'PT-Service' - WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' - WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' - WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' END) - SELECT ta.tenantid as tenantid,ta.servicename as servicename,ta.total_appl as total_application,COALESCE(pa.pending_appl,0) as pending_application_out_of_sla, - ROUND(CASE WHEN ta.total_appl > 0 THEN (COALESCE(pa.pending_appl, 0) * 100.0 / ta.total_appl) ELSE 0 END, 2) AS pendingapplpercentage - FROM total_appl ta - LEFT JOIN pending_appl pa ON ta.tenantid=pa.tenantid AND ta.servicename=pa.servicename WHERE ta.tenantid NOT IN ('pb','pb.testing') - + WITH ws_data AS (SELECT tenantid, applicationno, applicationstatus, createdtime,'WS-Service' AS servicename, + CASE WHEN EXTRACT(MONTH FROM TO_TIMESTAMP(createdtime / 1000)) >= 4 THEN TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY') || '-' || + RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000) + INTERVAL '1 year', 'YYYY'), 2) ELSE TO_CHAR(TO_TIMESTAMP(createdtime / 1000) - INTERVAL '1 year', 'YYYY') || '-' || + RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY'), 2) END AS financialyear + FROM eg_ws_connection WHERE connectionno IS NULL), + sw_data AS (SELECT tenantid, applicationno, applicationstatus, createdtime, 'SW-Service' AS servicename, + CASE WHEN EXTRACT(MONTH FROM TO_TIMESTAMP(createdtime / 1000)) >= 4 THEN TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY') || '-' || + RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000) + INTERVAL '1 year', 'YYYY'), 2) ELSE TO_CHAR(TO_TIMESTAMP(createdtime / 1000) - INTERVAL '1 year', 'YYYY') || '-' || + RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY'), 2) END AS financialyear + FROM eg_sw_connection WHERE connectionno IS NULL), + tl_data AS (SELECT tenantid, applicationnumber, status, createdtime, 'TL-Service' AS servicename,financialyear + FROM eg_tl_tradelicense WHERE licensenumber IS NULL), + fn_data AS (SELECT tenantid, applicationnumber, status, createdtime, 'FirezNOC' AS servicename, financialyear + FROM eg_fn_firenocdetail WHERE firestationid IS NULL), + total_appl AS ( + SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM ws_data GROUP BY tenantid, servicename, financialyear + UNION ALL + SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM sw_data GROUP BY tenantid, servicename, financialyear + UNION ALL + SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM tl_data GROUP BY tenantid, servicename, financialyear + UNION ALL + SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM fn_data GROUP BY tenantid, servicename, financialyear), + pending_appl AS (SELECT tenantid, applicationstatus, servicename, COUNT(*) AS cnt, financialyear + FROM ws_data WHERE applicationstatus NOT IN ('CONNECTION_ACTIVATED', 'INITIATED','REJECTED','PENDING_FOR_CONNECTION_ACTIVATION','PENDING_FOR_PAYMENT') + AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 11 * 24 * 60 * 60 * 1000) + GROUP BY tenantid, applicationstatus, servicename, financialyear + UNION ALL + SELECT tenantid, applicationstatus, servicename, COUNT(*) AS cnt, financialyear + FROM sw_data WHERE applicationstatus NOT IN ('CONNECTION_ACTIVATED', 'INITIATED','REJECTED','PENDING_FOR_CONNECTION_ACTIVATION','PENDING_FOR_PAYMENT') + AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 11 * 24 * 60 * 60 * 1000) + GROUP BY tenantid, applicationstatus, servicename, financialyear + UNION ALL + SELECT tenantid, status AS applicationstatus, servicename, COUNT(*) AS cnt, financialyear + FROM tl_data + WHERE status NOT IN ('INITIATED','REJECTED','PENDINGPAYMENT' , 'APPLIED','CANCELLED','APPROVED','CITIZENACTIONREQUIRED') + AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 18 * 24 * 60 * 60 * 1000) + GROUP BY tenantid, status, servicename, financialyear + UNION ALL + SELECT tenantid, status AS applicationstatus, servicename, COUNT(*) AS cnt, financialyear + FROM fn_data + WHERE status NOT IN ('INITIATED','REJECTED','PENDINGPAYMENT','CANCELLED','APPROVED','CITIZENACTIONREQUIRED','CITIZENACTIONREQUIRED-DV') + AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 20 * 24 * 60 * 60 * 1000) + GROUP BY tenantid, status, servicename, financialyear) + SELECT ta.tenantid as tenantid, ta.servicename as servicename, SUM(ta.cnt) AS total_application, + COALESCE(SUM(pa.cnt), 0) AS pending_application_out_of_sla, + ROUND(COALESCE(SUM(pa.cnt), 0) * 100.0 / SUM(ta.cnt),2) AS pendingpercentage + FROM total_appl ta LEFT JOIN pending_appl pa ON pa.tenantid = ta.tenantid + AND pa.servicename = ta.servicename + AND pa.financialyear = ta.financialyear + WHERE ta.tenantid NOT IN ('pb.testing') + AND ta.financialyear = $financialyear + AND ta.tenantid = $tenantid + AND ta.servicename = $servicename + groupby: GROUP BY ta.tenantid, ta.servicename; - reportName: department summary: Department Wise Pendency Report From 7745c94e899e197a061b5e1cdaf5076019ed4dc6 Mon Sep 17 00:00:00 2001 From: M125688 Date: Wed, 7 May 2025 11:17:48 +0530 Subject: [PATCH 1615/1630] Update pending.yml --- configs/reports/configs/pending.yml | 72 ++++++++++++++++++++++------- 1 file changed, 56 insertions(+), 16 deletions(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index f740abb08..b630188ab 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -133,23 +133,63 @@ ReportDefinitions: type: string source: rainmaker-misc total: false + searchParams: + - name: financialyear + 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,1680287400000:2023-24,1711909800000:2024-25' + source: rainmaker-misc + isMandatory: false + searchClause: and ta.financialyear not like concat('%',$financialyear,'%') query: | - WITH total_appl AS - (SELECT count(*) as total_appl - FROM public.eg_wf_processinstance_v2 pp - WHERE pp.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') - AND pp.ASSIGNEE IS NOT NULL - AND pp.tenantid NOT IN ('pb','pb.testing')), - pending_appl AS - (SELECT count(*) as pending_appl - FROM public.eg_wf_processinstance_v2 p - JOIN public.eg_wf_businessservice_v2 b ON p.businessservice=b.businessservice - WHERE (to_timestamp(p.lastmodifiedtime / 1000.0) - to_timestamp(p.createdtime / 1000.0)) > (b.businessservicesla / (1000 * 60 * 60 * 24)) * interval '1 day' - AND b.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') - AND P.ASSIGNEE IS NOT NULL - AND p.tenantid NOT IN ('pb','pb.testing')) - SELECT 'pb.punjab' as departmentID, 'Punjab Local Government' as departmentName,ta.total_appl as TotalApplicationReceived,pa.pending_appl as PendingBeyondTimelineApplicationCount - FROM total_appl ta,pending_appl pa + WITH ws_data AS (SELECT tenantid, applicationno, applicationstatus, createdtime, 'WS-Service' AS servicename, + CASE WHEN EXTRACT(MONTH FROM TO_TIMESTAMP(createdtime / 1000)) >= 4 THEN TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY') || '-' || + RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000) + INTERVAL '1 year', 'YYYY'), 2) ELSE TO_CHAR(TO_TIMESTAMP(createdtime / 1000) - INTERVAL '1 year', 'YYYY') || '-' || + RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY'), 2) END AS financialyear + FROM eg_ws_connection WHERE connectionno IS NULL), + sw_data AS (SELECT tenantid, applicationno, applicationstatus, createdtime,'SW-Service' AS servicename, + CASE WHEN EXTRACT(MONTH FROM TO_TIMESTAMP(createdtime / 1000)) >= 4 THEN TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY') || '-' || + RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000) + INTERVAL '1 year', 'YYYY'), 2) ELSE TO_CHAR(TO_TIMESTAMP(createdtime / 1000) - INTERVAL '1 year', 'YYYY') || '-' || + RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY'), 2) END AS financialyear + FROM eg_sw_connection WHERE connectionno IS NULL), + tl_data AS (SELECT tenantid, applicationnumber, status, createdtime,'TL-Service' AS servicename, financialyear + FROM eg_tl_tradelicense WHERE licensenumber IS NULL), + fn_data AS (SELECT tenantid, applicationnumber,status,createdtime,'FirezNOC' AS servicename,financialyear + FROM eg_fn_firenocdetail WHERE firestationid IS NULL), + total_appl AS ( + SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM ws_data GROUP BY tenantid, servicename, financialyear + UNION ALL + SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM sw_data GROUP BY tenantid, servicename, financialyear + UNION ALL + SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM tl_data GROUP BY tenantid, servicename, financialyear + UNION ALL + SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM fn_data GROUP BY tenantid, servicename, financialyear), + pending_appl AS (SELECT tenantid, applicationstatus, servicename, COUNT(*) AS cnt, financialyear + FROM ws_data WHERE applicationstatus NOT IN ('CONNECTION_ACTIVATED', 'INITIATED','REJECTED','PENDING_FOR_CONNECTION_ACTIVATION','PENDING_FOR_PAYMENT') + AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 11 * 24 * 60 * 60 * 1000) + GROUP BY tenantid, applicationstatus, servicename, financialyear + UNION ALL + SELECT tenantid, applicationstatus, servicename, COUNT(*) AS cnt, financialyear + FROM sw_data WHERE applicationstatus NOT IN ('CONNECTION_ACTIVATED', 'INITIATED','REJECTED','PENDING_FOR_CONNECTION_ACTIVATION','PENDING_FOR_PAYMENT') + AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 11 * 24 * 60 * 60 * 1000) + GROUP BY tenantid, applicationstatus, servicename, financialyear + UNION ALL + SELECT tenantid, status AS applicationstatus, servicename, COUNT(*) AS cnt, financialyear + FROM tl_data WHERE status NOT IN ('INITIATED','REJECTED','PENDINGPAYMENT' , 'APPLIED','CANCELLED','APPROVED','CITIZENACTIONREQUIRED') + AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 18 * 24 * 60 * 60 * 1000) + GROUP BY tenantid, status, servicename, financialyear + UNION ALL + SELECT tenantid, status AS applicationstatus, servicename, COUNT(*) AS cnt, financialyear + FROM fn_data WHERE status NOT IN ('INITIATED','REJECTED','PENDINGPAYMENT','CANCELLED','APPROVED','CITIZENACTIONREQUIRED','CITIZENACTIONREQUIRED-DV') + AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 20 * 24 * 60 * 60 * 1000) + GROUP BY tenantid, status, servicename, financialyear) + SELECT 'pb.punjab' as departmentID, 'Punjab Local Government' as departmentName, SUM(ta.cnt) AS TotalApplicationReceived, + COALESCE(SUM(pa.cnt), 0) AS PendingBeyondTimelineApplicationCount + FROM total_appl ta LEFT JOIN pending_appl pa ON pa.tenantid = ta.tenantid + AND pa.servicename = ta.servicename + AND pa.financialyear = ta.financialyear + WHERE ta.tenantid NOT IN ('pb.testing') + AND ta.financialyear = $financialyear - reportName: authority summary: Tenant Wise Pendency Report From 0ac26988c1d758b207deb9e2a04a150067bdf0be Mon Sep 17 00:00:00 2001 From: M125688 Date: Wed, 7 May 2025 11:39:33 +0530 Subject: [PATCH 1616/1630] Update pending.yml --- configs/reports/configs/pending.yml | 197 +++++++++++++++------------- 1 file changed, 108 insertions(+), 89 deletions(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index b630188ab..827b6553b 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -189,7 +189,6 @@ ReportDefinitions: AND pa.servicename = ta.servicename AND pa.financialyear = ta.financialyear WHERE ta.tenantid NOT IN ('pb.testing') - AND ta.financialyear = $financialyear - reportName: authority summary: Tenant Wise Pendency Report @@ -230,27 +229,60 @@ ReportDefinitions: wrapper: true isMandatory: false searchClause: AND ta.tenantid =$tenantid + - name: financialyear + 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,1680287400000:2023-24,1711909800000:2024-25' + source: rainmaker-misc + isMandatory: false + searchClause: and ta.financialyear not like concat('%',$financialyear,'%') query: | - WITH total_appl AS - (SELECT pp.tenantid,count(*) as total_appl - FROM public.eg_wf_processinstance_v2 pp - WHERE pp.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') - AND pp.ASSIGNEE IS NOT NULL - AND pp.tenantid NOT IN ('pb','pb.testing') - GROUP BY pp.tenantid), - pending_appl AS - (SELECT p.tenantid,count(*) as pending_appl - FROM public.eg_wf_processinstance_v2 p - JOIN public.eg_wf_businessservice_v2 b ON p.businessservice=b.businessservice - WHERE (to_timestamp(p.lastmodifiedtime / 1000.0) - to_timestamp(p.createdtime / 1000.0)) > (b.businessservicesla / (1000 * 60 * 60 * 24)) * interval '1 day' - AND b.businessservice NOT IN ('ModifyWSConnection','ModifySWConnection','PT.CREATE','PT.UPDATE','PT.CREATEWITHWNS') - AND P.ASSIGNEE IS NOT NULL - AND p.tenantid NOT IN ('pb','pb.testing') - GROUP BY p.tenantid) - SELECT ta.tenantid as authorityID, - UPPER(SUBSTR(REPLACE(ta.tenantid, 'pb.', ''), 1, 1)) || LOWER(SUBSTR(REPLACE(ta.tenantid, 'pb.', ''), 2)) AS authorityName, - '1' as departmentID, ta.total_appl as TotalApplicationReceived,COALESCE(pa.pending_appl,0) as PendingBeyondTimelineApplicationCount - FROM total_appl ta LEFT JOIN pending_appl pa ON ta.tenantid=pa.tenantid WHERE 1=1 + WITH ws_data AS (SELECT tenantid, applicationno, applicationstatus, createdtime, 'WS-Service' AS servicename, + CASE WHEN EXTRACT(MONTH FROM TO_TIMESTAMP(createdtime / 1000)) >= 4 THEN TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY') || '-' || + RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000) + INTERVAL '1 year', 'YYYY'), 2) ELSE TO_CHAR(TO_TIMESTAMP(createdtime / 1000) - INTERVAL '1 year', 'YYYY') || '-' || + RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY'), 2) END AS financialyear + FROM eg_ws_connection WHERE connectionno IS NULL), + sw_data AS (SELECT tenantid, applicationno, applicationstatus, createdtime,'SW-Service' AS servicename, + CASE WHEN EXTRACT(MONTH FROM TO_TIMESTAMP(createdtime / 1000)) >= 4 THEN TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY') || '-' || + RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000) + INTERVAL '1 year', 'YYYY'), 2) ELSE TO_CHAR(TO_TIMESTAMP(createdtime / 1000) - INTERVAL '1 year', 'YYYY') || '-' || + RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY'), 2) END AS financialyear + FROM eg_sw_connection WHERE connectionno IS NULL), + tl_data AS (SELECT tenantid, applicationnumber, status, createdtime,'TL-Service' AS servicename, financialyear + FROM eg_tl_tradelicense WHERE licensenumber IS NULL), + fn_data AS (SELECT tenantid, applicationnumber,status,createdtime,'FirezNOC' AS servicename,financialyear + FROM eg_fn_firenocdetail WHERE firestationid IS NULL), + total_appl AS (SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM ws_data GROUP BY tenantid, servicename, financialyear + UNION ALL + SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM sw_data GROUP BY tenantid, servicename, financialyear + UNION ALL + SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM tl_data GROUP BY tenantid, servicename, financialyear + UNION ALL + SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM fn_data GROUP BY tenantid, servicename, financialyear), + pending_appl AS (SELECT tenantid, applicationstatus, servicename, COUNT(*) AS cnt, financialyear + FROM ws_data WHERE applicationstatus NOT IN ('CONNECTION_ACTIVATED', 'INITIATED','REJECTED','PENDING_FOR_CONNECTION_ACTIVATION','PENDING_FOR_PAYMENT') + AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 11 * 24 * 60 * 60 * 1000) + GROUP BY tenantid, applicationstatus, servicename, financialyear + UNION ALL + SELECT tenantid, applicationstatus, servicename, COUNT(*) AS cnt, financialyear + FROM sw_data WHERE applicationstatus NOT IN ('CONNECTION_ACTIVATED', 'INITIATED','REJECTED','PENDING_FOR_CONNECTION_ACTIVATION','PENDING_FOR_PAYMENT') + AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 11 * 24 * 60 * 60 * 1000) + GROUP BY tenantid, applicationstatus, servicename, financialyear + UNION ALL + SELECT tenantid, status AS applicationstatus, servicename, COUNT(*) AS cnt, financialyear + FROM tl_data WHERE status NOT IN ('INITIATED','REJECTED','PENDINGPAYMENT' , 'APPLIED','CANCELLED','APPROVED','CITIZENACTIONREQUIRED') + AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 18 * 24 * 60 * 60 * 1000) + GROUP BY tenantid, status, servicename, financialyear + UNION ALL + SELECT tenantid, status AS applicationstatus, servicename, COUNT(*) AS cnt, financialyear + FROM fn_data WHERE status NOT IN ('INITIATED','REJECTED','PENDINGPAYMENT','CANCELLED','APPROVED','CITIZENACTIONREQUIRED','CITIZENACTIONREQUIRED-DV') + AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 20 * 24 * 60 * 60 * 1000) + GROUP BY tenantid, status, servicename, financialyear) + SELECT ta.tenantid as authorityID, + UPPER(SUBSTR(REPLACE(ta.tenantid, 'pb.', ''), 1, 1)) || LOWER(SUBSTR(REPLACE(ta.tenantid, 'pb.', ''), 2)) AS authorityName, + '1' as departmentID, SUM(ta.cnt) AS TotalApplicationReceived, COALESCE(SUM(pa.cnt), 0) AS PendingBeyondTimelineApplicationCount + FROM total_appl ta LEFT JOIN pending_appl pa ON pa.tenantid = ta.tenantid AND pa.servicename = ta.servicename + AND pa.financialyear = ta.financialyear WHERE ta.tenantid NOT IN ('pb.testing') + groupby: GROUP BY ta.tenantid - reportName: service summary: Service Wise Pendency Report @@ -303,75 +335,62 @@ ReportDefinitions: wrapper: true isMandatory: false searchClause: AND ta.tenantid =$tenantid + - name: financialyear + 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,1680287400000:2023-24,1711909800000:2024-25' + source: rainmaker-misc + isMandatory: false + searchClause: and ta.financialyear not like concat('%',$financialyear,'%') query: | - WITH total_appl AS ( - SELECT - CASE - WHEN pp.businessservice IN ('NEWTL.HAZ', 'DIRECTRENEWAL', 'EDITRENEWAL', 'NewTL') THEN 'TL-Renewal' - WHEN pp.businessservice IN ('PT.MUTATION') THEN 'PT-Service' - WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' - WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' - WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' - END AS servicename, - pp.tenantid, -- Added tenantid - COUNT(*) AS total_appl - FROM public.eg_wf_processinstance_v2 pp - WHERE pp.businessservice NOT IN ('ModifyWSConnection', 'ModifySWConnection', 'PT.CREATE', 'PT.UPDATE', 'PT.CREATEWITHWNS') - AND pp.assignee IS NOT NULL - AND pp.tenantid NOT IN ('pb', 'pb.testing') - GROUP BY pp.tenantid, - CASE - WHEN pp.businessservice IN ('NEWTL.HAZ', 'DIRECTRENEWAL', 'EDITRENEWAL', 'NewTL') THEN 'TL-Renewal' - WHEN pp.businessservice IN ('PT.MUTATION') THEN 'PT-Service' - WHEN pp.businessservice IN ('NewWS1') THEN 'WS-Service' - WHEN pp.businessservice IN ('NewSW1') THEN 'SW-Service' - WHEN pp.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN pp.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' - END - ), - pending_appl AS ( - SELECT - CASE - WHEN p.businessservice IN ('NEWTL.HAZ', 'DIRECTRENEWAL', 'EDITRENEWAL', 'NewTL') THEN 'TL-Renewal' - WHEN p.businessservice IN ('PT.MUTATION') THEN 'PT-Service' - WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' - WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' - WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' - END AS servicename, - p.tenantid, -- Added tenantid - COUNT(*) AS pending_appl - FROM public.eg_wf_processinstance_v2 p - JOIN public.eg_wf_businessservice_v2 b ON p.businessservice = b.businessservice - WHERE (TO_TIMESTAMP(p.lastmodifiedtime / 1000.0) - TO_TIMESTAMP(p.createdtime / 1000.0)) > - (b.businessservicesla / (1000 * 60 * 60 * 24)) * INTERVAL '1 day' - AND b.businessservice NOT IN ('ModifyWSConnection', 'ModifySWConnection', 'PT.CREATE', 'PT.UPDATE', 'PT.CREATEWITHWNS') - AND p.assignee IS NOT NULL - AND p.tenantid NOT IN ('pb', 'pb.testing') - GROUP BY p.tenantid, - CASE - WHEN p.businessservice IN ('NEWTL.HAZ', 'DIRECTRENEWAL', 'EDITRENEWAL', 'NewTL') THEN 'TL-Renewal' - WHEN p.businessservice IN ('PT.MUTATION') THEN 'PT-Service' - WHEN p.businessservice IN ('NewWS1') THEN 'WS-Service' - WHEN p.businessservice IN ('NewSW1') THEN 'SW-Service' - WHEN p.businessservice IN ('FIRENOC') THEN 'FireNoc' - WHEN p.businessservice IN ('BS.AMENDMENT') THEN 'Bill Amendment' - END - ) - SELECT - '' as serviceID, - ta.servicename AS serviceName, - ta.tenantid AS authorityID, - '1' as departmentID, - ta.total_appl AS TotalApplicationReceived, - COALESCE(pa.pending_appl, 0) AS PendingBeyondTimelineApplicationCount - FROM total_appl ta - LEFT JOIN pending_appl pa - ON ta.servicename = pa.servicename - AND ta.tenantid = pa.tenantid - WHERE 1=1 - + WITH ws_data AS (SELECT tenantid, applicationno, applicationstatus, createdtime, 'WS-Service' AS servicename, + CASE WHEN EXTRACT(MONTH FROM TO_TIMESTAMP(createdtime / 1000)) >= 4 THEN TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY') || '-' || + RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000) + INTERVAL '1 year', 'YYYY'), 2) ELSE TO_CHAR(TO_TIMESTAMP(createdtime / 1000) - INTERVAL '1 year', 'YYYY') || '-' || + RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY'), 2) END AS financialyear + FROM eg_ws_connection WHERE connectionno IS NULL), + sw_data AS (SELECT tenantid, applicationno, applicationstatus, createdtime,'SW-Service' AS servicename, + CASE WHEN EXTRACT(MONTH FROM TO_TIMESTAMP(createdtime / 1000)) >= 4 THEN TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY') || '-' || + RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000) + INTERVAL '1 year', 'YYYY'), 2) ELSE TO_CHAR(TO_TIMESTAMP(createdtime / 1000) - INTERVAL '1 year', 'YYYY') || '-' || + RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY'), 2) END AS financialyear + FROM eg_sw_connection WHERE connectionno IS NULL), + tl_data AS (SELECT tenantid, applicationnumber, status, createdtime,'TL-Service' AS servicename, financialyear + FROM eg_tl_tradelicense WHERE licensenumber IS NULL), + fn_data AS (SELECT tenantid, applicationnumber,status,createdtime,'FirezNOC' AS servicename,financialyear + FROM eg_fn_firenocdetail WHERE firestationid IS NULL), + total_appl AS (SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM ws_data GROUP BY tenantid, servicename, financialyear + UNION ALL + SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM sw_data GROUP BY tenantid, servicename, financialyear + UNION ALL + SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM tl_data GROUP BY tenantid, servicename, financialyear + UNION ALL + SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM fn_data GROUP BY tenantid, servicename, financialyear), + pending_appl AS (SELECT tenantid, applicationstatus, servicename, COUNT(*) AS cnt, financialyear + FROM ws_data WHERE applicationstatus NOT IN ('CONNECTION_ACTIVATED', 'INITIATED','REJECTED','PENDING_FOR_CONNECTION_ACTIVATION','PENDING_FOR_PAYMENT') + AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 11 * 24 * 60 * 60 * 1000) + GROUP BY tenantid, applicationstatus, servicename, financialyear + UNION ALL + SELECT tenantid, applicationstatus, servicename, COUNT(*) AS cnt, financialyear + FROM sw_data WHERE applicationstatus NOT IN ('CONNECTION_ACTIVATED', 'INITIATED','REJECTED','PENDING_FOR_CONNECTION_ACTIVATION','PENDING_FOR_PAYMENT') + AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 11 * 24 * 60 * 60 * 1000) + GROUP BY tenantid, applicationstatus, servicename, financialyear + UNION ALL + SELECT tenantid, status AS applicationstatus, servicename, COUNT(*) AS cnt, financialyear + FROM tl_data WHERE status NOT IN ('INITIATED','REJECTED','PENDINGPAYMENT' , 'APPLIED','CANCELLED','APPROVED','CITIZENACTIONREQUIRED') + AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 18 * 24 * 60 * 60 * 1000) + GROUP BY tenantid, status, servicename, financialyear + UNION ALL + SELECT tenantid, status AS applicationstatus, servicename, COUNT(*) AS cnt, financialyear + FROM fn_data WHERE status NOT IN ('INITIATED','REJECTED','PENDINGPAYMENT','CANCELLED','APPROVED','CITIZENACTIONREQUIRED','CITIZENACTIONREQUIRED-DV') + AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 20 * 24 * 60 * 60 * 1000) + GROUP BY tenantid, status, servicename, financialyear) + SELECT '' as serviceID,ta.servicename AS serviceName,ta.tenantid AS authorityID,'1' as departmentID, + SUM(ta.cnt) AS TotalApplicationReceived, + COALESCE(SUM(pa.cnt), 0) AS PendingBeyondTimelineApplicationCount + FROM total_appl ta LEFT JOIN pending_appl pa ON pa.tenantid = ta.tenantid + AND pa.servicename = ta.servicename + AND pa.financialyear = ta.financialyear + WHERE ta.tenantid NOT IN ('pb.testing') + groupby: GROUP BY ta.tenantid, ta.servicename - reportName: wspendencydetails summary: Pendency Details - Water Service From a4e12f257503080a53dea16ebeb5ac002e4292b3 Mon Sep 17 00:00:00 2001 From: M125688 Date: Wed, 7 May 2025 12:18:13 +0530 Subject: [PATCH 1617/1630] Update pending.yml --- configs/reports/configs/pending.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index 827b6553b..2d02705e0 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -106,7 +106,7 @@ ReportDefinitions: AND ta.financialyear = $financialyear AND ta.tenantid = $tenantid AND ta.servicename = $servicename - groupby: GROUP BY ta.tenantid, ta.servicename; + groupby: GROUP BY ta.tenantid, ta.servicename - reportName: department summary: Department Wise Pendency Report From 00df5134df0ed0406e011b72f002839c5bbf35da Mon Sep 17 00:00:00 2001 From: M125688 Date: Wed, 7 May 2025 12:36:10 +0530 Subject: [PATCH 1618/1630] Update pending.yml --- configs/reports/configs/pending.yml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index 2d02705e0..21ef838cb 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -133,14 +133,6 @@ ReportDefinitions: type: string source: rainmaker-misc total: false - searchParams: - - name: financialyear - 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,1680287400000:2023-24,1711909800000:2024-25' - source: rainmaker-misc - isMandatory: false - searchClause: and ta.financialyear not like concat('%',$financialyear,'%') query: | WITH ws_data AS (SELECT tenantid, applicationno, applicationstatus, createdtime, 'WS-Service' AS servicename, CASE WHEN EXTRACT(MONTH FROM TO_TIMESTAMP(createdtime / 1000)) >= 4 THEN TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY') || '-' || @@ -229,13 +221,6 @@ ReportDefinitions: wrapper: true isMandatory: false searchClause: AND ta.tenantid =$tenantid - - name: financialyear - 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,1680287400000:2023-24,1711909800000:2024-25' - source: rainmaker-misc - isMandatory: false - searchClause: and ta.financialyear not like concat('%',$financialyear,'%') query: | WITH ws_data AS (SELECT tenantid, applicationno, applicationstatus, createdtime, 'WS-Service' AS servicename, CASE WHEN EXTRACT(MONTH FROM TO_TIMESTAMP(createdtime / 1000)) >= 4 THEN TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY') || '-' || @@ -335,13 +320,6 @@ ReportDefinitions: wrapper: true isMandatory: false searchClause: AND ta.tenantid =$tenantid - - name: financialyear - 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,1680287400000:2023-24,1711909800000:2024-25' - source: rainmaker-misc - isMandatory: false - searchClause: and ta.financialyear not like concat('%',$financialyear,'%') query: | WITH ws_data AS (SELECT tenantid, applicationno, applicationstatus, createdtime, 'WS-Service' AS servicename, CASE WHEN EXTRACT(MONTH FROM TO_TIMESTAMP(createdtime / 1000)) >= 4 THEN TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY') || '-' || From 46447412ad041bd8cf0cce4c8396e1ac6bcdc4ef Mon Sep 17 00:00:00 2001 From: hemendiranb Date: Thu, 8 May 2025 17:00:39 +0530 Subject: [PATCH 1619/1630] inbox PGR&Swach yml addition inbox PGR&Swach yml addition --- configs/egov-searcher/inboxPGRSearch.yml | 211 ++++++++++++++++++++ configs/egov-searcher/inboxSwachSearch.yml | 212 +++++++++++++++++++++ 2 files changed, 423 insertions(+) create mode 100644 configs/egov-searcher/inboxPGRSearch.yml create mode 100644 configs/egov-searcher/inboxSwachSearch.yml diff --git a/configs/egov-searcher/inboxPGRSearch.yml b/configs/egov-searcher/inboxPGRSearch.yml new file mode 100644 index 000000000..0f76faaea --- /dev/null +++ b/configs/egov-searcher/inboxPGRSearch.yml @@ -0,0 +1,211 @@ +SearchDefinitions: + moduleName: pgr-services + summary: PGR Services Inbox API + version: 1.0.0 + definitions: + - name: inboxpgrsearch + query: + baseQuery: > + SELECT row_to_json(result) FROM ( + SELECT DISTINCT ser.id AS id, + ser.tenantid AS tenantid, + ser.servicerequestid AS servicerequestid, + ser.servicecode AS servicecode, + ser.applicationstatus AS applicationstatus, + ser.accountid AS accountid, + ser.createdtime AS createdtime, + ser.lastmodifiedtime AS lastmodifiedtime, + ads.locality AS locality, + pi.businessservice AS businessservice, + pi.action AS action, + pi.assigner AS assigner, + pi.createdby AS createdby, + pi.lastmodifiedby AS lastmodifiedby, + assg.assignee AS assignee + FROM eg_pgr_service_v2 ser + INNER JOIN eg_pgr_address_v2 ads ON ads.parentid = ser.id + INNER JOIN eg_wf_processinstance_v2 pi ON pi.businessid = ser.servicerequestid + LEFT JOIN eg_wf_assignee_v2 assg ON pi.id = assg.processinstanceid + $where + AND pi.createdtime = ( + SELECT MAX(wf.createdtime) + FROM eg_wf_processinstance_v2 wf + WHERE wf.businessid = ser.servicerequestid + ) + ORDER BY ser.createdtime DESC + $pagination + ) result + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: ser.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + - name: pi.status + isMandatory: false + jsonPath: $.searchCriteria.status + - name: ser.servicerequestid + isMandatory: false + jsonPath: $.searchCriteria.serviceRequestId + - name: ser.servicecode + isMandatory: false + jsonPath: $.searchCriteria.serviceCode + - name: assg.assignee + isMandatory: false + jsonPath: $.searchCriteria.assignee + - name: ads.locality + isMandatory: false + jsonPath: $.searchCriteria.locality + - name: ser.accountid + isMandatory: false + jsonPath: $.searchCriteria.userid + - name: pi.businessservice + isMandatory: false + jsonPath: $.searchCriteria.businessservice + - name: ser.createdtime + isMandatory: false + jsonPath: $.searchCriteria.fromDate + - name: ser.createdtime + isMandatory: false + jsonPath: $.searchCriteria.toDate + + pagination: + noOfRecords: $.searchCriteria.noOfRecords + offset: $.searchCriteria.offset + + output: + jsonFormat: {"ResponseInfo": {},"Services": []} + outJsonPath: $.Services + responseInfoPath: $.ResponseInfo + + - name: inboxpgrsearchcount + query: + baseQuery: > + SELECT COUNT(DISTINCT ser.id) AS "TotalCount" + FROM eg_pgr_service_v2 ser + INNER JOIN eg_pgr_address_v2 ads ON ads.parentid = ser.id + INNER JOIN eg_wf_processinstance_v2 pi ON pi.businessid = ser.servicerequestid + LEFT JOIN eg_wf_assignee_v2 assg ON pi.id = assg.processinstanceid + $where + AND pi.createdtime = ( + SELECT MAX(wf.createdtime) + FROM eg_wf_processinstance_v2 wf + WHERE wf.businessid = ser.servicerequestid + ) + --AND ser.createdtime >= $fromDate + --AND ser.createdtime <= $toDate + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: ser.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + - name: pi.status + isMandatory: false + jsonPath: $.searchCriteria.status + - name: ser.servicerequestid + isMandatory: false + jsonPath: $.searchCriteria.serviceRequestId + - name: ser.servicecode + isMandatory: false + jsonPath: $.searchCriteria.serviceCode + - name: assg.assignee + isMandatory: false + jsonPath: $.searchCriteria.assignee + - name: ads.locality + isMandatory: false + jsonPath: $.searchCriteria.locality + - name: ser.accountid + isMandatory: false + jsonPath: $.searchCriteria.userid + - name: pi.businessservice + isMandatory: false + jsonPath: $.searchCriteria.businessservice + - name: ser.createdtime + isMandatory: false + jsonPath: $.searchCriteria.fromDate + - name: ser.createdtime + isMandatory: false + jsonPath: $.searchCriteria.toDate + + output: + jsonFormat: {"ResponseInfo": {},"TotalCount": {}} + outJsonPath: $.TotalCount + responseInfoPath: $.ResponseInfo + + - name: inboxpgrsearchdesc + query: + baseQuery: > + SELECT row_to_json(result) + FROM ( + SELECT DISTINCT ser.id AS id, ser.tenantid AS tenantid, ser.servicerequestid AS servicerequestid, + ser.servicecode AS servicecode, ser.applicationstatus AS applicationstatus, + ser.accountid AS accountid, ser.createdtime AS createdtime, ser.lastmodifiedtime AS lastmodifiedtime, + ads.locality AS locality, pi.businessservice AS businessservice, + pi.state AS state, pi.action AS action, pi.assigner AS assigner, + pi.createdby AS createdby, pi.lastmodifiedby AS lastmodifiedby, + assg.assignee AS assignee + FROM eg_pgr_service_v2 ser + INNER JOIN eg_pgr_address_v2 ads ON ads.parentid = ser.id + INNER JOIN eg_wf_processinstance_v2 pi ON pi.businessid = ser.servicerequestid + LEFT JOIN eg_wf_assignee_v2 assg ON pi.id = assg.processinstanceid + $where + AND pi.createdtime = ( + SELECT MAX(wf.createdtime) + FROM eg_wf_processinstance_v2 wf + WHERE wf.businessid = ser.servicerequestid + ) + --AND ser.createdtime >= $fromDate + --AND ser.createdtime <= $toDate + ORDER BY ser.createdtime DESC + OFFSET $offset + LIMIT $limit + ) result + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: ser.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + - name: pi.status + isMandatory: false + jsonPath: $.searchCriteria.status + - name: ser.servicerequestid + isMandatory: false + jsonPath: $.searchCriteria.serviceRequestId + - name: ser.servicecode + isMandatory: false + jsonPath: $.searchCriteria.serviceCode + - name: assg.assignee + isMandatory: false + jsonPath: $.searchCriteria.assignee + - name: ads.locality + isMandatory: false + jsonPath: $.searchCriteria.locality + - name: ser.accountid + isMandatory: false + jsonPath: $.searchCriteria.userid + - name: pi.businessservice + isMandatory: false + jsonPath: $.searchCriteria.businessservice + - name: ser.createdtime + isMandatory: false + jsonPath: $.searchCriteria.fromDate + - name: ser.createdtime + isMandatory: false + jsonPath: $.searchCriteria.toDate + + pagination: + noOfRecords: $.searchCriteria.noOfRecords + offset: $.searchCriteria.offset + + output: + jsonFormat: {"ResponseInfo": {},"Services": []} + outJsonPath: $.Services + responseInfoPath: $.ResponseInfo diff --git a/configs/egov-searcher/inboxSwachSearch.yml b/configs/egov-searcher/inboxSwachSearch.yml new file mode 100644 index 000000000..b0b07c7bc --- /dev/null +++ b/configs/egov-searcher/inboxSwachSearch.yml @@ -0,0 +1,212 @@ +SearchDefinitions: + moduleName: swach-reform + summary: Swach Services Inbox API + version: 1.0.0 + definitions: + - name: inboxswachsearch + query: + baseQuery: > + SELECT row_to_json(result) FROM ( + SELECT DISTINCT ser.id AS id, + ser.tenantid AS tenantid, + ser.servicerequestid AS servicerequestid, + ser.servicecode AS servicecode, + ser.applicationstatus AS applicationstatus, + ser.accountid AS accountid, + ser.createdtime AS createdtime, + ser.lastmodifiedtime AS lastmodifiedtime, + ads.locality AS locality, + pi.businessservice AS businessservice, + pi.action AS action, + pi.assigner AS assigner, + pi.createdby AS createdby, + pi.lastmodifiedby AS lastmodifiedby, + assg.assignee AS assignee + FROM eg_swach_service_v2 ser + INNER JOIN eg_swach_address_v2 ads ON ads.parentid = ser.id + INNER JOIN eg_wf_processinstance_v2 pi ON pi.businessid = ser.servicerequestid + LEFT JOIN eg_wf_assignee_v2 assg ON pi.id = assg.processinstanceid + $where + AND pi.createdtime = ( + SELECT MAX(wf.createdtime) + FROM eg_wf_processinstance_v2 wf + WHERE wf.businessid = ser.servicerequestid + ) + ORDER BY ser.createdtime DESC + $pagination + ) result + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: ser.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + - name: pi.status + isMandatory: false + jsonPath: $.searchCriteria.status + - name: ser.servicerequestid + isMandatory: false + jsonPath: $.searchCriteria.serviceRequestId + - name: ser.servicecode + isMandatory: false + jsonPath: $.searchCriteria.serviceCode + - name: assg.assignee + isMandatory: false + jsonPath: $.searchCriteria.assignee + - name: ads.locality + isMandatory: false + jsonPath: $.searchCriteria.locality + - name: ser.accountid + isMandatory: false + jsonPath: $.searchCriteria.userid + - name: pi.businessservice + isMandatory: false + jsonPath: $.searchCriteria.businessservice + - name: ser.createdtime + isMandatory: false + jsonPath: $.searchCriteria.fromDate + - name: ser.createdtime + isMandatory: false + jsonPath: $.searchCriteria.toDate + + pagination: + noOfRecords: $.searchCriteria.noOfRecords + offset: $.searchCriteria.offset + + output: + jsonFormat: {"ResponseInfo": {},"Services": []} + outJsonPath: $.Services + responseInfoPath: $.ResponseInfo + + - name: inboxswachsearchcount + query: + baseQuery: > + SELECT COUNT(DISTINCT ser.id) AS "TotalCount" + FROM eg_swach_service_v2 ser + INNER JOIN eg_swach_address_v2 ads ON ads.parentid = ser.id + INNER JOIN eg_wf_processinstance_v2 pi ON pi.businessid = ser.servicerequestid + LEFT JOIN eg_wf_assignee_v2 assg ON pi.id = assg.processinstanceid + $where + AND pi.createdtime = ( + SELECT MAX(wf.createdtime) + FROM eg_wf_processinstance_v2 wf + WHERE wf.businessid = ser.servicerequestid + ) + --AND ser.createdtime >= $fromDate + --AND ser.createdtime <= $toDate + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: ser.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + - name: pi.status + isMandatory: false + jsonPath: $.searchCriteria.status + - name: ser.servicerequestid + isMandatory: false + jsonPath: $.searchCriteria.serviceRequestId + - name: ser.servicecode + isMandatory: false + jsonPath: $.searchCriteria.serviceCode + - name: assg.assignee + isMandatory: false + jsonPath: $.searchCriteria.assignee + - name: ads.locality + isMandatory: false + jsonPath: $.searchCriteria.locality + - name: ser.accountid + isMandatory: false + jsonPath: $.searchCriteria.userid + - name: pi.businessservice + isMandatory: false + jsonPath: $.searchCriteria.businessservice + - name: ser.createdtime + isMandatory: false + jsonPath: $.searchCriteria.fromDate + - name: ser.createdtime + isMandatory: false + jsonPath: $.searchCriteria.toDate + + output: + jsonFormat: {"ResponseInfo": {},"TotalCount": {}} + outJsonPath: $.TotalCount + responseInfoPath: $.ResponseInfo + + - name: inboxswachsearchdesc + query: + baseQuery: > + SELECT row_to_json(result) + FROM ( + SELECT DISTINCT ser.id AS id, ser.tenantid AS tenantid, ser.servicerequestid AS servicerequestid, + ser.servicecode AS servicecode, ser.applicationstatus AS applicationstatus, + ser.accountid AS accountid, ser.createdtime AS createdtime, ser.lastmodifiedtime AS lastmodifiedtime, + ads.locality AS locality, pi.businessservice AS businessservice, + pi.state AS state, pi.action AS action, pi.assigner AS assigner, + pi.createdby AS createdby, pi.lastmodifiedby AS lastmodifiedby, + assg.assignee AS assignee + FROM eg_swach_service_v2 ser + INNER JOIN eg_swach_address_v2 ads ON ads.parentid = ser.id + INNER JOIN eg_wf_processinstance_v2 pi ON pi.businessid = ser.servicerequestid + LEFT JOIN eg_wf_assignee_v2 assg ON pi.id = assg.processinstanceid + $where + AND pi.createdtime = ( + SELECT MAX(wf.createdtime) + FROM eg_wf_processinstance_v2 wf + WHERE wf.businessid = ser.servicerequestid + ) + --AND ser.createdtime >= $fromDate + --AND ser.createdtime <= $toDate + ORDER BY ser.createdtime DESC + OFFSET $offset + LIMIT $limit + ) result + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: ser.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + - name: pi.status + isMandatory: false + jsonPath: $.searchCriteria.status + - name: ser.servicerequestid + isMandatory: false + jsonPath: $.searchCriteria.serviceRequestId + - name: ser.servicecode + isMandatory: false + jsonPath: $.searchCriteria.serviceCode + - name: assg.assignee + isMandatory: false + jsonPath: $.searchCriteria.assignee + - name: ads.locality + isMandatory: false + jsonPath: $.searchCriteria.locality + - name: ser.accountid + isMandatory: false + jsonPath: $.searchCriteria.userid + - name: pi.businessservice + isMandatory: false + jsonPath: $.searchCriteria.businessservice + - name: ser.createdtime + isMandatory: false + jsonPath: $.searchCriteria.fromDate + - name: ser.createdtime + isMandatory: false + jsonPath: $.searchCriteria.toDate + + pagination: + noOfRecords: $.searchCriteria.noOfRecords + offset: $.searchCriteria.offset + + output: + jsonFormat: {"ResponseInfo": {},"Services": []} + outJsonPath: $.Services + responseInfoPath: $.ResponseInfo + From 5493440b0fa719c1057c49316d50982fa6f2b67f Mon Sep 17 00:00:00 2001 From: M125688 Date: Thu, 8 May 2025 17:14:42 +0530 Subject: [PATCH 1620/1630] Update uc-reports.yml updated businessservice in miscreportulb_v2 and echallanreport_v2 --- configs/reports/configs/uc-reports.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index f88de89d3..8277f2119 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1150,14 +1150,13 @@ ReportDefinitions: source: uc isMandatory: true searchClause: AND (EXTRACT(EPOCH FROM TO_TIMESTAMP(receiptdate, 'DD-MM-YYYY')) * 1000) <= $toDate - - name: businessservice - label: reports.uc.businessservice - type: singlevaluelist + - name: servicecategory + label: singlevaluelpaydetail.businessservicepe: 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 businessdetails = $businessservice + searchClause: AND businessdetails = $servicecategory - name: collectorname label: reports.uc.collectorname type: singlevaluelist @@ -1920,9 +1919,8 @@ ReportDefinitions: source: uc isMandatory: false searchClause: AND (EXTRACT(EPOCH FROM TO_TIMESTAMP(receiptdate, 'DD-MM-YYYY')) * 1000) <= $toDate - - name: businessservice - label: reports.uc.businessservice - type: singlevaluelist + - name: businessdetails + label: singlevaluelpaydetail.businessservicepe: 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 From a77e3d1b042d91024cb2e92214d9ba32e4ba0ae9 Mon Sep 17 00:00:00 2001 From: M125688 Date: Thu, 8 May 2025 17:22:24 +0530 Subject: [PATCH 1621/1630] 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 8277f2119..fed7d1b2c 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1151,7 +1151,7 @@ ReportDefinitions: isMandatory: true searchClause: AND (EXTRACT(EPOCH FROM TO_TIMESTAMP(receiptdate, 'DD-MM-YYYY')) * 1000) <= $toDate - name: servicecategory - label: singlevaluelpaydetail.businessservicepe: singlevaluelist + label: reports.uc.businessservice 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 @@ -1920,7 +1920,7 @@ ReportDefinitions: isMandatory: false searchClause: AND (EXTRACT(EPOCH FROM TO_TIMESTAMP(receiptdate, 'DD-MM-YYYY')) * 1000) <= $toDate - name: businessdetails - label: singlevaluelpaydetail.businessservicepe: singlevaluelist + label: reports.uc.businessservice 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 From c43a8b301690fda3e500630101fba0d7379de735 Mon Sep 17 00:00:00 2001 From: M125688 Date: Thu, 8 May 2025 18:00:23 +0530 Subject: [PATCH 1622/1630] Update pending.yml --- configs/reports/configs/pending.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index 21ef838cb..83b975bc6 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -149,31 +149,35 @@ ReportDefinitions: fn_data AS (SELECT tenantid, applicationnumber,status,createdtime,'FirezNOC' AS servicename,financialyear FROM eg_fn_firenocdetail WHERE firestationid IS NULL), total_appl AS ( - SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM ws_data GROUP BY tenantid, servicename, financialyear + SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM ws_data WHERE 1=1 GROUP BY tenantid, servicename, financialyear UNION ALL - SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM sw_data GROUP BY tenantid, servicename, financialyear + SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM sw_data WHERE 1=1 GROUP BY tenantid, servicename, financialyear UNION ALL - SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM tl_data GROUP BY tenantid, servicename, financialyear + SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM tl_data WHERE 1=1 GROUP BY tenantid, servicename, financialyear UNION ALL - SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM fn_data GROUP BY tenantid, servicename, financialyear), + SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM fn_data WHERE 1=1 GROUP BY tenantid, servicename, financialyear), pending_appl AS (SELECT tenantid, applicationstatus, servicename, COUNT(*) AS cnt, financialyear FROM ws_data WHERE applicationstatus NOT IN ('CONNECTION_ACTIVATED', 'INITIATED','REJECTED','PENDING_FOR_CONNECTION_ACTIVATION','PENDING_FOR_PAYMENT') AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 11 * 24 * 60 * 60 * 1000) + WHERE 1=1 GROUP BY tenantid, applicationstatus, servicename, financialyear UNION ALL SELECT tenantid, applicationstatus, servicename, COUNT(*) AS cnt, financialyear FROM sw_data WHERE applicationstatus NOT IN ('CONNECTION_ACTIVATED', 'INITIATED','REJECTED','PENDING_FOR_CONNECTION_ACTIVATION','PENDING_FOR_PAYMENT') AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 11 * 24 * 60 * 60 * 1000) + WHERE 1=1 GROUP BY tenantid, applicationstatus, servicename, financialyear UNION ALL SELECT tenantid, status AS applicationstatus, servicename, COUNT(*) AS cnt, financialyear FROM tl_data WHERE status NOT IN ('INITIATED','REJECTED','PENDINGPAYMENT' , 'APPLIED','CANCELLED','APPROVED','CITIZENACTIONREQUIRED') AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 18 * 24 * 60 * 60 * 1000) + WHERE 1=1 GROUP BY tenantid, status, servicename, financialyear UNION ALL SELECT tenantid, status AS applicationstatus, servicename, COUNT(*) AS cnt, financialyear FROM fn_data WHERE status NOT IN ('INITIATED','REJECTED','PENDINGPAYMENT','CANCELLED','APPROVED','CITIZENACTIONREQUIRED','CITIZENACTIONREQUIRED-DV') AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 20 * 24 * 60 * 60 * 1000) + WHERE 1=1 GROUP BY tenantid, status, servicename, financialyear) SELECT 'pb.punjab' as departmentID, 'Punjab Local Government' as departmentName, SUM(ta.cnt) AS TotalApplicationReceived, COALESCE(SUM(pa.cnt), 0) AS PendingBeyondTimelineApplicationCount From 3ebcac0558a37bb1fd49f21e0435e907924d61ac Mon Sep 17 00:00:00 2001 From: M125688 Date: Thu, 8 May 2025 20:53:08 +0530 Subject: [PATCH 1623/1630] Update pending.yml --- configs/reports/configs/pending.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index 83b975bc6..5a316e8cf 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -159,25 +159,21 @@ ReportDefinitions: pending_appl AS (SELECT tenantid, applicationstatus, servicename, COUNT(*) AS cnt, financialyear FROM ws_data WHERE applicationstatus NOT IN ('CONNECTION_ACTIVATED', 'INITIATED','REJECTED','PENDING_FOR_CONNECTION_ACTIVATION','PENDING_FOR_PAYMENT') AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 11 * 24 * 60 * 60 * 1000) - WHERE 1=1 GROUP BY tenantid, applicationstatus, servicename, financialyear UNION ALL SELECT tenantid, applicationstatus, servicename, COUNT(*) AS cnt, financialyear FROM sw_data WHERE applicationstatus NOT IN ('CONNECTION_ACTIVATED', 'INITIATED','REJECTED','PENDING_FOR_CONNECTION_ACTIVATION','PENDING_FOR_PAYMENT') AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 11 * 24 * 60 * 60 * 1000) - WHERE 1=1 GROUP BY tenantid, applicationstatus, servicename, financialyear UNION ALL SELECT tenantid, status AS applicationstatus, servicename, COUNT(*) AS cnt, financialyear FROM tl_data WHERE status NOT IN ('INITIATED','REJECTED','PENDINGPAYMENT' , 'APPLIED','CANCELLED','APPROVED','CITIZENACTIONREQUIRED') - AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 18 * 24 * 60 * 60 * 1000) - WHERE 1=1 + AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 18 * 24 * 60 * 60 * 1000) GROUP BY tenantid, status, servicename, financialyear UNION ALL SELECT tenantid, status AS applicationstatus, servicename, COUNT(*) AS cnt, financialyear FROM fn_data WHERE status NOT IN ('INITIATED','REJECTED','PENDINGPAYMENT','CANCELLED','APPROVED','CITIZENACTIONREQUIRED','CITIZENACTIONREQUIRED-DV') AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 20 * 24 * 60 * 60 * 1000) - WHERE 1=1 GROUP BY tenantid, status, servicename, financialyear) SELECT 'pb.punjab' as departmentID, 'Punjab Local Government' as departmentName, SUM(ta.cnt) AS TotalApplicationReceived, COALESCE(SUM(pa.cnt), 0) AS PendingBeyondTimelineApplicationCount From c00d2ebedc7fd2f251ddc512bdd7152192b56351 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Fri, 9 May 2025 10:49:57 +0530 Subject: [PATCH 1624/1630] Revert "Update uc-reports.yml" This reverts commit a77e3d1b042d91024cb2e92214d9ba32e4ba0ae9. --- 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 fed7d1b2c..8277f2119 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1151,7 +1151,7 @@ ReportDefinitions: isMandatory: true searchClause: AND (EXTRACT(EPOCH FROM TO_TIMESTAMP(receiptdate, 'DD-MM-YYYY')) * 1000) <= $toDate - name: servicecategory - label: reports.uc.businessservice + label: singlevaluelpaydetail.businessservicepe: 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 @@ -1920,7 +1920,7 @@ ReportDefinitions: isMandatory: false searchClause: AND (EXTRACT(EPOCH FROM TO_TIMESTAMP(receiptdate, 'DD-MM-YYYY')) * 1000) <= $toDate - name: businessdetails - label: reports.uc.businessservice + label: singlevaluelpaydetail.businessservicepe: 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 From bc974706c8fa7c59c3bf6976b69ab114cea618d2 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Fri, 9 May 2025 10:50:04 +0530 Subject: [PATCH 1625/1630] Revert "Update uc-reports.yml updated businessservice in miscreportulb_v2 and echallanreport_v2" This reverts commit 5493440b0fa719c1057c49316d50982fa6f2b67f. --- configs/reports/configs/uc-reports.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 8277f2119..f88de89d3 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1150,13 +1150,14 @@ ReportDefinitions: source: uc isMandatory: true searchClause: AND (EXTRACT(EPOCH FROM TO_TIMESTAMP(receiptdate, 'DD-MM-YYYY')) * 1000) <= $toDate - - name: servicecategory - label: singlevaluelpaydetail.businessservicepe: singlevaluelist + - 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 businessdetails = $servicecategory + searchClause: AND businessdetails = $businessservice - name: collectorname label: reports.uc.collectorname type: singlevaluelist @@ -1919,8 +1920,9 @@ ReportDefinitions: source: uc isMandatory: false searchClause: AND (EXTRACT(EPOCH FROM TO_TIMESTAMP(receiptdate, 'DD-MM-YYYY')) * 1000) <= $toDate - - name: businessdetails - label: singlevaluelpaydetail.businessservicepe: singlevaluelist + - 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 From 36e5293bc43df14be21b8b90c5619081713a43d3 Mon Sep 17 00:00:00 2001 From: M125688 Date: Fri, 9 May 2025 13:33:53 +0530 Subject: [PATCH 1626/1630] Update pending.yml --- configs/reports/configs/pending.yml | 48 ++--------------------------- 1 file changed, 2 insertions(+), 46 deletions(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index 5a316e8cf..5fe6d2b58 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -222,52 +222,8 @@ ReportDefinitions: isMandatory: false searchClause: AND ta.tenantid =$tenantid query: | - WITH ws_data AS (SELECT tenantid, applicationno, applicationstatus, createdtime, 'WS-Service' AS servicename, - CASE WHEN EXTRACT(MONTH FROM TO_TIMESTAMP(createdtime / 1000)) >= 4 THEN TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY') || '-' || - RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000) + INTERVAL '1 year', 'YYYY'), 2) ELSE TO_CHAR(TO_TIMESTAMP(createdtime / 1000) - INTERVAL '1 year', 'YYYY') || '-' || - RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY'), 2) END AS financialyear - FROM eg_ws_connection WHERE connectionno IS NULL), - sw_data AS (SELECT tenantid, applicationno, applicationstatus, createdtime,'SW-Service' AS servicename, - CASE WHEN EXTRACT(MONTH FROM TO_TIMESTAMP(createdtime / 1000)) >= 4 THEN TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY') || '-' || - RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000) + INTERVAL '1 year', 'YYYY'), 2) ELSE TO_CHAR(TO_TIMESTAMP(createdtime / 1000) - INTERVAL '1 year', 'YYYY') || '-' || - RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY'), 2) END AS financialyear - FROM eg_sw_connection WHERE connectionno IS NULL), - tl_data AS (SELECT tenantid, applicationnumber, status, createdtime,'TL-Service' AS servicename, financialyear - FROM eg_tl_tradelicense WHERE licensenumber IS NULL), - fn_data AS (SELECT tenantid, applicationnumber,status,createdtime,'FirezNOC' AS servicename,financialyear - FROM eg_fn_firenocdetail WHERE firestationid IS NULL), - total_appl AS (SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM ws_data GROUP BY tenantid, servicename, financialyear - UNION ALL - SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM sw_data GROUP BY tenantid, servicename, financialyear - UNION ALL - SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM tl_data GROUP BY tenantid, servicename, financialyear - UNION ALL - SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM fn_data GROUP BY tenantid, servicename, financialyear), - pending_appl AS (SELECT tenantid, applicationstatus, servicename, COUNT(*) AS cnt, financialyear - FROM ws_data WHERE applicationstatus NOT IN ('CONNECTION_ACTIVATED', 'INITIATED','REJECTED','PENDING_FOR_CONNECTION_ACTIVATION','PENDING_FOR_PAYMENT') - AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 11 * 24 * 60 * 60 * 1000) - GROUP BY tenantid, applicationstatus, servicename, financialyear - UNION ALL - SELECT tenantid, applicationstatus, servicename, COUNT(*) AS cnt, financialyear - FROM sw_data WHERE applicationstatus NOT IN ('CONNECTION_ACTIVATED', 'INITIATED','REJECTED','PENDING_FOR_CONNECTION_ACTIVATION','PENDING_FOR_PAYMENT') - AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 11 * 24 * 60 * 60 * 1000) - GROUP BY tenantid, applicationstatus, servicename, financialyear - UNION ALL - SELECT tenantid, status AS applicationstatus, servicename, COUNT(*) AS cnt, financialyear - FROM tl_data WHERE status NOT IN ('INITIATED','REJECTED','PENDINGPAYMENT' , 'APPLIED','CANCELLED','APPROVED','CITIZENACTIONREQUIRED') - AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 18 * 24 * 60 * 60 * 1000) - GROUP BY tenantid, status, servicename, financialyear - UNION ALL - SELECT tenantid, status AS applicationstatus, servicename, COUNT(*) AS cnt, financialyear - FROM fn_data WHERE status NOT IN ('INITIATED','REJECTED','PENDINGPAYMENT','CANCELLED','APPROVED','CITIZENACTIONREQUIRED','CITIZENACTIONREQUIRED-DV') - AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 20 * 24 * 60 * 60 * 1000) - GROUP BY tenantid, status, servicename, financialyear) - SELECT ta.tenantid as authorityID, - UPPER(SUBSTR(REPLACE(ta.tenantid, 'pb.', ''), 1, 1)) || LOWER(SUBSTR(REPLACE(ta.tenantid, 'pb.', ''), 2)) AS authorityName, - '1' as departmentID, SUM(ta.cnt) AS TotalApplicationReceived, COALESCE(SUM(pa.cnt), 0) AS PendingBeyondTimelineApplicationCount - FROM total_appl ta LEFT JOIN pending_appl pa ON pa.tenantid = ta.tenantid AND pa.servicename = ta.servicename - AND pa.financialyear = ta.financialyear WHERE ta.tenantid NOT IN ('pb.testing') - groupby: GROUP BY ta.tenantid + SELECT authorityid,authorityname,departmentid,totalapplicationreceived,pendingbeyondtimelineapplicationcount + FROM public.authority_pendency_report WHERE 1=1 - reportName: service summary: Service Wise Pendency Report From 1eb93917c27a087fe63e7db10998b22037f35c55 Mon Sep 17 00:00:00 2001 From: M125688 Date: Fri, 9 May 2025 14:08:55 +0530 Subject: [PATCH 1627/1630] Update pending.yml --- configs/reports/configs/pending.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index 5fe6d2b58..aabca205f 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -220,7 +220,7 @@ ReportDefinitions: source: rainmaker-misc wrapper: true isMandatory: false - searchClause: AND ta.tenantid =$tenantid + searchClause: AND tenantid =$tenantid query: | SELECT authorityid,authorityname,departmentid,totalapplicationreceived,pendingbeyondtimelineapplicationcount FROM public.authority_pendency_report WHERE 1=1 From 0bc6433dfee6653ce77dc01c177f584a229522f7 Mon Sep 17 00:00:00 2001 From: M125688 Date: Fri, 9 May 2025 14:23:25 +0530 Subject: [PATCH 1628/1630] Update pending.yml --- configs/reports/configs/pending.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index aabca205f..174bd67cd 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -220,7 +220,7 @@ ReportDefinitions: source: rainmaker-misc wrapper: true isMandatory: false - searchClause: AND tenantid =$tenantid + searchClause: AND authorityid =$tenantid query: | SELECT authorityid,authorityname,departmentid,totalapplicationreceived,pendingbeyondtimelineapplicationcount FROM public.authority_pendency_report WHERE 1=1 From de759a2f48feff2d939a558c98b6afe93bd6e44d Mon Sep 17 00:00:00 2001 From: M125688 Date: Fri, 9 May 2025 14:41:08 +0530 Subject: [PATCH 1629/1630] Update pending.yml --- configs/reports/configs/pending.yml | 54 +++-------------------------- 1 file changed, 4 insertions(+), 50 deletions(-) diff --git a/configs/reports/configs/pending.yml b/configs/reports/configs/pending.yml index 174bd67cd..39e1763e6 100644 --- a/configs/reports/configs/pending.yml +++ b/configs/reports/configs/pending.yml @@ -267,7 +267,7 @@ ReportDefinitions: pattern: 'list://TL%:TL-Renewal,SW%:SW-Service,WS%:WS-Service,FN%:FireNoc,BS%:Bill Amendment' source: rainmaker-misc isMandatory: false - searchClause: AND ta.servicename =$serviceID + searchClause: AND servicename =$serviceID - name: tenantId label: tenantid type: singlevaluelist @@ -275,56 +275,10 @@ ReportDefinitions: source: rainmaker-misc wrapper: true isMandatory: false - searchClause: AND ta.tenantid =$tenantid + searchClause: AND authorityid =$tenantid query: | - WITH ws_data AS (SELECT tenantid, applicationno, applicationstatus, createdtime, 'WS-Service' AS servicename, - CASE WHEN EXTRACT(MONTH FROM TO_TIMESTAMP(createdtime / 1000)) >= 4 THEN TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY') || '-' || - RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000) + INTERVAL '1 year', 'YYYY'), 2) ELSE TO_CHAR(TO_TIMESTAMP(createdtime / 1000) - INTERVAL '1 year', 'YYYY') || '-' || - RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY'), 2) END AS financialyear - FROM eg_ws_connection WHERE connectionno IS NULL), - sw_data AS (SELECT tenantid, applicationno, applicationstatus, createdtime,'SW-Service' AS servicename, - CASE WHEN EXTRACT(MONTH FROM TO_TIMESTAMP(createdtime / 1000)) >= 4 THEN TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY') || '-' || - RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000) + INTERVAL '1 year', 'YYYY'), 2) ELSE TO_CHAR(TO_TIMESTAMP(createdtime / 1000) - INTERVAL '1 year', 'YYYY') || '-' || - RIGHT(TO_CHAR(TO_TIMESTAMP(createdtime / 1000), 'YYYY'), 2) END AS financialyear - FROM eg_sw_connection WHERE connectionno IS NULL), - tl_data AS (SELECT tenantid, applicationnumber, status, createdtime,'TL-Service' AS servicename, financialyear - FROM eg_tl_tradelicense WHERE licensenumber IS NULL), - fn_data AS (SELECT tenantid, applicationnumber,status,createdtime,'FirezNOC' AS servicename,financialyear - FROM eg_fn_firenocdetail WHERE firestationid IS NULL), - total_appl AS (SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM ws_data GROUP BY tenantid, servicename, financialyear - UNION ALL - SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM sw_data GROUP BY tenantid, servicename, financialyear - UNION ALL - SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM tl_data GROUP BY tenantid, servicename, financialyear - UNION ALL - SELECT tenantid, servicename, COUNT(*) AS cnt, financialyear FROM fn_data GROUP BY tenantid, servicename, financialyear), - pending_appl AS (SELECT tenantid, applicationstatus, servicename, COUNT(*) AS cnt, financialyear - FROM ws_data WHERE applicationstatus NOT IN ('CONNECTION_ACTIVATED', 'INITIATED','REJECTED','PENDING_FOR_CONNECTION_ACTIVATION','PENDING_FOR_PAYMENT') - AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 11 * 24 * 60 * 60 * 1000) - GROUP BY tenantid, applicationstatus, servicename, financialyear - UNION ALL - SELECT tenantid, applicationstatus, servicename, COUNT(*) AS cnt, financialyear - FROM sw_data WHERE applicationstatus NOT IN ('CONNECTION_ACTIVATED', 'INITIATED','REJECTED','PENDING_FOR_CONNECTION_ACTIVATION','PENDING_FOR_PAYMENT') - AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 11 * 24 * 60 * 60 * 1000) - GROUP BY tenantid, applicationstatus, servicename, financialyear - UNION ALL - SELECT tenantid, status AS applicationstatus, servicename, COUNT(*) AS cnt, financialyear - FROM tl_data WHERE status NOT IN ('INITIATED','REJECTED','PENDINGPAYMENT' , 'APPLIED','CANCELLED','APPROVED','CITIZENACTIONREQUIRED') - AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 18 * 24 * 60 * 60 * 1000) - GROUP BY tenantid, status, servicename, financialyear - UNION ALL - SELECT tenantid, status AS applicationstatus, servicename, COUNT(*) AS cnt, financialyear - FROM fn_data WHERE status NOT IN ('INITIATED','REJECTED','PENDINGPAYMENT','CANCELLED','APPROVED','CITIZENACTIONREQUIRED','CITIZENACTIONREQUIRED-DV') - AND createdtime < (EXTRACT(EPOCH FROM now()) * 1000 - 20 * 24 * 60 * 60 * 1000) - GROUP BY tenantid, status, servicename, financialyear) - SELECT '' as serviceID,ta.servicename AS serviceName,ta.tenantid AS authorityID,'1' as departmentID, - SUM(ta.cnt) AS TotalApplicationReceived, - COALESCE(SUM(pa.cnt), 0) AS PendingBeyondTimelineApplicationCount - FROM total_appl ta LEFT JOIN pending_appl pa ON pa.tenantid = ta.tenantid - AND pa.servicename = ta.servicename - AND pa.financialyear = ta.financialyear - WHERE ta.tenantid NOT IN ('pb.testing') - groupby: GROUP BY ta.tenantid, ta.servicename + SELECT serviceid,servicename,authorityid,departmentid,totalapplicationreceived,pendingbeyondtimelineapplicationcount + FROM public.service_pendency_report WHERE 1=1 - reportName: wspendencydetails summary: Pendency Details - Water Service From c0b08df6c2eff37fbf39ca4fb106747b027debf9 Mon Sep 17 00:00:00 2001 From: Suniitadevi Date: Wed, 14 May 2025 16:30:10 +0530 Subject: [PATCH 1630/1630] Create swach-reports.yml --- configs/reports/configs/swach-reports.yml | 62 +++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 configs/reports/configs/swach-reports.yml diff --git a/configs/reports/configs/swach-reports.yml b/configs/reports/configs/swach-reports.yml new file mode 100644 index 000000000..286eff7d6 --- /dev/null +++ b/configs/reports/configs/swach-reports.yml @@ -0,0 +1,62 @@ +--- +ReportDefinitions: + - reportName: Attendance_report_swach + decryptionPathId: ULBPTDataDumpReport_V2 + summary: Swach Attendence Report + version: 1.0.0 + moduleName: rainmaker-swach + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: id + label: swachId + type: string + source: rainmaker-swach + total: false + - name: tenantid + label: tenantid + type: string + source: rainmaker-swach + total: false + - name: latitude + label: latitude + type: string + source: rainmaker-swach + total: false + - name: longitude + label: longitude + type: string + source: rainmaker-swach + total: false + - name: locality + label: locality + type: string + source: rainmaker-swach + total: false + - name: imagerurl + label: imagerurl + type: string + source: rainmaker-swach + total: false + - name: createdtime + label: createdtime + type: string + source: rainmaker-swach + total: false + - name: ownername + label: username + type: string + source: rainmaker-swach + total: false + - name: mobileno + label: mobilenumber + type: string + source: rainmaker-swach + total: false + query: | + SELECT swach.id, swach.tenant_id as tenantid, swach.uuid, swach.latitude, swach.longitude, swach.locality, + swach.imagerurl, to_char((To_timestamp(swach.created_time/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as createdtime, swach.created_by as createdby, to_char((To_timestamp(swach.last_updated_time/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as lastupdatedtime, + swach.last_updated_by as lastupdatedby, us.name as ownername,us.mobilenumber as mobileno + FROM public.egov_swach_imagedata swach + INNER JOIN public.eg_user us ON us.uuid = swach.uuid