Skip to content
This repository has been archived by the owner on Nov 26, 2024. It is now read-only.

updating bill genie query #800

Open
wants to merge 890 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
890 commits
Select commit Hold shift + click to select a range
80ce883
Fix for additionals details not saving while updating innerdimension
sanjeev-eGov Mar 11, 2021
d2ec93a
Merge pull request #574 from egovernments/sanjeev-eGov-patch-9
Mar 11, 2021
142ee9b
Added mutation billing slab
sanjeev-eGov Mar 15, 2021
c1277c9
Merge pull request #575 from egovernments/sanjeev-eGov-patch-9
Mar 15, 2021
b1dfe29
Update pt-reports.yml
saumya-egov Mar 22, 2021
2f5a93d
Merge pull request #577 from egovernments/saumya-egov-patch-57
priyankarani-eGov Mar 22, 2021
135397b
Added PT locality to uat
sanjeev-eGov Mar 23, 2021
1f77457
Merge pull request #578 from egovernments/sanjeev-eGov-patch-9
Mar 23, 2021
d78a5cb
Corrected report query for v2
sanjeev-eGov Mar 23, 2021
ccf34f1
Merge pull request #579 from egovernments/sanjeev-eGov-patch-10
Mar 23, 2021
8eee2b6
Update email impacter to property tax module v2
sanjeev-eGov Mar 30, 2021
9f6e97e
Merge pull request #588 from egovernments/sanjeev-eGov-patch-10
Mar 30, 2021
f06fefe
Update consolidatedreceipt.json
saumya-egov Mar 31, 2021
234d74b
Merge pull request #589 from egovernments/saumya-egov-patch-57
priyankarani-eGov Mar 31, 2021
3bdceea
Revert "Update consolidatedreceipt.json"
saumya-egov Mar 31, 2021
9489641
Merge pull request #590 from egovernments/revert-589-saumya-egov-patc…
priyankarani-eGov Mar 31, 2021
6cd615d
Update consolidatedreceipt.json
saumya-egov Mar 31, 2021
daea57c
Merge pull request #591 from egovernments/saumya-egov-patch-58
priyankarani-eGov Mar 31, 2021
19bc932
Update consolidatedreceipt.json
saumya-egov Mar 31, 2021
ebc373b
Merge pull request #592 from egovernments/saumya-egov-patch-59
priyankarani-eGov Mar 31, 2021
9e1307a
Update consolidatedreceipt.json
saumya-egov Mar 31, 2021
c373d3b
Merge pull request #593 from egovernments/saumya-egov-patch-60
priyankarani-eGov Mar 31, 2021
67d5695
Update property-services-registry.yml
khemanth-eGov Apr 1, 2021
a08c0af
Merge pull request #596 from egovernments/khemanth-eGov-patch-4
guruprasadreddy-wt-egov Apr 1, 2021
dea45b0
Update property-services-registry.yml
khemanth-eGov Apr 1, 2021
62b74f5
Merge pull request #597 from egovernments/khemanth-eGov-patch-7
guruprasadreddy-wt-egov Apr 1, 2021
812c0f3
Update property-services-registry.yml
khemanth-eGov Apr 1, 2021
fb12e03
Merge pull request #598 from egovernments/khemanth-eGov-patch-8
guruprasadreddy-wt-egov Apr 1, 2021
f84694e
Update property-services-registry.yml
khemanth-eGov Apr 1, 2021
3d50323
Merge pull request #599 from egovernments/khemanth-eGov-patch-9
guruprasadreddy-wt-egov Apr 1, 2021
5a6d8ed
Update property-services-registry.yml
khemanth-eGov Apr 1, 2021
1d10785
Merge pull request #600 from egovernments/khemanth-eGov-patch-10
guruprasadreddy-wt-egov Apr 1, 2021
92b2129
Update property-services-registry.yml
khemanth-eGov Apr 1, 2021
1f10623
Merge pull request #601 from egovernments/khemanth-eGov-patch-11
guruprasadreddy-wt-egov Apr 1, 2021
aec202b
Create rollover-batch-count-persister.yml
khemanth-eGov Apr 5, 2021
0456b47
Merge pull request #603 from egovernments/khemanth-eGov-patch-12
guruprasadreddy-wt-egov Apr 6, 2021
b5b9c91
Update consolidatedreceipt.json
saumya-egov Apr 6, 2021
9231806
Update consolidatedreceipt.json
saumya-egov Apr 6, 2021
c8fc00c
Merge pull request #605 from egovernments/saumya-egov-patch-62
guruprasadreddy-wt-egov Apr 6, 2021
f80bd17
Merge pull request #604 from egovernments/saumya-egov-patch-61
guruprasadreddy-wt-egov Apr 6, 2021
615c12d
Update consolidatedreceipt.json
saumya-egov Apr 6, 2021
079d841
Merge pull request #606 from egovernments/saumya-egov-patch-63
guruprasadreddy-wt-egov Apr 6, 2021
1261399
Update pt-reports.yml
khemanth-eGov May 7, 2021
4cadcc3
Merge pull request #609 from egovernments/khemanth-eGov-patch-13
guruprasadreddy-wt-egov May 7, 2021
f2218ac
Update consolidatedreceipt.json (#612)
saumya-egov May 11, 2021
6f566a0
Created pt mutation Receipt (#613)
guruprasadreddy-wt-egov May 17, 2021
c82e214
Created ptmutationcertificate.json (#614)
guruprasadreddy-wt-egov May 17, 2021
740c16c
Created pt-mutation-reciept.json (#615)
guruprasadreddy-wt-egov May 17, 2021
3bd63e5
created ptmutationcertificate.json (#616)
guruprasadreddy-wt-egov May 17, 2021
a4f9e0d
created format ptmutationcertificate.json (#617)
guruprasadreddy-wt-egov May 17, 2021
f2969aa
Update pt-mutation-reciept.json
saumya-egov May 18, 2021
a7ab8a1
Merge pull request #618 from egovernments/saumya-egov-patch-65
guruprasadreddy-wt-egov May 18, 2021
f94f8ba
Update pt-mutation-reciept.json (#619)
saumya-egov May 25, 2021
5b3cda5
Adding Bulk Bill batch persister (#620)
khemanth-eGov May 26, 2021
f59cb66
Update bulkbill-batch-count-persister.yml
khemanth-eGov May 27, 2021
9884fe4
Merge pull request #622 from egovernments/khemanth-eGov-patch-14
guruprasadreddy-wt-egov May 27, 2021
4bc90b7
fix for wrong value in mutation table UKI-1257
saumya-egov May 27, 2021
421b24b
Merge pull request #623 from egovernments/saumya-egov-patch-67
guruprasadreddy-wt-egov May 27, 2021
516277c
mutation fee issue fix
saumya-egov May 31, 2021
3c18ad4
Merge pull request #624 from egovernments/saumya-egov-patch-67
guruprasadreddy-wt-egov May 31, 2021
529a438
Update pt-mutation-reciept.json
saumya-egov May 31, 2021
ae31dd1
Merge pull request #625 from egovernments/saumya-egov-patch-68
guruprasadreddy-wt-egov May 31, 2021
81b62c9
Update pt-mutation-reciept.json (#626)
saumya-egov Jun 1, 2021
8bccbfd
Update pt-reports.yml
khemanth-eGov Jun 17, 2021
9a7e010
Merge pull request #627 from egovernments/khemanth-eGov-patch-15
guruprasadreddy-wt-egov Jun 17, 2021
e91638b
Update pt-reports.yml
khemanth-eGov Jun 17, 2021
d10f0af
Merge pull request #628 from egovernments/khemanth-eGov-patch-15
guruprasadreddy-wt-egov Jun 17, 2021
85a696f
Update consolidatedreceipt.json
khemanth-eGov Jun 18, 2021
dcf400e
Merge pull request #634 from egovernments/khemanth-eGov-patch-15
guruprasadreddy-wt-egov Jun 18, 2021
7367e9e
making the mutation order not ulb dependent
saumya-egov Jun 21, 2021
e9e5d00
Merge pull request #635 from egovernments/saumya-egov-patch-71
guruprasadreddy-wt-egov Jun 21, 2021
a4ec956
adding type to the order
saumya-egov Jun 21, 2021
08d4ae6
Merge pull request #636 from egovernments/saumya-egov-patch-71
guruprasadreddy-wt-egov Jun 21, 2021
687b2f5
alignment issue fix
saumya-egov Jun 21, 2021
8c24b7c
Merge pull request #637 from egovernments/saumya-egov-patch-72
guruprasadreddy-wt-egov Jun 21, 2021
61e4cd5
alignment fix
saumya-egov Jun 21, 2021
23f833e
Merge pull request #638 from egovernments/saumya-egov-patch-73
guruprasadreddy-wt-egov Jun 21, 2021
4d98b07
alignment fix for receipt (#639)
saumya-egov Jun 22, 2021
f4c9c0f
config taken from product (#641)
saumya-egov Jun 30, 2021
44e9c9f
[UKI-1334] Changes in weekly emailer (#643)
ManasaNiranjan-eGov Jul 8, 2021
2f60e0b
Update pt-reports.yml (#645)
ManasaNiranjan-eGov Jul 9, 2021
6c72d27
Update ChartApiConfig.json (#647)
saumya-egov Jul 12, 2021
006fecc
adding pt in dss (#648)
saumya-egov Jul 13, 2021
bd218a1
dss changes for pt -2 (#649)
saumya-egov Jul 13, 2021
6eea061
Update property-services.yml
khemanth-eGov Jul 14, 2021
809b47d
Merge pull request #650 from egovernments/khemanth-eGov-patch-16
saumya-egov Jul 14, 2021
973b604
Dashboard config for PT (#653)
saumya-egov Jul 21, 2021
f81ac01
added PT charts (#652)
saumya-egov Jul 21, 2021
b491c2e
correcting the tenant id from pb to uk (#655)
saumya-egov Jul 21, 2021
626bc54
chart 1 -total collection PT (#656)
saumya-egov Jul 21, 2021
9bd7fff
dss changes for pt (#657)
saumya-egov Jul 21, 2021
f123843
changing chart name (#658)
saumya-egov Jul 21, 2021
72471bb
dss pt (#659)
saumya-egov Jul 21, 2021
fdd478d
PT charts (#660)
saumya-egov Jul 22, 2021
072fb87
pt charts
saumya-egov Jul 22, 2021
0495fb0
Merge pull request #661 from egovernments/saumya-egov-patch-80
guruprasadreddy-wt-egov Jul 22, 2021
82edbd7
dss pt changes
saumya-egov Jul 22, 2021
4d0c2f3
Merge pull request #662 from egovernments/saumya-egov-patch-81
guruprasadreddy-wt-egov Jul 22, 2021
423a0e1
dss PT
saumya-egov Jul 22, 2021
ad68128
Merge pull request #663 from egovernments/saumya-egov-patch-82
guruprasadreddy-wt-egov Jul 22, 2021
960600e
dss changes (#664)
saumya-egov Jul 22, 2021
44c5465
dss changes (#665)
saumya-egov Jul 22, 2021
5ad1dd4
dss changes (#666)
saumya-egov Jul 22, 2021
dd5c776
dss pt
saumya-egov Jul 22, 2021
a30c635
Merge pull request #667 from egovernments/saumya-egov-patch-81
guruprasadreddy-wt-egov Jul 22, 2021
525dfe5
dss pt (#668)
saumya-egov Jul 22, 2021
d5ad36f
dss pt (#669)
saumya-egov Jul 22, 2021
e447e5c
Update ChartApiConfig.json
palak-egov Jul 22, 2021
6ef6cc2
dss pt (#671)
saumya-egov Jul 22, 2021
33ffd69
Merge pull request #670 from egovernments/palak-egov-patch-1
saumya-egov Jul 22, 2021
922eada
removing unnecessary chart
saumya-egov Jul 29, 2021
44dc883
Merge pull request #672 from egovernments/saumya-egov-patch-84
ManasaNiranjan-eGov Jul 29, 2021
c9091cf
adding table drill down charts (#674)
saumya-egov Jul 30, 2021
a1c710b
adding table drilldown charts (#675)
saumya-egov Jul 30, 2021
41b8e56
drill chart fix (#676)
saumya-egov Jul 30, 2021
cfc0d31
drill chart (#678)
saumya-egov Aug 2, 2021
9227984
dss chart (#679)
saumya-egov Aug 2, 2021
97b8072
adding pie chart for mutation and creation (#680)
saumya-egov Aug 2, 2021
d935d1e
adding creation reason wise chart (#681)
saumya-egov Aug 2, 2021
52ed63d
removing drill chart (#682)
saumya-egov Aug 2, 2021
986e40c
dss (#684)
saumya-egov Aug 6, 2021
3a3ddd5
dss pt (#685)
saumya-egov Aug 6, 2021
5e19cf1
dss pt (#686)
saumya-egov Aug 6, 2021
b96fd11
dss PT for SURE dashboard (#687)
saumya-egov Aug 6, 2021
7b7c60e
Update rainmaker-pt-indexer.yml (#689)
saumya-egov Aug 11, 2021
59a3846
dss pt charts (#691)
saumya-egov Aug 12, 2021
0a458e6
dss charts (#692)
saumya-egov Aug 12, 2021
a700ebd
[UKI-1422] formatting revenue collected for tl
palak-egov Aug 12, 2021
bc0243c
Merge pull request #693 from egovernments/palak-egov-patch-3
ManasaNiranjan-eGov Aug 12, 2021
5b1cbd3
changing ptindex to property_services (#694)
saumya-egov Aug 12, 2021
95df1ee
adding property service (#695)
saumya-egov Aug 12, 2021
483bdae
Update pt-mutation-reciept.json
shreyaraghunandan-eGov Aug 17, 2021
e4de2be
Merge pull request #697 from egovernments/shreyaraghunandan-eGov-patch-1
saumya-egov Aug 17, 2021
08b60e2
[UKI-1422] Changes in weekly emailer to include BBPS transactions (#698)
ManasaNiranjan-eGov Aug 18, 2021
75c18c8
[UKI-1422] Changes in weekly emailer to include BBPS transactions (#699)
ManasaNiranjan-eGov Aug 18, 2021
7541ee5
[UKI-1482] from and todate for adoption report.
palak-egov Aug 27, 2021
97bd8c5
Merge pull request #703 from egovernments/palak-egov-patch-5
ManasaNiranjan-eGov Aug 27, 2021
ead1a45
Update ChartApiConfig.json
saumya-egov Aug 30, 2021
700f171
Merge pull request #704 from egovernments/saumya-egov-patch-85
ManasaNiranjan-eGov Aug 30, 2021
a0a4033
Update MasterDashboardConfig.json
saumya-egov Aug 30, 2021
89c8586
Merge pull request #705 from egovernments/saumya-egov-patch-86
ManasaNiranjan-eGov Aug 30, 2021
72cc62c
Update ChartApiConfig.json
saumya-egov Aug 30, 2021
6dee4ed
Merge pull request #706 from egovernments/saumya-egov-patch-87
ManasaNiranjan-eGov Aug 30, 2021
2bc0eca
Update ChartApiConfig.json
saumya-egov Aug 30, 2021
d7e95a3
Merge pull request #707 from egovernments/saumya-egov-patch-88
ManasaNiranjan-eGov Aug 30, 2021
19f9de4
Update ChartApiConfig.json
saumya-egov Aug 30, 2021
f394fca
Merge pull request #708 from egovernments/saumya-egov-patch-87
ManasaNiranjan-eGov Aug 30, 2021
cf3c729
Update ChartApiConfig.json
saumya-egov Aug 30, 2021
18b13c8
Update MasterDashboardConfig.json
saumya-egov Aug 30, 2021
802f6be
Merge pull request #709 from egovernments/saumya-egov-patch-88
ManasaNiranjan-eGov Aug 30, 2021
a30271d
Merge pull request #710 from egovernments/saumya-egov-patch-89
ManasaNiranjan-eGov Aug 30, 2021
3a3647f
Update pt-reports.yml
ManasaNiranjan-eGov Aug 30, 2021
686f652
Merge pull request #711 from egovernments/ManasaNiranjan-eGov-patch-4
saumya-egov Aug 30, 2021
5c1a490
Update ChartApiConfig.json
saumya-egov Aug 30, 2021
2b7dfa5
Update ChartApiConfig.json
saumya-egov Aug 30, 2021
37611ca
Update MasterDashboardConfig.json
saumya-egov Aug 30, 2021
8642fd7
Merge pull request #712 from egovernments/saumya-egov-patch-90
ManasaNiranjan-eGov Aug 30, 2021
35322f5
Merge pull request #713 from egovernments/saumya-egov-patch-91
ManasaNiranjan-eGov Aug 30, 2021
1725405
Update ChartApiConfig.json
saumya-egov Aug 30, 2021
ad60c0e
Merge pull request #714 from egovernments/saumya-egov-patch-90
ManasaNiranjan-eGov Aug 30, 2021
bf50e7c
Update MasterDashboardConfig.json (#715)
saumya-egov Aug 30, 2021
87fd038
syntax error
saumya-egov Aug 31, 2021
384e89a
Merge pull request #716 from egovernments/saumya-egov-patch-92
ManasaNiranjan-eGov Aug 31, 2021
beb69ae
Update ChartApiConfig.json
saumya-egov Aug 31, 2021
ce1d298
Update MasterDashboardConfig.json
saumya-egov Aug 31, 2021
c51174d
Merge pull request #717 from egovernments/saumya-egov-patch-93
ManasaNiranjan-eGov Aug 31, 2021
6ae7132
Merge pull request #718 from egovernments/saumya-egov-patch-94
ManasaNiranjan-eGov Aug 31, 2021
27c0638
Update ChartApiConfig.json (#719)
saumya-egov Aug 31, 2021
e20c389
Update ChartApiConfig.json
saumya-egov Sep 1, 2021
97ae6fa
Merge pull request #720 from egovernments/saumya-egov-patch-95
ManasaNiranjan-eGov Sep 1, 2021
f2031ef
Update DomainConfig.json
saumya-egov Sep 1, 2021
ac2bfa9
Update MasterDashboardConfig.json (#722)
saumya-egov Sep 1, 2021
595abcd
Merge pull request #721 from egovernments/saumya-egov-patch-96
ManasaNiranjan-eGov Sep 1, 2021
9957a1a
Update DomainConfig.json
saumya-egov Sep 1, 2021
7795e2e
Merge pull request #723 from egovernments/saumya-egov-patch-96
ManasaNiranjan-eGov Sep 1, 2021
2fa73fb
Update DomainConfig.json (#725)
saumya-egov Sep 2, 2021
38279bd
Update transform_pt_v1.json (#726)
saumya-egov Sep 2, 2021
6ed615b
UKI-1531 (#727)
saumya-egov Sep 20, 2021
57cf874
Update localitySearcher.yml
shreyaraghunandan-eGov Sep 28, 2021
c06b063
Merge pull request #729 from egovernments/shreyaraghunandan-eGov-patc…
saumya-egov Sep 28, 2021
abc6d4e
Update localitySearcher.yml (#733)
shreyaraghunandan-eGov Oct 5, 2021
fa2c058
Update localitySearcher.yml
shreyaraghunandan-eGov Oct 7, 2021
f888458
Merge pull request #737 from egovernments/shreyaraghunandan-eGov-patch-7
ManasaNiranjan-eGov Oct 7, 2021
c96417b
Update pt-reports.yml
Suman467 Oct 18, 2021
8f5cc17
Merge pull request #741 from Suman467/patch-3
ManasaNiranjan-eGov Oct 20, 2021
92f485f
Update pt-reports.yml
Suman467 Oct 27, 2021
38a4e45
NGRSW-1178 ward wise search result issue fix
saumya-egov Oct 27, 2021
9764e56
Merge pull request #747 from egovernments/saumya-egov-patch-98
ManasaNiranjan-eGov Oct 27, 2021
d751b2b
added trim in mohala search
saumya-egov Oct 27, 2021
b592e85
Merge pull request #748 from egovernments/saumya-egov-patch-99
ManasaNiranjan-eGov Oct 27, 2021
191ecee
Merge pull request #745 from Suman467/patch-6
ManasaNiranjan-eGov Oct 27, 2021
f469178
Update pt-reports.yml
saumya-egov Oct 28, 2021
2b4ac38
Merge pull request #750 from egovernments/saumya-egov-patch-100
ManasaNiranjan-eGov Oct 28, 2021
5bb21d8
Update pt-reports.yml
saumya-egov Oct 28, 2021
389aef8
Merge pull request #751 from egovernments/saumya-egov-patch-100
ManasaNiranjan-eGov Oct 28, 2021
6b8ef2a
neft ,rtgs search fix (#752)
saumya-egov Oct 28, 2021
da9587e
Update consolidatedreceipt.json (#754)
shreyaraghunandan-eGov Nov 8, 2021
cf84e86
Update consolidatedreceipt.json (#755)
shreyaraghunandan-eGov Nov 8, 2021
6ca714f
Update consolidatedreceipt.json (#758)
khemanth-eGov Nov 10, 2021
f961006
Update pt-reports.yml
sachin1302 Dec 3, 2021
18320c0
Merge pull request #761 from sachin1302/patch-2
ManasaNiranjan-eGov Dec 3, 2021
a9da8ea
Update pt-reports.yml
sachin1302 Dec 14, 2021
5a025fe
Merge pull request #762 from sachin1302/patch-3
ManasaNiranjan-eGov Dec 16, 2021
3604cdb
Pt reports not working fix (#764)
shreyaraghunandan-eGov Dec 16, 2021
7f20fe0
correcting the path
saumya-egov Dec 21, 2021
5da9ede
Merge pull request #766 from egovernments/saumya-egov-patch-101
guruprasadreddy-wt-egov Dec 21, 2021
3b67cad
correcting charts for pt
saumya-egov Dec 21, 2021
5672282
Merge pull request #767 from egovernments/saumya-egov-patch-101
ManasaNiranjan-eGov Dec 21, 2021
994ae15
adding drill down
saumya-egov Dec 21, 2021
5ac62d4
Merge pull request #768 from egovernments/saumya-egov-patch-102
ManasaNiranjan-eGov Dec 21, 2021
ef1f7c5
usagetype and top bottom performing chart (#769)
saumya-egov Dec 21, 2021
8a1ac90
adding usagetype and top bottom performing (#770)
saumya-egov Dec 21, 2021
71b4761
adding revenue drill down charts
saumya-egov Dec 21, 2021
f5a332f
Merge pull request #771 from egovernments/saumya-egov-patch-101
guruprasadreddy-wt-egov Dec 21, 2021
3a271ad
correctly placing the charts (#772)
saumya-egov Dec 21, 2021
9e39bfb
correcting query for drill chart (#773)
saumya-egov Dec 22, 2021
85b72a0
correcting ddr chart
saumya-egov Dec 28, 2021
eff7b3f
Merge pull request #776 from egovernments/saumya-egov-patch-101
ManasaNiranjan-eGov Dec 28, 2021
bc781a9
Modifying the query
khemanth-eGov Dec 30, 2021
9bfda8c
Merge pull request #777 from egovernments/khemanth-eGov-patch-18
saumya-egov Dec 30, 2021
5d67ae4
Modifying the query
khemanth-eGov Dec 30, 2021
d4d90bb
Merge pull request #778 from egovernments/khemanth-eGov-patch-18
saumya-egov Dec 30, 2021
0fb33b1
Update consolidatedbill.json
khemanth-eGov Jan 3, 2022
ffe0f26
Update consolidatedbill.json
khemanth-eGov Jan 3, 2022
ccaa1e1
Update consolidatedbill.json
khemanth-eGov Jan 3, 2022
f5fe0e8
Merge pull request #779 from egovernments/khemanth-eGov-patch-18
saumya-egov Jan 3, 2022
be38ab7
Update consolidatedbill.json
khemanth-eGov Jan 5, 2022
ee47076
Update consolidatedbill.json
khemanth-eGov Jan 5, 2022
6cb5064
Merge pull request #780 from egovernments/khemanth-eGov-patch-18
shreyaraghunandan-eGov Jan 5, 2022
db26c9d
Update consolidatedbill.json
khemanth-eGov Jan 5, 2022
3fc4d9e
Merge pull request #781 from egovernments/khemanth-eGov-patch-19
shreyaraghunandan-eGov Jan 5, 2022
338b3eb
Update consolidatedbill.json
khemanth-eGov Jan 5, 2022
f97c3f4
Merge pull request #782 from egovernments/khemanth-eGov-patch-20-1
saumya-egov Jan 5, 2022
0adc654
Update consolidatedbill.json
khemanth-eGov Jan 5, 2022
929458d
Merge pull request #783 from egovernments/khemanth-eGov-patch-21
saumya-egov Jan 5, 2022
11926aa
Update consolidatedbill.json
khemanth-eGov Jan 6, 2022
e8ff4f9
Update consolidatedbill.json
khemanth-eGov Jan 6, 2022
0b3abae
Merge pull request #784 from egovernments/khemanth-eGov-patch-21
saumya-egov Jan 6, 2022
143d165
Update consolidatedbill.json
khemanth-eGov Jan 18, 2022
5c265f1
Update consolidatedbill.json
khemanth-eGov Jan 18, 2022
63ecb54
Merge pull request #786 from egovernments/khemanth-eGov-patch-21
saumya-egov Jan 18, 2022
2fa1de2
Update consolidatedbill.json
khemanth-eGov Jan 18, 2022
97bd26f
Merge pull request #787 from egovernments/khemanth-eGov-patch-22
saumya-egov Jan 18, 2022
376b5da
Update pt-reports.yml
sachin1302 Jan 29, 2022
90769fb
Update pt-reports.yml
sachin1302 Feb 7, 2022
ee7fdfa
Merge pull request #791 from sachin1302/patch-8
ManasaNiranjan-eGov Feb 7, 2022
31045d8
Update pt-reports.yml (#795)
ManasaNiranjan-eGov Feb 8, 2022
fe5b5ba
Create bill-genie.yml
shreyaraghunandan-eGov Feb 21, 2022
93c7324
Update bill-genie.yml
shreyaraghunandan-eGov Feb 21, 2022
2b128a7
Update bill-genie.yml
shreyaraghunandan-eGov Feb 22, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "interactive"
}
42 changes: 2 additions & 40 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -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')
17 changes: 17 additions & 0 deletions build/build-config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#
# 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/ukd-rainmaker-customization/ukd-custom-service"
build:
- work-dir: "ukd-custom-service"
image-name: "ukd-custom-service"
dockerfile: "build/maven/Dockerfile"
- work-dir: "ukd-custom-service/src/main/resources/db"
image-name: "ukd-custom-service-db"
27 changes: 27 additions & 0 deletions build/maven/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@

FROM egovio/alpine-maven-builder-jdk-8:gcp AS build
ARG WORK_DIR
WORKDIR /app

# copy the project files
COPY ${WORK_DIR}/pom.xml ./pom.xml
COPY build/maven/start.sh ./start.sh

# not useful for stateless builds
# RUN mvn -B dependency:go-offline

COPY ${WORK_DIR}/src ./src
RUN mvn -B -f /app/pom.xml package


# Create runtime image
FROM egovio/8-openjdk-alpine


WORKDIR /opt/egov

COPY --from=build /app/target/*.jar /app/start.sh /opt/egov/

RUN chmod +x /opt/egov/start.sh

CMD ["/opt/egov/start.sh"]
11 changes: 11 additions & 0 deletions build/maven/start.sh
Original file line number Diff line number Diff line change
@@ -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
2,514 changes: 2,514 additions & 0 deletions configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json

Large diffs are not rendered by default.

Loading