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 30885/adapt the burkina faso importer to be able to process txt #4328

Open
wants to merge 232 commits into
base: develop
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
232 commits
Select commit Hold shift + click to select a range
b5473be
AMP-30858- Create Data importer for txt
brianbrix May 15, 2024
8fbacf3
AMP-30858- Create Data importer for txt
brianbrix May 15, 2024
25ddcb7
AMP-30858- Create Data importer for txt
brianbrix May 15, 2024
e7ab95a
AMP-30858- Create Data importer for txt
brianbrix May 16, 2024
1f6cfb6
Merge branch 'feature/AMP-30858/Burkina-Data-Importer-v3' into featur…
brianbrix May 20, 2024
a726c70
AMP-30858- Create txt importer
brianbrix May 20, 2024
5066679
AMP-30858- Create txt importer
brianbrix May 20, 2024
830dc2e
AMP-30885- Create txt importer
brianbrix May 23, 2024
5bae9ee
AMP-30858- Create txt importer for activities
brianbrix May 28, 2024
5ad1d3c
AMP-30858- Create txt importer for activities
brianbrix May 28, 2024
293becd
AMP-30858- Create txt importer for activities
brianbrix May 28, 2024
e09fa51
AMP-30858- Create txt importer for activities
brianbrix May 28, 2024
4fc53eb
AMP-30858- Create txt importer for activities
brianbrix May 28, 2024
d0b0851
AMP-30858- Create txt importer for activities
brianbrix May 28, 2024
d0556b4
AMP-30858- Create txt importer for activities
brianbrix May 28, 2024
0f3a895
AMP-30858- Create txt importer for activities
brianbrix May 28, 2024
ffabe62
AMP-30858- Create txt importer for activities
brianbrix May 29, 2024
e945d84
AMP-30858- Create txt importer for activities
brianbrix May 29, 2024
2d6060c
AMP-30858- Create txt importer for activities
brianbrix May 29, 2024
30c0db8
AMP-30858- Create txt importer for activities
brianbrix May 29, 2024
7e43f16
AMP-30858- Create txt importer for activities
brianbrix May 29, 2024
9349200
AMP-30885
brianbrix Jun 5, 2024
5a5f43d
AMP-30885
brianbrix Jun 5, 2024
53b83b3
AMP-30885
brianbrix Jun 5, 2024
c82fb08
Merge branch 'feature/AMP-30885/Map-Importer-For-Ecowas' into feature…
brianbrix Jun 10, 2024
80eb0a4
AMP-30885
brianbrix Jun 11, 2024
e332b70
AMP-30885
brianbrix Jun 11, 2024
8c66c1b
AMP-30885
brianbrix Jun 11, 2024
6507c74
AMP-30885
brianbrix Jun 11, 2024
186c60b
AMP-30885
brianbrix Jun 11, 2024
c0e50a9
AMP-30885
brianbrix Jun 11, 2024
77333fe
AMP-30885
brianbrix Jun 11, 2024
11fa5a3
AMP-30885
brianbrix Jun 11, 2024
c810e31
AMP-30885
brianbrix Jun 11, 2024
881e6bb
AMP-30885
brianbrix Jun 11, 2024
112d801
AMP-30885
brianbrix Jun 12, 2024
6b033f4
AMP-30885
brianbrix Jun 12, 2024
4bdba7f
AMP-30885
brianbrix Jun 12, 2024
a368eae
AMP-30885
brianbrix Jun 12, 2024
adabc72
AMP-30885
brianbrix Jun 12, 2024
1dd16d0
AMP-30885
brianbrix Jun 12, 2024
09e6990
AMP-30885
brianbrix Jun 12, 2024
6fcac43
AMP-30885
brianbrix Jun 12, 2024
1e87263
AMP-30885
brianbrix Jun 12, 2024
8897815
AMP-30885
brianbrix Jun 12, 2024
bb3de99
AMP-30885
brianbrix Jun 12, 2024
05b8ca5
AMP-30885
brianbrix Jun 12, 2024
f26f02b
AMP-30885
brianbrix Jun 12, 2024
5a79c88
AMP-30885
brianbrix Jun 12, 2024
1b1c3ee
AMP-30885
brianbrix Jun 12, 2024
8c975c5
AMP-30885
brianbrix Jun 12, 2024
46f7334
AMP-30885
brianbrix Jun 12, 2024
38ccdc3
AMP-30885
brianbrix Jun 13, 2024
f385106
AMP-30885
brianbrix Jun 13, 2024
0d74d77
AMP-30885
brianbrix Jun 13, 2024
6376ce0
AMP-30885
brianbrix Jun 13, 2024
0ba805f
AMP-30885
brianbrix Jun 13, 2024
f85eff7
AMP-30885
brianbrix Jun 13, 2024
3184882
AMP-30885
brianbrix Jun 17, 2024
5c3647f
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 19, 2024
c9e6d2d
Merge remote-tracking branch 'origin/feature/AMP-30885/adapt-the-burk…
brianbrix Jun 19, 2024
a4a3b5e
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 19, 2024
3164215
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 19, 2024
81869b4
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 19, 2024
d846c99
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 19, 2024
476261a
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 19, 2024
9f98d7e
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 19, 2024
d7e8a7f
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 19, 2024
bc4e771
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 20, 2024
089b2ae
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 20, 2024
5c58513
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 20, 2024
df8a096
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 20, 2024
3cfa48b
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 20, 2024
afe0763
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 20, 2024
562b5f8
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 22, 2024
bd9b700
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 22, 2024
fae40c8
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 23, 2024
01806c1
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 23, 2024
5283859
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 24, 2024
87ebc05
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 24, 2024
a8e19af
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 24, 2024
6e95bea
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 24, 2024
f47b33b
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 24, 2024
d7b9fec
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 24, 2024
ea77d67
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 24, 2024
151574a
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 24, 2024
d88470a
AMP-30885 - Adopt the data importer to work with Ecowas txt
brianbrix Jun 26, 2024
cc558fa
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 26, 2024
6f99fda
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 26, 2024
7e76f01
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 26, 2024
5c15edb
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 26, 2024
7cdb33e
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 26, 2024
cfdef13
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 26, 2024
4158fc7
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 26, 2024
d490651
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 26, 2024
bcc6291
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 26, 2024
d9fe446
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 26, 2024
5c11715
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 26, 2024
b5e2b7c
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 26, 2024
954ccac
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 26, 2024
1497064
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 26, 2024
53ddea0
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 26, 2024
697f0d2
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 26, 2024
3c74474
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 26, 2024
872a92d
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 26, 2024
24fc2fd
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 27, 2024
e7ee1a5
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 27, 2024
baa5c91
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 27, 2024
d00e7d8
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 27, 2024
a7b6e72
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 27, 2024
9d4db05
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 27, 2024
21a45c5
AMP-30885 - Add Beneficiary Agencies
brianbrix Jun 27, 2024
470d4c6
AMP-30885 - Add Menu Items to GFM
brianbrix Jun 30, 2024
eafb027
AMP-30885 - Add Menu Items to GFM
brianbrix Jun 30, 2024
ddcf840
AMP-30885 - Add Menu Items to GFM
brianbrix Jun 30, 2024
f34ee2b
AMP-30885 - Add Menu Items to GFM
brianbrix Jun 30, 2024
0cc62f0
AMP-30885 - Add Menu Items to GFM
brianbrix Jun 30, 2024
0649548
AMP-30885 - Add Menu Items to GFM
brianbrix Jun 30, 2024
47aeb6a
AMP-30885 - Add Menu Items to GFM
brianbrix Jun 30, 2024
1b5b9c8
AMP-30885 - Add Menu Items to GFM
brianbrix Jul 1, 2024
1080317
AMP-30885 - Add Menu Items to GFM
brianbrix Jul 3, 2024
9a49fe1
AMP-30885 - Add Menu Items to GFM
brianbrix Jul 3, 2024
e6086a3
AMP-30885 - Add Menu Items to GFM
brianbrix Jul 8, 2024
db15ad0
AMP-30885- Update funding from already existing
brianbrix Jul 9, 2024
767dddf
AMP-30885- Update funding from already existing
brianbrix Jul 9, 2024
2a09618
AMP-30885- Update funding from already existing
brianbrix Jul 9, 2024
e3c9f51
AMP-30885- Update funding from already existing
brianbrix Jul 9, 2024
148d42b
AMP-30885- Update funding from already existing
brianbrix Jul 10, 2024
90ff760
AMP-30885- Update funding from already existing
brianbrix Jul 10, 2024
507a62e
AMP-30885- Update funding from already existing
brianbrix Jul 10, 2024
f5d348c
AMP-30885- Update funding from already existing
brianbrix Jul 10, 2024
9890dc4
AMP-30885- Update funding from already existing
brianbrix Jul 10, 2024
a1d24c0
AMP-30885- Update funding from already existing
brianbrix Jul 10, 2024
a9fdfd8
AMP-30885- Update funding from already existing
brianbrix Jul 10, 2024
5eb18cc
AMP-30885- Update funding from already existing
brianbrix Jul 10, 2024
60ce1bd
AMP-30885- Update funding from already existing
brianbrix Jul 10, 2024
4501764
AMP-30885- Update funding from already existing
brianbrix Jul 10, 2024
87694a0
AMP-30885- Update funding from already existing
brianbrix Jul 10, 2024
370ebe1
AMP-30885- Update funding from already existing
brianbrix Jul 10, 2024
f69245b
AMP-30885- Update funding from already existing
brianbrix Jul 10, 2024
2d3c805
AMP-30885- Update funding from already existing
brianbrix Jul 10, 2024
170f0ed
AMP-30885- Update funding from already existing
brianbrix Jul 10, 2024
e897c3e
AMP-30885- Update funding from already existing
brianbrix Jul 10, 2024
86f0d80
AMP-30885- Update funding from already existing
brianbrix Jul 10, 2024
688740e
AMP-30885- Update funding from already existing
brianbrix Jul 10, 2024
2b6535f
AMP-30885- Update funding from already existing
brianbrix Jul 10, 2024
ca03ca5
AMP-30885- Update funding from already existing
brianbrix Jul 10, 2024
7699835
AMP-30885- Update funding from already existing
brianbrix Jul 10, 2024
9c6ae4f
AMP-30885- Update funding from already existing
brianbrix Jul 10, 2024
6b13520
AMP-30885- Update funding from already existing
brianbrix Jul 10, 2024
69a9afa
AMP-30885- Update funding from already existing
brianbrix Jul 11, 2024
218f8ab
AMP-30885- Update funding from already existing
brianbrix Jul 11, 2024
958291c
AMP-30885- Update funding from already existing
brianbrix Jul 11, 2024
e8a9143
AMP-30885- Update funding from already existing
brianbrix Jul 11, 2024
0cea043
AMP-30885- Update funding from already existing
brianbrix Jul 11, 2024
32bca35
AMP-30885- Update funding from already existing
brianbrix Jul 14, 2024
a243450
AMP-30885- Update funding from already existing
brianbrix Jul 14, 2024
c4836a4
AMP-30885- Update funding from already existing
brianbrix Jul 15, 2024
c7c5a04
AMP-30885- Update funding from already existing
brianbrix Jul 15, 2024
7d9210c
AMP-30885- Update funding from already existing
brianbrix Jul 15, 2024
0f86887
AMP-30885- Update funding from already existing
brianbrix Jul 15, 2024
43fdfea
AMP-30885- Update funding from already existing
brianbrix Jul 15, 2024
d835503
AMP-30885- Update funding from already existing
brianbrix Jul 15, 2024
91157e6
AMP-30885- Update funding from already existing
brianbrix Jul 15, 2024
47de6d7
AMP-30885- Update funding from already existing
brianbrix Jul 18, 2024
c759f24
AMP-30885- Update funding from already existing
brianbrix Jul 24, 2024
0efb28c
AMP-30885- Update funding from already existing
brianbrix Jul 24, 2024
5c0acd6
AMP-30885- Update funding from already existing
brianbrix Jul 24, 2024
9f4aeb6
AMP-30885- Update funding from already existing
brianbrix Jul 24, 2024
016edad
AMP-30885- Update funding from already existing
brianbrix Jul 24, 2024
ba2a969
AMP-30885- Update funding from already existing
brianbrix Jul 24, 2024
528cba9
AMP-30885- Update funding from already existing
brianbrix Jul 24, 2024
aa6aeb0
AMP-30885 -Juli Resolved deployment issues
brianbrix Jul 25, 2024
d083875
AMP-30885 -Juli Resolved deployment issues
brianbrix Jul 25, 2024
d7a29f2
AMP-30885 -Juli Resolved deployment issues
brianbrix Jul 25, 2024
3fa8291
AMP-30885 -Juli Resolved deployment issues
brianbrix Jul 25, 2024
78a7eff
AMP-30885 -Juli Resolved deployment issues
brianbrix Jul 25, 2024
44998cd
AMP-30885 -Juli Resolved deployment issues
brianbrix Jul 25, 2024
2a3f2ac
AMP-30885 -Juli Resolved deployment issues
brianbrix Jul 26, 2024
fe4f306
AMP-30885 -Juli Resolved deployment issues
brianbrix Jul 26, 2024
81c03ee
AMP-30885 -Update component funding
brianbrix Jul 26, 2024
f44ddc9
AMP-30885 -Update component funding
brianbrix Jul 26, 2024
1d37727
AMP-30885 -Update component funding
brianbrix Jul 26, 2024
678192a
AMP-30885 -Update component funding
brianbrix Jul 26, 2024
17f6397
AMP-30885 -Update component funding
brianbrix Jul 26, 2024
5417ae2
AMP-30885-Add-Orgs-To-Db.xml
brianbrix Sep 10, 2024
2181c29
AMP-30885-Add-Orgs-To-Db.xml
brianbrix Sep 10, 2024
8ab9b8c
Add Donor orgs to DB
brianbrix Oct 7, 2024
cb69a49
AMP-30885: Add donor orgs for Ecowas
brianbrix Oct 25, 2024
cd402bd
AMP-30885: COnfigure Internal projects for Ecowas
brianbrix Nov 1, 2024
ddbdbfa
AMP-30885: COnfigure Internal projects for Ecowas
brianbrix Nov 1, 2024
15eff1e
AMP-30885: COnfigure Internal projects for Ecowas
brianbrix Nov 1, 2024
e99ef3b
AMP-30885: COnfigure Internal projects for Ecowas
brianbrix Nov 1, 2024
e93df24
AMP-30885: COnfigure Internal projects for Ecowas
brianbrix Nov 1, 2024
c2de714
AMP-30885: COnfigure Internal projects for Ecowas
brianbrix Nov 2, 2024
097b047
AMP-30885: COnfigure Internal projects for Ecowas
brianbrix Nov 2, 2024
cdbbcc3
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 2, 2024
51369bd
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 2, 2024
fde81c1
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 2, 2024
851c9be
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 2, 2024
f5adf6d
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 2, 2024
24d5ae3
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 2, 2024
f53b990
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 2, 2024
d81ab18
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 2, 2024
9970fb9
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 2, 2024
15e3547
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 2, 2024
ae95319
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 2, 2024
2da3768
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 3, 2024
9ff09df
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 3, 2024
a68d4c2
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 3, 2024
725a09b
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 3, 2024
b658760
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 3, 2024
6c462a7
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 3, 2024
f06d401
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 3, 2024
e30ab3d
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 3, 2024
eb4a797
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 3, 2024
bfb52c0
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 3, 2024
0296165
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 3, 2024
3ddf365
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 4, 2024
5229de6
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 4, 2024
3480fa2
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 4, 2024
b7609b9
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 4, 2024
2e08185
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 4, 2024
d8af217
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 4, 2024
4dfe1e3
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 4, 2024
ef3072b
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 4, 2024
a2c63ec
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 4, 2024
7344d97
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 4, 2024
2cbd046
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 4, 2024
746741d
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 4, 2024
4331241
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 5, 2024
d5806f1
AMP-30885: Configure Internal projects for Ecowas
brianbrix Nov 5, 2024
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-30885 -Juli Resolved deployment issues
  • Loading branch information
brianbrix committed Jul 26, 2024
commit 2a3f2ac5b9bbb80598b9f1d2756f1df170b024ab
Original file line number Diff line number Diff line change
Expand Up @@ -816,36 +816,16 @@ private static boolean componentFundingExists(AmpComponentFunding ampComponentFu
{
return false;
}
String sql = "SELECT COUNT(*) FROM amp_component_funding WHERE rep_organization_id = ? " +
"AND adjustment_type = ? AND transaction_amount = ? " +
"AND transaction_date = ? AND amp_component_id = ?";

try (PreparedStatement statement = PersistenceManager.getJdbcConnection().prepareStatement(sql)) {
if (ampComponentFunding.getReportingOrganization() != null) {
statement.setLong(1, ampComponentFunding.getReportingOrganization().getAmpOrgId());
} else {
statement.setNull(1, Types.BIGINT);
}

statement.setLong(2, ampComponentFunding.getAdjustmentType().getId());

statement.setDouble(3, ampComponentFunding.getTransactionAmount());

statement.setTimestamp(4, new java.sql.Timestamp(ampComponentFunding.getTransactionDate().getTime()));

statement.setLong(5, ampComponent.getAmpComponentId());
for (AmpComponentFunding ampComponentFunding1 : ampComponent.getFundings())
{
if (Objects.equals(ampComponentFunding.getTransactionAmount(), ampComponentFunding1.getTransactionAmount()) && ampComponentFunding.getTransactionDate()==ampComponentFunding1.getTransactionDate() && ampComponentFunding.getAdjustmentType()==ampComponentFunding1.getAdjustmentType() && ampComponentFunding.getReportingOrganization()==ampComponentFunding1.getReportingOrganization()){
logger.info("AmpComponentFunding has been found");

try (ResultSet resultSet = statement.executeQuery()) {
if (resultSet.next()) {
int count = resultSet.getInt(1);
logger.info("Count: " + count);
return count > 0;
}
return true;
}
} catch (SQLException e) {
logger.error("Error executing native query", e);
}


return false;
}

Expand Down