Commit Graph

1214 Commits

Author SHA1 Message Date
rajesh
511e8fbc27 Merge branch 'develop' of https://github.com/Kitzanos/GEPAFIN-BE into develop 2025-01-15 15:12:05 +05:30
rajesh
f14cf4a380 Updated code 2025-01-15 15:11:29 +05:30
nisha
f8ced30fdf Merge branch 'develop' of https://github.com/Kitzanos/GEPAFIN-BE into develop 2025-01-15 15:02:16 +05:30
nisha
04359cea40 Fixed evaluation issue 2025-01-15 15:01:07 +05:30
Rinaldo
940be7223d Merge pull request #163 from Kitzanos/feature/GEPAFINBE-86
Displayed column totals for formula-enabled in PDF
2025-01-15 09:36:14 +01:00
piyushkag
4dd0984789 Resolved conflict 2025-01-15 13:03:11 +05:30
rajeshkhore
60af83221e Merge pull request #162 from Kitzanos/feature/GEPAFINBE-137
GEPAFINBE-137(Implement pagination)
2025-01-15 12:24:13 +05:30
piyushkag
29dcf79aad Resolved conflicts 2025-01-15 12:22:53 +05:30
piyushkag
3644aa0292 Updated code 2025-01-15 12:18:46 +05:30
piyushkag
4e09ff212e Display column totals for formula-enabled in PDF 2025-01-15 11:22:18 +05:30
rajeshkhore
f803b5147c Merge pull request #161 from Kitzanos/feature/GEPAFINBE-128
GEPAFINBE-128(Create a Summary Page per User (exclude Beneficiari))
2025-01-15 11:13:59 +05:30
piyushkag
be78a78ab1 Resolved conflicts 2025-01-15 11:12:21 +05:30
piyushkag
40164bd4a0 Done ticket GEPAFINBE-137 2025-01-14 18:43:25 +05:30
Rinaldo
060fdfd6e1 Merge pull request #160 from Kitzanos/develop
Updated Dashboard, ....
2025-01-14 10:00:40 +01:00
rajesh
e9df9cdb44 updated code 2025-01-14 13:13:39 +05:30
rajeshkhore
454ee9ec83 Merge pull request #159 from Kitzanos/feature/GEPAFINBE-140
GEPAFINBE-140 (Added codice_ateco field to company data)
2025-01-13 19:29:43 +05:30
rajesh
7953ba0838 Done ticket GEPAFINBE-140 2025-01-13 19:17:39 +05:30
rajesh
efcf8e7755 Resolve Conflicts 2025-01-13 16:42:42 +05:30
rajesh
f9e9673d93 Done ticket GEPAFINBE-128 2025-01-13 16:28:01 +05:30
nisha
aec6495649 Updated changes for GEPAFINBE-127 2025-01-13 15:53:28 +05:30
Vitalii Kiiko
e7872728fb Merge pull request #157 from Kitzanos/application-submission-date-changes
Updated application submission date to protocol creation date.
2025-01-13 09:50:17 +01:00
Rinaldo
06272cbcf8 Merge pull request #158 from Kitzanos/feature/GEPAFINBE-127
GEPAFINBE-127 (Complete Super User Dashboard)
2025-01-13 08:49:01 +01:00
rajesh
baba46dc1f Updated code 2025-01-13 13:09:22 +05:30
nisha
b4877b588c Updated code 2025-01-13 13:00:04 +05:30
piyushkag
e39bbcd572 Updated application submission date to protocol creation date. 2025-01-10 16:00:38 +05:30
nisha
6e092bd534 Resolved null issue in pdf 2025-01-10 15:41:37 +05:30
Rinaldo
daa54063ba Merge pull request #156 from Kitzanos/removed-delega-check
Cherry-Pick (Removed delega check from create application API)
2025-01-09 14:11:06 +01:00
nisha
97d7878ec8 Removed delega check from create application API 2025-01-09 18:19:03 +05:30
nisha
4cfe02f5ad Removed delega check from create application API 2025-01-09 18:10:31 +05:30
nisha
3b8246987e Resolved conflicts 2025-01-09 15:29:14 +05:30
nisha
f9c228f0c9 Updated code 2025-01-09 15:21:59 +05:30
nisha
609bb7d99a Code for dashbaord API 2025-01-08 20:09:47 +05:30
piyushkag
3cf0e1dfef Updated rabbitMq config. 2025-01-08 19:06:56 +05:30
Rinaldo
48be636d65 Update application-production.properties
Correct rabbitMQ address for production
2025-01-08 14:26:35 +01:00
Rinaldo
869e093d8f Merge pull request #155 from Kitzanos/rabbitMq-config-prod
Cherry-Pick (Added RabbitMQ config for production.)
2025-01-08 13:01:03 +01:00
piyushkag
d95f2833db Added RabbitMQ config for production. 2025-01-08 17:28:32 +05:30
piyushkag
179b076a8f Added RabbitMQ config for production. 2025-01-08 17:11:45 +05:30
rajesh
8bb1ec0d02 Updated jackson config 2025-01-08 15:58:25 +05:30
Rinaldo
bead5b0758 Merge pull request #154 from Kitzanos/feature/GEPAFINBE-89
GEPAFINBE-89
2025-01-08 09:57:04 +01:00
Rinaldo
49cfd96c39 Merge pull request #153 from Kitzanos/spid-create-user-issue-prod
Cherry-pick on Master (Fixed issue during user creation via SPID)
2025-01-07 14:18:38 +01:00
nisha
55434df190 Resolve Conflicts 2025-01-07 18:36:51 +05:30
rajesh
c183b69046 Fixed issue during user creation from SPID 2025-01-07 18:21:32 +05:30
rajesh
5b119a9b02 Merge branch 'develop' of https://github.com/Kitzanos/GEPAFIN-BE into develop 2025-01-07 18:19:03 +05:30
rajesh
887100ed74 Fixed issue during user creation from SPID 2025-01-07 18:17:23 +05:30
Piyush
e28a9f2662 Done ticket GEPAFINBE-89 2025-01-07 17:29:05 +05:30
Rinaldo
bb0291e3aa Merge pull request #148 from Kitzanos/feature/GEPAFINBE-129
GEPAFINBE-129 (Complete Application Page)
2025-01-07 09:55:13 +01:00
Rinaldo
3811f0d007 Merge pull request #152 from Kitzanos/feature/GEPAFINBE-133
GEPAFINBE-133 (All API responses must be stored in user actions.)
2025-01-07 09:52:28 +01:00
piyushkag
c53b7e59d3 Updated cnfig code. 2025-01-07 14:14:54 +05:30
piyushkag
b4d8ad45f2 Added config for frame error on FE. 2025-01-07 14:10:53 +05:30
piyushkag
af5d31b9fe Done ticket GEPAFINBE-133 User action api response. 2025-01-07 13:15:25 +05:30