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

Feature/amp 30711/integrate amp with trubudget #4167

Open
wants to merge 532 commits into
base: future/v4.0
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
532 commits
Select commit Hold shift click to select a range
b8113cf
AMP-30723 Feature -implement amp TruBudget integration
mokandubrian Sep 18, 2023
b29ec82
AMP-30723 Feature -implement amp TruBudget integration
mokandubrian Sep 18, 2023
7a33f19
AMP-30723 Feature -implement amp TruBudget integration
mokandubrian Sep 18, 2023
0e0a0c4
AMP-30723 Feature -implement amp TruBudget integration
mokandubrian Sep 18, 2023
70c2cf4
AMP-30723 Feature -implement amp TruBudget integration
mokandubrian Sep 18, 2023
823b006
AMP-30723 Feature -implement amp TruBudget integration
mokandubrian Sep 18, 2023
322eb6e
AMP-30723 Feature -implement amp TruBudget integration
mokandubrian Sep 18, 2023
34a8806
Merge pull request #4114 from devgateway/issue/AMP-30706/Global-partn…
jdeanquin-dg Sep 19, 2023
3572c02
AMP-30706 - Global partnership reports not loads
drossi-dg Sep 13, 2023
294aea0
AMP-30706 - Global partnership reports not loads
drossi-dg Sep 13, 2023
c0fc5bf
AMP-30706 - Global partnership reports not loads
drossi-dg Sep 14, 2023
5c579aa
Merge pull request #4117 from devgateway/issue/AMP-30706/Global-partn…
jdeanquin-dg Sep 19, 2023
420412d
Merge pull request #4115 from devgateway/task/GGW-72/fix-user-registr…
jdeanquin-dg Sep 19, 2023
0b06138
Merge pull request #4107 from devgateway/issue/AMP-30698/issue-on-act…
lilitk Sep 19, 2023
408c9ee
AMP-30729 fix global settings loading
jdeanquin-dg Sep 19, 2023
2380f80
Merge branch 'feature/AMP-30620/migrate-spring-jersey-hibernate' into…
jdeanquin-dg Sep 19, 2023
c67b22a
Merge branch 'feature/AMP-30620/migrate-spring-jersey-hibernate' into…
mokandubrian Sep 19, 2023
52460ce
AMP-30723 Feature -implement amp TruBudget integration
mokandubrian Sep 19, 2023
23f3c2d
AMP-30729 release date
jdeanquin-dg Sep 19, 2023
d02ed01
AMP-30723 Feature -implement amp TruBudget integration
mokandubrian Sep 19, 2023
a6f034a
AMP-30723-Feature -implement amp TruBudget integration
mokandubrian Sep 19, 2023
3764195
AMP-30723-Feature -implement amp TruBudget integration
mokandubrian Sep 19, 2023
2d3af6e
AMP-30723-Feature -implement amp TruBudget integration
mokandubrian Sep 19, 2023
6fbfc0c
AMP-30723-Feature -implement amp TruBudget integration
mokandubrian Sep 19, 2023
7e97a73
AMP-30723-Feature -implement amp TruBudget integration
mokandubrian Sep 20, 2023
65a851b
AMP-30723-Feature -implement amp TruBudget integration
mokandubrian Sep 20, 2023
f257167
AMP-30691 - DRC - Activity Preview Export to word not works
drossi-dg Sep 20, 2023
4ea0445
AMP-30691 - DRC - Activity Preview Export to word not works
drossi-dg Sep 20, 2023
f54c1c4
Merge pull request #4119 from devgateway/issue/AMP-30691/DRC--ActPrev…
lilitk Sep 20, 2023
106f240
AMP-30723-Feature -implement amp TruBudget integration
mokandubrian Sep 22, 2023
8f92356
AMP-30723-Feature -implement amp TruBudget integration
mokandubrian Sep 22, 2023
599216c
GGW-92 fix gis configuration
timothygachengo Sep 22, 2023
788a6ab
GGW-92 fix gis configuration
timothygachengo Sep 22, 2023
238a7f3
AMP-30723-Feature -implement amp TruBudget integration
mokandubrian Sep 22, 2023
c0d5740
AMP-30723-Feature -implement amp TruBudget integration
mokandubrian Sep 22, 2023
79dc1ac
AMP-30723-Feature -implement amp TruBudget integration
mokandubrian Sep 22, 2023
32215a6
AMP-30723-Feature -implement amp TruBudget integration
mokandubrian Sep 22, 2023
1c4ffbe
AMP-30723-Feature -implement amp TruBudget integration
mokandubrian Sep 22, 2023
1e35863
GGW-91 fix change password
jdeanquin-dg Sep 23, 2023
9e50104
Merge pull request #4123 from devgateway/task/GGW-91/fix-change-passw…
jdeanquin-dg Sep 23, 2023
5e3b4de
enable send mails for training
jdeanquin-dg Sep 24, 2023
ee99a21
Email config
jdeanquin-dg Sep 24, 2023
37eb7a3
Merge branch 'uganda-training' into task/GGW/september
jdeanquin-dg Sep 24, 2023
ea54b04
Email config
jdeanquin-dg Sep 24, 2023
ee8d9d9
Revert "Email config"
jdeanquin-dg Sep 24, 2023
5b2135f
fix email
jdeanquin-dg Sep 24, 2023
100959c
Merge branch 'uganda-training' into task/GGW/september
jdeanquin-dg Sep 24, 2023
ab271ae
Merge pull request #4122 from devgateway/task/GGW-92/fix-gis-display
jdeanquin-dg Sep 24, 2023
b860f1f
AMP-30723-Feature -implement amp TruBudget integration
mokandubrian Sep 25, 2023
b191363
AMP-30723-Feature -implement amp TruBudget integration
mokandubrian Sep 25, 2023
ee07f26
AMP-30723-Feature -implement amp TruBudget integration
mokandubrian Sep 25, 2023
80bc86b
GGW-93 -set user group
mokandubrian Sep 25, 2023
1c9ace2
GGW-93 -set user group
mokandubrian Sep 25, 2023
f7d297a
GGW-93 -set user group
mokandubrian Sep 25, 2023
d8e6a5a
GGW-93 -set user group
mokandubrian Sep 25, 2023
c052e65
GGW-93 -set user group
mokandubrian Sep 25, 2023
de7f975
GGW-93 -set user group
mokandubrian Sep 25, 2023
ea640d8
GGW-93 -set user group
mokandubrian Sep 25, 2023
1d25978
GGW-93 -set user group
mokandubrian Sep 25, 2023
a47c7e5
GGW-93 -set user group
mokandubrian Sep 25, 2023
4ad3dc0
GGW-93 -set user group
mokandubrian Sep 25, 2023
b7cadee
GGW-93 -set user group
mokandubrian Sep 25, 2023
c510fa5
GGW-93 -set user group
mokandubrian Sep 26, 2023
a1c7bb7
Merge branch 'task/GGW/september-dashboards' into feature/AMP-30711/i…
mokandubrian Sep 26, 2023
2695843
GGW-93 -set user group
mokandubrian Sep 26, 2023
e5cfe1d
GGW-93 -set user group
mokandubrian Sep 26, 2023
fc11f52
GGW-93 -set user group
mokandubrian Sep 26, 2023
a1a190a
AMP-30723
mokandubrian Sep 26, 2023
af5b7a4
AMP-30723 implement amp TruBudget integration
mokandubrian Sep 27, 2023
7d5b9c9
AMP-30723 implement amp TruBudget integration
mokandubrian Sep 27, 2023
ccf1c8e
AMP-30723 implement amp TruBudget integration
mokandubrian Sep 27, 2023
8b631c6
AMP-30723 implement amp TruBudget integration
mokandubrian Sep 28, 2023
9630e14
AMP-30723 implement amp TruBudget integration
mokandubrian Sep 28, 2023
b56f02e
AMP-30723 implement amp TruBudget integration
mokandubrian Sep 28, 2023
6f2e9d6
AMP-30723 implement amp TruBudget integration
mokandubrian Oct 1, 2023
49d6a5a
AMP-30723 implement amp TruBudget integration
mokandubrian Oct 1, 2023
44cee64
AMP-30723 implement amp TruBudget integration
mokandubrian Oct 1, 2023
56a4046
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 1, 2023
c5d576e
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 2, 2023
74a0b2c
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 2, 2023
51edf3c
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 2, 2023
4428282
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 2, 2023
4569046
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 2, 2023
27a1cb7
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 2, 2023
5b8b8fe
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 2, 2023
35ddf7e
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 3, 2023
b74ef41
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 3, 2023
a0b5c2f
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 3, 2023
25d7c67
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 4, 2023
837fc3b
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 8, 2023
d871e9a
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 8, 2023
df561f3
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 8, 2023
c4e385f
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 8, 2023
f9717d2
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 9, 2023
5b68ff9
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 9, 2023
9576d0a
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 9, 2023
3fd7a24
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 9, 2023
8b1e29a
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 9, 2023
b7988a2
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 9, 2023
410b101
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 9, 2023
3fa1a9e
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 9, 2023
c8791a0
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 10, 2023
882bb14
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 11, 2023
3a8cc33
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 11, 2023
2cc7e51
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 11, 2023
5c1b22e
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 11, 2023
464eccf
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 11, 2023
a597307
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 11, 2023
496fb93
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 12, 2023
196969e
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 12, 2023
82c4ff9
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 12, 2023
56f0524
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 12, 2023
2810914
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 12, 2023
1517ab9
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 12, 2023
7bb1c88
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 12, 2023
b6fa9c5
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 12, 2023
733e4b4
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 12, 2023
6ddf191
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 12, 2023
5b2cce0
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 12, 2023
c7590f0
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 12, 2023
a91d571
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 12, 2023
f4251a8
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 12, 2023
4284b13
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 12, 2023
96c5d55
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 13, 2023
1ff0eb4
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 14, 2023
8ee075f
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 15, 2023
1953be7
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 15, 2023
6385a76
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 15, 2023
aa90dd9
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 15, 2023
07708c2
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 16, 2023
fd94669
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 16, 2023
603b5a4
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 16, 2023
2445663
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 16, 2023
2323145
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 16, 2023
70db755
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 17, 2023
4f3997d
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 18, 2023
cd27ba9
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 18, 2023
d55cb46
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 18, 2023
3f744d8
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 18, 2023
39503e8
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 19, 2023
097db57
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 23, 2023
760e6da
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 23, 2023
9ba2dba
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 23, 2023
28af1c6
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 23, 2023
2d577f1
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 23, 2023
4cce787
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 23, 2023
a8bc252
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 23, 2023
49ee95d
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
eaa2234
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
b4f22ae
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
517e4f4
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
11e7656
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
9f4f3ad
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
bb5c833
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
e8a3faa
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
44b2433
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
7847512
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
28b3218
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
867cf3a
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
78b6ac0
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
f0948a3
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
b5e1305
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
b66a771
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
f8e9599
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
d3e3524
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
7c0e5f4
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
240d54b
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
639a372
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
adffed7
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
221e074
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
0835b00
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
19c35ee
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
66b4c2f
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 24, 2023
7de981e
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 25, 2023
c03cddc
AMP-30723 -implement amp TruBudget integration
mokandubrian Oct 25, 2023
5e8606b
AMP-30723 - Add component status
mokandubrian Oct 25, 2023
cedd8dd
AMP-30723 - Add component status
mokandubrian Oct 25, 2023
c9c9d22
AMP-30723 - Add component status
mokandubrian Oct 25, 2023
8835858
AMP-30723 - Add component status
mokandubrian Oct 25, 2023
2a9c9fa
AMP-30723 - Add component status
mokandubrian Oct 25, 2023
8316bca
AMP-30723 - Add component status
mokandubrian Oct 25, 2023
2a4a87a
AMP-30723 - Add component status
mokandubrian Oct 25, 2023
d877f3d
AMP-30723 - Add component status
mokandubrian Oct 26, 2023
9e93537
AMP-30723 - Add component status
mokandubrian Oct 26, 2023
cf3a91e
AMP-30723 - Add component status
mokandubrian Oct 26, 2023
bbfdd2d
AMP-30723 - Add component status
mokandubrian Oct 27, 2023
d0725fa
AMP-30723 - Use correct way of getting idProperty
mokandubrian Oct 27, 2023
6bd1ef9
Merge remote-tracking branch 'origin/feature/AMP-30711/integrate-amp-…
mokandubrian Oct 27, 2023
eb664c3
AMP-30723 - Use correct way of getting idProperty
mokandubrian Oct 27, 2023
720e32b
AMP-30723 - Use correct way of getting idProperty
mokandubrian Oct 28, 2023
88469a5
AMP-30723 - Use correct way of getting idProperty
mokandubrian Oct 28, 2023
bebf802
AMP-30723 - Use correct way of getting idProperty
mokandubrian Oct 29, 2023
3130686
AMP-30723 - Use correct way of getting idProperty
mokandubrian Oct 29, 2023
ff29493
AMP-30723 - Use correct way of getting idProperty
mokandubrian Oct 30, 2023
45b190e
AMP-30723 - Use correct way of getting idProperty
mokandubrian Oct 30, 2023
805cc3e
AMP-30754 - Add filters for reports
mokandubrian Nov 13, 2023
3583b1f
AMP-30723 - Add filters for reports
mokandubrian Nov 14, 2023
b98b930
AMP-30723 - Add filters for reports
mokandubrian Nov 14, 2023
abb9ba9
AMP-30723 - Add filters for reports
mokandubrian Nov 14, 2023
d451154
AMP-30723 - Add filters for reports
mokandubrian Nov 14, 2023
e8c4be4
AMP-30723 - Add filters for reports
mokandubrian Nov 14, 2023
4dac34c
AMP-30723 - Add filters for reports
mokandubrian Nov 14, 2023
4c9dd60
AMP-30723 - Add component filters for reports
mokandubrian Nov 14, 2023
e503418
AMP-30723 - Edit project name
mokandubrian Nov 15, 2023
e3a238a
AMP-30723 - Edit project name
mokandubrian Nov 15, 2023
a344e50
Merge branch 'feature/AMP-30711/integrate-amp-with-trubudget' into fe…
mokandubrian Nov 15, 2023
778e274
AMP-30723 - Edit project name
mokandubrian Nov 15, 2023
a1f4375
AMP-30723 - Add component filters
mokandubrian Nov 15, 2023
372b072
AMP-30723 - Add component filters
mokandubrian Nov 15, 2023
7a59e76
AMP-30723 - Add component filters
mokandubrian Nov 15, 2023
42b29a4
AMP-30723 - Add component filters
mokandubrian Nov 15, 2023
a8c2d23
AMP-30723 - Add component filters
mokandubrian Nov 15, 2023
606e9e9
AMP-30723 - Fix Add patch and save to DB
mokandubrian Nov 16, 2023
b447b10
AMP-30723 - Fix Add patch and save to DB
mokandubrian Nov 16, 2023
46552df
AMP-30723 - Fix Add patch and save to DB
mokandubrian Nov 17, 2023
631af31
AMP-30723 - Fix Add patch and save to DB
mokandubrian Nov 17, 2023
4f8c8e4
AMP-30723 - Fix Add patch and save to DB
mokandubrian Nov 17, 2023
33b8ad6
AMP-30723 - Fix Add patch and save to DB
mokandubrian Nov 17, 2023
f7e6ef9
AMP-30723 - Fix Add patch and save to DB
mokandubrian Nov 19, 2023
e1bb10f
AMP-30723 - Fix Add patch and save to DB
mokandubrian Nov 19, 2023
b80242d
AMP-30723 - Fix activity form- Refresh session
mokandubrian Nov 19, 2023
68ed6e4
AMP-30723 - Fix activity form- OnsaveAsDraftaction multiple save issues
mokandubrian Nov 22, 2023
bc834d9
AMP-30723 - Fix activity form- OnsaveAsDraftaction multiple save issues
mokandubrian Nov 22, 2023
c5e212d
AMP-30723 - Fix activity form- OnsaveAsDraftaction multiple save issues
mokandubrian Nov 22, 2023
c29e15e
AMP-30723 - Fix activity form- OnsaveAsDraftaction multiple save issues
mokandubrian Nov 22, 2023
fca2052
AMP-30723 - Fix activity form- OnsaveAsDraftaction multiple save issues
mokandubrian Nov 22, 2023
71c4b11
AMP-30723 - Fix activity form- OnsaveAsDraftaction multiple save issues
mokandubrian Nov 22, 2023
c06ac49
AMP-30723 - Fix activity form- OnsaveAsDraftaction multiple save issues
mokandubrian Nov 22, 2023
2d1e39f
AMP-30723 - Fix activity form- OnsaveAsDraftaction multiple save issues
mokandubrian Nov 22, 2023
80aba8f
Merge branch 'feature/AMP-30711/integrate-amp-with-trubudget-tests' i…
mokandubrian Nov 22, 2023
c93f76a
AMP-30770
mokandubrian Nov 28, 2023
1e5fdbb
AMP-30770
mokandubrian Nov 28, 2023
fcbf6e3
AMP-30770
mokandubrian Nov 28, 2023
3293b6e
AMP-30770
mokandubrian Nov 28, 2023
9b88b43
AMP-30770
mokandubrian Nov 28, 2023
d37a945
AMP-30770
mokandubrian Nov 28, 2023
19ff97c
AMP-30770
mokandubrian Nov 28, 2023
30be469
AMP-30770
mokandubrian Nov 28, 2023
11fa0cb
AMP-30770
mokandubrian Nov 28, 2023
68d6a61
AMP-30770
mokandubrian Nov 28, 2023
7986ff8
AMP-30770
mokandubrian Nov 28, 2023
7160f98
AMP-30770
mokandubrian Nov 28, 2023
6c995de
AMP-30770
mokandubrian Nov 28, 2023
245064e
AMP-30770
mokandubrian Nov 28, 2023
63c1c40
AMP-30770
mokandubrian Nov 28, 2023
de36528
AMP-30770
mokandubrian Nov 28, 2023
0e47ca6
AMP-30770
mokandubrian Nov 28, 2023
dad0319
Merge remote-tracking branch 'origin/feature/AMP-30711/integrate-amp-…
Nov 29, 2023
a1006a4
AMP-30784
brianbrix Nov 30, 2023
2703512
Merge pull request #4177 from devgateway/feature/AMP-30711/integrate-…
jdeanquin-dg Dec 6, 2023
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
Prev Previous commit
Next Next commit
AMP-30770
Issue- exception on saving activity after adding fundings
AMP-30771
Issue-cannot edit activity previously savefd, name trubudget test,
  • Loading branch information
mokandubrian committed Nov 28, 2023
commit 68d6a6109c9daf0ffe9c5300af582d6c2e38f469
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 674,7 @@ public static void closeWorkFlowItem(AmpComponentFunding ampComponentFunding, Li
data.setProjectId(projectId);
data.setSubprojectId(subProjectId);
data.setWorkflowitemId(workFlowItemId);
data.setRejectReason(ampComponentFunding.getComponentRejectReason());
data.setRejectReason(!Objects.equals(ampComponentFunding.getComponentRejectReason(), "") ?ampComponentFunding.getComponentRejectReason():"Rejected");
closeWFItemModel.setData(data);
}

Expand Down