Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hcm expense calculator #1867

Open
wants to merge 54 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
9e1ab08
Calculator service changes
shubhang-eGov Dec 31, 2024
f5aaca1
removing ddl file from calculator
shubhang-eGov Dec 31, 2024
f9ac2ab
updating java version
shubhang-eGov Dec 31, 2024
2227810
removing db for calculator
shubhang-eGov Dec 31, 2024
27a0166
removed expense calculator db
shubhang-eGov Jan 2, 2025
b3b356a
restored works exp calculator db
shubhang-eGov Jan 2, 2025
d6055ce
removed some validators and made changes for testing
shubhang-eGov Jan 2, 2025
eb9a2cd
adding projectutil
shubhang-eGov Jan 2, 2025
51b6ce9
Adding referenceId change for bill
shubhang-eGov Jan 4, 2025
36e13be
Changing context path
shubhang-eGov Jan 4, 2025
b19413f
made attendance approval configurable
shubhang-eGov Jan 4, 2025
0a4a64d
removed persisting meta
shubhang-eGov Jan 4, 2025
ae7f23b
removed persisting meta
shubhang-eGov Jan 4, 2025
3e61cf9
Bill Report changes in health-calculator (#1863)
shailesh-egov Jan 5, 2025
de91f49
Sending locality null, this will be changed
Jan 5, 2025
9019cd1
changed projectUtil body
shubhang-eGov Jan 5, 2025
9727108
Merge branch 'HCMPRE-1589-Payment-Calculator' of github.com:egovernme…
Jan 5, 2025
f11b729
Updated muster roll map key for report
Jan 5, 2025
48c53d6
Paginated attendance register fetching and added localityCode/referen…
shubhang-eGov Jan 5, 2025
82435cd
resolved conflict
Jan 6, 2025
47e703d
Added status in model
Jan 6, 2025
3a56b04
Setting project hierarchy as referenceId
shubhang-eGov Jan 6, 2025
cbf8787
Merge branch 'HCMPRE-1589-Payment-Calculator' of github.com:egovernme…
Jan 6, 2025
4533bc4
Sending locality code while fetching project
Jan 6, 2025
d092fe8
updated autosize coulumn because getting font issue
Jan 6, 2025
9b4094a
Testing api
shubhang-eGov Jan 6, 2025
6f0fbda
Removed devops changes for testing
shubhang-eGov Jan 6, 2025
b923ec5
Merge branch 'HCMPRE-1589-Payment-Calculator' of github.com:egovernme…
Jan 6, 2025
43d6fe7
Updated column width for excel
Jan 6, 2025
a315fc2
project response null validation
shubhang-eGov Jan 6, 2025
b8767f0
Added identifire based on config
Jan 7, 2025
8cedd49
Merge branch 'hcm-expense-calculator' of github.com:egovernments/DIGI…
Jan 7, 2025
373baff
project hierarchy null check
shubhang-eGov Jan 7, 2025
ab620a0
project hierarchy check
shubhang-eGov Jan 7, 2025
56b6668
Commenting out report initiated bill updated
shubhang-eGov Jan 8, 2025
7ac32d1
Making bill generation async
shubhang-eGov Jan 8, 2025
3815a2d
Fixing search issue
shubhang-eGov Jan 8, 2025
601ba27
Added in-progress status in reply
shubhang-eGov Jan 9, 2025
c35455a
removing log.info which is not required
shubhang-eGov Jan 9, 2025
9029929
rounding off rates
shubhang-eGov Jan 10, 2025
b007dd4
Resolved asyc issue of report generate (#1866)
shailesh-egov Jan 10, 2025
355d06f
Changed logging statements
shubhang-eGov Jan 10, 2025
8e32c8b
getting total amount from billDetail
shubhang-eGov Jan 10, 2025
38ec8bc
Updated producer request size config
Jan 10, 2025
93aab51
Added comments
shubhang-eGov Jan 13, 2025
66b7891
added comments for report generation
Jan 13, 2025
c5b0129
Merge branch 'hcm-expense-calculator' of github.com:egovernments/DIGI…
Jan 13, 2025
65767f7
added search based on localityCode
shubhang-eGov Jan 13, 2025
ebfdf8c
testing loop added
shubhang-eGov Jan 15, 2025
c6b777c
stream amounts
shubhang-eGov Jan 16, 2025
896348b
reverting stream amounts
shubhang-eGov Jan 16, 2025
7aeeb1b
Update application.properties - Change time format for excel
shailesh-egov Jan 17, 2025
3c857de
Coderabbit suggestions
shubhang-eGov Jan 21, 2025
0209950
Merge remote-tracking branch 'origin/hcm-expense-calculator' into hcm…
shubhang-eGov Jan 21, 2025
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
22 changes: 19 additions & 3 deletions backend/expense-calculator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<dependency>
<groupId>org.egov.common</groupId>
<artifactId>health-services-models</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.24-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -72,6 +72,13 @@
<artifactId>swagger-annotations</artifactId>
<version>2.2.8</version>
</dependency>
<!-- https://mvnrepository.com/artifact/net.minidev/json-smart -->
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>2.5.1</version>
</dependency>


<!-- Egov dependencies -->
<dependency>
Expand Down Expand Up @@ -104,7 +111,16 @@
<dependency>
<groupId>org.egov.works</groupId>
<artifactId>works-services-common</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.2-hcm-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>5.2.5</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
</dependencies>
<repositories>
Expand All @@ -129,4 +145,4 @@
<url>https://nexus-repo.digit.org/nexus/content/repositories/snapshots/</url>
</repository>
</repositories>
</project>
</project>
Loading