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

Esl #143

Open
wants to merge 3,118 commits into
base: master
Choose a base branch
from
Open

Esl #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3118 commits
Select commit Hold shift + click to select a range
715d9b0
:hammer: closes #844
cozej4 Sep 23, 2022
fbda794
:hammer: refactored pregnancy outcome forms
cozej4 Sep 23, 2022
ff4eeab
:arrow_up: updated chw-core dependency
cozej4 Sep 23, 2022
4eebeb2
:hammer: code refactoring
cozej4 Sep 23, 2022
e6ae254
:wastebasket: fixed codacy issues
cozej4 Sep 23, 2022
c03b1f6
Merge pull request #868 from SoftmedTanzania/fixing-proceeding-to-nex…
cozej4 Sep 23, 2022
f61a120
:hammer: closes #845
cozej4 Sep 23, 2022
145d90a
:hammer: closes #806
cozej4 Sep 23, 2022
6a72f1a
:hammer: implemented refreshing of options menu in PncMember Profile
cozej4 Sep 23, 2022
f795cda
:hammer: closes #864
cozej4 Sep 23, 2022
43568ff
:hammer: resolved ANC in-app reports indicators
cozej4 Sep 23, 2022
e6187e2
:bug: resolved creation of Hei Register Events for HIV positive PNC m…
cozej4 Sep 23, 2022
be58f2a
:hammer: resolved ANC in-app reports indicators
cozej4 Sep 23, 2022
22969b0
:hammer: resolved More ANC in-app reports indicators issues
cozej4 Sep 23, 2022
9a1a0b6
:hammer: resolved More ANC in-app reports indicator issues
cozej4 Sep 24, 2022
1f4c6a8
:hammer: refactored Pregnancy Outcome form, adding a required constra…
cozej4 Sep 24, 2022
ff1e197
:hammer: refactored anc partner testing form
cozej4 Sep 24, 2022
707633b
Merge branch 'tanzania-ministry-of-health-nacp' into refactor/fixing-…
cozej4 Sep 24, 2022
9b01702
:hammer: all clients registration form refactoring, making chw-locati…
cozej4 Sep 24, 2022
1473121
Merge pull request #870 from SoftmedTanzania/refactor/fixing-testing-…
cozej4 Sep 25, 2022
45e6bf8
:hammer: refactored sending of community followup referrals to includ…
cozej4 Sep 25, 2022
a993321
:wastebasket:
cozej4 Sep 25, 2022
f9a0127
:wastebasket:
cozej4 Sep 25, 2022
268f27b
Merge pull request #878 from SoftmedTanzania/refactor/refactor-implem…
cozej4 Sep 25, 2022
ccd899e
:hammer: implemented PMTCT Medical History Activity
cozej4 Sep 26, 2022
12df039
Merge pull request #890 from SoftmedTanzania/implement/pmtct-medical-…
cozej4 Sep 26, 2022
05ce507
fix: relevance for the questions to show up after eac
dev-billy Sep 26, 2022
b4ace76
fix: getting date truncated for eac
dev-billy Sep 26, 2022
28ac050
refactor: use implementation from time utils
dev-billy Sep 26, 2022
2e18a05
cleanup: remove unused imports
dev-billy Sep 26, 2022
f2a4782
:construction: implement PNC Medical History Views
cozej4 Sep 26, 2022
957af34
:wastebasket: fixed codacy issues
cozej4 Sep 27, 2022
7621ef3
Merge pull request #894 from SoftmedTanzania/fix/pmtct-eac-issue
cozej4 Sep 27, 2022
8b7833a
Merge pull request #895 from SoftmedTanzania/implement/pnc-member-pro…
cozej4 Sep 27, 2022
f1ca529
:construction: implement removing of PMTCT mothers after HEI child is…
cozej4 Sep 27, 2022
aca495d
:hammer: code refactoring
cozej4 Sep 27, 2022
99501c7
Merge pull request #901 from SoftmedTanzania/implement/removing-of-cl…
cozej4 Sep 27, 2022
a0d90aa
:bug: fixed registration of HEI for children whose PNC mothers are fo…
cozej4 Sep 27, 2022
ae1a872
:bug: fixed bugs in generating events with missing event dates
cozej4 Sep 27, 2022
a215f47
Merge pull request #902 from SoftmedTanzania/fix/registering-of-child…
cozej4 Sep 27, 2022
8240cb8
:hammer: refactored anc pregnancy outcome
cozej4 Sep 27, 2022
fa2ea2a
:hammer: added implementation for adding ctc number for pmtct clients…
cozej4 Sep 27, 2022
fc3e255
:bug: fixed processing of Pmtct close events for ANC clients with abo…
cozej4 Sep 27, 2022
28522f7
:hammer: refactored string resources and ld in-app reports indicators
cozej4 Sep 27, 2022
21413a6
:hammer: fixed issues in pnc in-app reports indicators
cozej4 Sep 27, 2022
05f23d1
:bug: fixed app crushing while opening PNC medical History for client…
cozej4 Sep 28, 2022
0ca3be3
:arrow_up: updated chw-core library dependency
cozej4 Sep 28, 2022
1a65409
Merge pull request #910 from SoftmedTanzania/fix/pnc-in-app-reports-i…
cozej4 Sep 28, 2022
dcada4c
:hammer: refactored pnc medical history
cozej4 Sep 28, 2022
c7ce1dc
Merge pull request #911 from SoftmedTanzania/fix/app-crush-while-open…
cozej4 Sep 28, 2022
df98fd6
:hammer: closes #914
cozej4 Sep 28, 2022
59999c1
:hammer: closes #837, closes #883
cozej4 Sep 29, 2022
2472086
:hammer: code refactoring
cozej4 Sep 29, 2022
0411e6a
:hammer: closes #886
cozej4 Sep 29, 2022
bbf0d73
:hammer: closes #905
cozej4 Sep 29, 2022
ecf6dda
:hammer: code refactoring
cozej4 Sep 29, 2022
cdbe288
Merge pull request #915 from SoftmedTanzania/fix/various-issues-from-…
cozej4 Sep 29, 2022
9128586
Fix/showing modules (#912)
dev-billy Sep 29, 2022
94398e8
Link/kvp library (#871)
zk497 Sep 29, 2022
1483c20
:hammer: added configs for playstore release
cozej4 Sep 29, 2022
8429ce5
:construction: refactored manifest and sdk target versions to meet pl…
cozej4 Sep 29, 2022
5cf9549
Removed duplicate modules on navigation drawer (#916)
zk497 Sep 30, 2022
845b108
Fix/cdp distribution within facility (#917)
dev-billy Oct 3, 2022
dc593d5
hivst reports (#918)
tbwahacker Oct 3, 2022
ef8fb5a
resolving and updating new rows and columns in selftesting_report (#919)
tbwahacker Oct 3, 2022
21d048d
:hammer: refactored navigation drawer items order
cozej4 Oct 3, 2022
f3665a5
Merge remote-tracking branch 'origin/tanzania-ministry-of-health-nacp…
cozej4 Oct 3, 2022
eed2e87
:hammer: refactored minimun age for HIVST registration
cozej4 Oct 3, 2022
9f11f37
:hammer: refactored minimun age for HIVST registration
cozej4 Oct 3, 2022
d97fe30
resolve some issues after tests (#920)
tbwahacker Oct 3, 2022
9b46677
fix/Selftesting-inapp-reports-issues (#921)
tbwahacker Oct 3, 2022
d1b9cf3
Fixing issues hivst in app report (#924)
tbwahacker Oct 4, 2022
90f4e2c
:arrow_up: updated chw-core library dependency
cozej4 Oct 4, 2022
e2b54b2
Merge remote-tracking branch 'origin/tanzania-ministry-of-health-nacp…
cozej4 Oct 4, 2022
ead498d
updating self testing report row number 8 value display
ChrissDisigale Oct 4, 2022
170c9d7
Merge branch 'tanzania-ministry-of-health-nacp' of https://github.com…
ChrissDisigale Oct 4, 2022
1331871
updating-hivst-in-app-report-displaying 8 row
ChrissDisigale Oct 4, 2022
1a95558
Merge branch 'tanzania-ministry-of-health-nacp' of https://github.com…
ChrissDisigale Oct 4, 2022
8db7681
changed open-srp-chw-core version
ChrissDisigale Oct 4, 2022
0a6289e
Fixing/date nulll issues in hivst in app report (#942)
tbwahacker Oct 5, 2022
0ab9fc7
Fix/getting uic id kvp (#925)
dev-billy Oct 5, 2022
c7b9e87
:construction: fixed issues in CBHS in-app reports
cozej4 Oct 5, 2022
55517b5
:wastebasket: code cleaning
cozej4 Oct 5, 2022
a4d4a8e
modify hivst in app report row number 8
ChrissDisigale Oct 5, 2022
31cd5b5
Merge branch 'tanzania-ministry-of-health-nacp' of https://github.com…
ChrissDisigale Oct 5, 2022
ae2c86f
hivst-in-app-row-number-7-modification
ChrissDisigale Oct 5, 2022
9fc98c2
modify row number 7 in-app-report-hivst
ChrissDisigale Oct 6, 2022
2d3d148
Merge branch 'tanzania-ministry-of-health-nacp' of https://github.com…
ChrissDisigale Oct 6, 2022
0875926
Merge pull request #973 from SoftmedTanzania/implementing-hivst-in-ap…
ChrissDisigale Oct 6, 2022
79bf39e
:hammer: refactored LTFU referrals
cozej4 Oct 6, 2022
d4a7363
:hammer: refactored LTFU report form
cozej4 Oct 7, 2022
cf0c89f
:hammer: refactored LTFU referrals for male below 2 to contain PMTCT …
cozej4 Oct 7, 2022
6de090c
:wastebasket: code cleaning
cozej4 Oct 7, 2022
f5cc840
remove: uic id qn (#999)
dev-billy Oct 7, 2022
cb755d8
:hamer: refactored ltfu summary reports
cozej4 Oct 7, 2022
f85b329
:bug: resolved a bug in obtaining LTFU getting Translated Followup Fe…
cozej4 Oct 7, 2022
8ce15fd
:hammer: refactored cbhs in-app reports
cozej4 Oct 7, 2022
a36cf1b
:hammer: refactored cbhs in-app reports
cozej4 Oct 7, 2022
9a1127a
Merge branch 'tanzania-ministry-of-health-nacp' into refactor/cbhs-in…
cozej4 Oct 7, 2022
7fd6c68
:construction: fixed issues in CBHS in-app reports (#947)
cozej4 Oct 7, 2022
86eb065
Merge branch 'tanzania-ministry-of-health-nacp' into refactor/cbhs-in…
cozej4 Oct 7, 2022
d7d2f99
:hammer: merged changes from default branch
cozej4 Oct 7, 2022
078f078
:hammer: updated version code and database version
cozej4 Oct 7, 2022
2f70aee
Update/latest version core (#1040)
dev-billy Oct 11, 2022
9e96f2e
update: core version (#1042)
dev-billy Oct 13, 2022
72ee032
update: core version:
dev-billy Oct 16, 2022
02559b8
fix: using the correct action for kvp registration in hf
dev-billy Oct 16, 2022
8164bd2
added: missing other text field question
dev-billy Oct 16, 2022
c3ff03a
rename: inmate ---> rumandee
dev-billy Oct 16, 2022
ac6b393
refactor: checks to evaluate kvp groups and enrollment for male clients
dev-billy Oct 16, 2022
3399951
refactor: checks to evaluate kvp groups and enrollment for female cli…
dev-billy Oct 16, 2022
f752dc8
added: prompt if client status is unkwown
dev-billy Oct 16, 2022
d7b21b1
added: KVP on all clients register query
dev-billy Oct 16, 2022
ead9472
fix: removing checkbox item item of the client's selected group on sc…
dev-billy Oct 16, 2022
6d49c1d
fix: hiding categories based on gender
dev-billy Oct 16, 2022
03226d2
fix: showing the pep question when enrolled to prep is not
dev-billy Oct 16, 2022
0cafbf9
refactor: condom provision form
dev-billy Oct 16, 2022
3806f10
move: prep status to prep initiation
dev-billy Oct 16, 2022
2e3369e
fix: prep screening form to check for eligibility
dev-billy Oct 17, 2022
bdd7a70
fix: hiding actions if the client didn't qualify for prep initiation
dev-billy Oct 17, 2022
fe3734a
fix: made actions optional
dev-billy Oct 17, 2022
ca4ee80
fix: getting last visit for edit
dev-billy Oct 17, 2022
84a7cad
fix: bug on action status
dev-billy Oct 17, 2022
8d36a49
fix: processing kvp and prep visit on background service
dev-billy Oct 17, 2022
87728d2
fix: added close case for prep
dev-billy Oct 17, 2022
20bdb99
fix: ordering of actions
dev-billy Oct 17, 2022
1df4502
cleanup: remove unused imports
dev-billy Oct 17, 2022
ab8e8a3
fix: showing prep drug conditionally
dev-billy Oct 17, 2022
77aaa07
fix: rephrase how condom distribution question is asked
dev-billy Oct 17, 2022
a8c7945
Merge pull request #1065 from SoftmedTanzania/fix/kvp-prep-issues
dev-billy Oct 19, 2022
367ae3c
fix: relevance issue for checkboxes
dev-billy Oct 21, 2022
0775aa0
fix: prompt for eligibile prep show up after everything is filled
dev-billy Oct 21, 2022
fcb71dc
fix: check for crcl in prep screening for eligibility
dev-billy Oct 21, 2022
9d294dc
fix: using the correct check for action helper in prep action helper
dev-billy Oct 21, 2022
ec56dec
fix: questions relevance in prep initiation
dev-billy Oct 21, 2022
dd89172
fix: showing actions based off gender
dev-billy Oct 22, 2022
1639c03
fix: family planning form to check for condom provision
dev-billy Oct 22, 2022
57f5e52
fix: made partner hiv status not mandatory
dev-billy Oct 22, 2022
4e8361c
fix: removing pep+prep action if hts is positive
dev-billy Oct 22, 2022
05b8b2f
update: core version
dev-billy Oct 22, 2022
6d97bd1
fix: tracking field for prep status
dev-billy Oct 22, 2022
bad387e
fix: typo on followup visit event type
dev-billy Oct 22, 2022
bdba7b6
cleanup: remove unused imports
dev-billy Oct 22, 2022
d5b6250
Merge pull request #1079 from SoftmedTanzania/fix/kvp-prep-issues-pha…
dev-billy Oct 22, 2022
b2aaae2
:hammer: implemented AGYW and KVP visit histories (#1080)
cozej4 Oct 23, 2022
3ff7297
fix: core version to fix kvp bio medical processing
dev-billy Oct 25, 2022
f71feba
:hammer: updated minimum delivery date during PNC registration from 3…
cozej4 Oct 25, 2022
db3f1fd
Merge pull request #1081 from SoftmedTanzania/fix/kvp-bio-medical
dev-billy Oct 26, 2022
89f4128
Implementing kvp inapp reports (#1082)
ChrissDisigale Oct 27, 2022
fe96c52
:hammer: refactored client registration (#1083)
cozej4 Oct 27, 2022
c3d4519
update: core version
dev-billy Oct 27, 2022
5112360
fix: separating the value of hiv status on screening and on hts in kvp:
dev-billy Oct 27, 2022
6d526c4
fix: check for agyw group in screening
dev-billy Oct 27, 2022
f42fd1c
fix: allow registration to kvp for clients 15 and above only
dev-billy Oct 27, 2022
0f7a7b9
fix: relevance check for prep_adherence and prep_side_effects
dev-billy Oct 28, 2022
3c2ea64
refactor: made other services not mandatory
dev-billy Oct 28, 2022
488b87a
Merge pull request #1092 from SoftmedTanzania/fix/kvp-uat-issues
dev-billy Oct 28, 2022
57372cd
:hammer: refactored KVP forms (#1084)
cozej4 Oct 28, 2022
956df7c
Fix/kvp uat issues (#1103)
cozej4 Nov 3, 2022
3cbba31
:construction: Fixing UAT issues (#1107)
cozej4 Nov 17, 2022
0a2183d
Fix/kvp forms translation (#1124)
tbwahacker Nov 18, 2022
539bdf1
:hammer: fixing Pilot issues
cozej4 Nov 21, 2022
b027e3b
:hamer: refactored Navigation Model
cozej4 Nov 21, 2022
b3354ed
:hammer: merged changes from tanzania-ministy-of-health-nacp with reg…
cozej4 Nov 21, 2022
71b331b
:heavy_plus_sign: bumped up version code
cozej4 Nov 21, 2022
ae55f41
Merge remote-tracking branch 'origin/tanzania-ministry-of-health-nacp…
cozej4 Nov 21, 2022
f0aebb1
Modification of selt testing in app report (#1121)
ChrissDisigale Nov 21, 2022
61c711f
Merge remote-tracking branch 'origin/tanzania-ministry-of-health-nacp…
cozej4 Nov 21, 2022
accd502
some buttons was transleted in hf app (#1126)
tbwahacker Nov 23, 2022
fd3584c
LD Registration summary shell (#795)
issyzac Nov 23, 2022
0b8313d
Ld AMSTL summary (#852)
issyzac Nov 23, 2022
6235028
Merge remote-tracking branch 'origin/tanzania-ministry-of-health-nacp…
cozej4 Nov 23, 2022
493a9b3
:wastebasket: fixed minor bugs
cozej4 Nov 23, 2022
7772f95
Fix/prep forms translation (#1140)
tbwahacker Dec 8, 2022
bd06e29
Modification of kvp in app report (#1153)
ChrissDisigale Dec 8, 2022
cbd1392
Fix/pilot issues (#1184)
cozej4 Dec 8, 2022
33ab4b3
:hammer: merged latest changes from tanzania-nacp branch
cozej4 Dec 8, 2022
07b6da7
:hammer: code refactoring
cozej4 Dec 8, 2022
246db01
:hammer: code refactoring
cozej4 Dec 8, 2022
fcd8008
:hammer: code refactoring
cozej4 Dec 8, 2022
5803ec6
:heavy_plus_sign: bumped up version code
cozej4 Dec 8, 2022
f2538a4
:hammer: code refactoring
cozej4 Dec 8, 2022
43cbc3d
:hammer: code refactoring plus updated build.gradle to target the lat…
cozej4 Dec 8, 2022
d28bb37
:hammer: Fixed issues in capturing PMTCT visit status (#1186)
cozej4 Dec 14, 2022
36f8452
Merge branch 'tanzania-ministry-of-health-nacp' into release/play-store
cozej4 Dec 14, 2022
3fd6c89
:heavy_plus_sign: bumped up version code
cozej4 Dec 14, 2022
c623791
:hammer: refactored pmtct followup status
cozej4 Dec 14, 2022
392a947
Merge branch 'tanzania-ministry-of-health-nacp' into release/play-store
cozej4 Dec 14, 2022
622183c
:heavy_plus_sign: bumped up version code
cozej4 Dec 14, 2022
950edd8
:hammer: minor bugs fixing
cozej4 Dec 15, 2022
f2b8602
:hammer: minor bugs fixing
cozej4 Dec 15, 2022
d549941
:heavy_plus_sign: bumped up version code
cozej4 Dec 15, 2022
62ba9bf
:hammer: fixed a bug in pmtct followup status action
cozej4 Jan 9, 2023
0b6d10e
Fix/prep forms translation (#1185)
tbwahacker Jan 9, 2023
f5698e9
:hammer: fixed a bug in pmtct followup status action
cozej4 Jan 9, 2023
93a9ff5
:heavy_plus_sign: bumped up version code
cozej4 Jan 9, 2023
8dd4d3b
Fix/tot workshop issues (#1197)
cozej4 Jan 9, 2023
895808f
:hammer: resolved issues in capturing followup status for PMTCT clien…
cozej4 Jan 10, 2023
5d0d6cc
:hammer: resolved issues in capturing followup status for PMTCT clien…
cozej4 Jan 10, 2023
6e36739
:arrow_up: updated chw-core and ld library dependencies
cozej4 Jan 11, 2023
a2fb8b8
:arrow_up: updated chw-core dependency
cozej4 Jan 13, 2023
4fcf3ab
:hammer: refactored hiv index contact registration forms
cozej4 Jan 17, 2023
625272d
:heavy_plus_sign: bumped up version code
cozej4 Jan 17, 2023
75d1069
:heavy_plus_sign: bumped up version code
cozej4 Jan 17, 2023
53ed058
Fix/prep forms translation (#1219)
tbwahacker Jan 20, 2023
a3f92bb
Modification of cbhs in app report (#1220)
ChrissDisigale Jan 20, 2023
bce3d5b
:hammer: refactored labour and delivery maternal complications forms,…
cozej4 Jan 30, 2023
f0a717b
Fix/prep forms translation (#1221)
tbwahacker Feb 7, 2023
bce301e
Implement/condom programing improvements from tot (#1223)
cozej4 Feb 16, 2023
16c1943
cdp-in-app report modification (#1224)
ChrissDisigale Feb 16, 2023
3ef35ed
:hammer: fix various UAT issues (#1225)
cozej4 Feb 16, 2023
0be14ff
:hammer: refactored implementation of issuing ltfu referral, added im…
cozej4 Feb 24, 2023
35ff87d
cdp receiving in-app report (#1232)
ChrissDisigale Mar 2, 2023
b6eb040
:hammer: refactored opening of partner profiles from ANC client profiles
cozej4 Mar 8, 2023
4116d96
:hammer: refactored ANC in-app reports indicators, fixed counting of …
cozej4 Mar 8, 2023
6e947d3
:hammer: fix PMTCT followup button to show, record PMTCTC visit Zero …
cozej4 Mar 8, 2023
668bb9e
:hammer: fixed a bug in Discharge of Labour and Delivery Clients
cozej4 Mar 8, 2023
1106add
:hammer: set HvlResultsViewActivity to lauch in singleTop mode
cozej4 Mar 8, 2023
7353f03
:hammer: refactored opening of partner profiles from ANC client profiles
cozej4 Mar 9, 2023
aeaa83d
:heavy_plus_sign: bumped up version code
cozej4 Mar 9, 2023
5e06e96
:hammer: fixed mis-cliking of recording and editing of HVL results in…
cozej4 Mar 9, 2023
d0511dc
:heavy_plus_sign: bumped up version code
cozej4 Mar 18, 2023
30a5437
:hammer: squashed a bug on ANC first Visit, Obstretric history for cl…
cozej4 Mar 22, 2023
a8cbab0
:hammer: minor bugs fixes
cozej4 Mar 22, 2023
bcc2983
:construction: Merged changes from tanzania-ministry-of-health
cozej4 Mar 22, 2023
a6cc234
:hammer: resolved issues observed from Njombe training
cozej4 Mar 23, 2023
bee818b
:hammer: resolved a bug while querying for PNC no mother children
cozej4 Mar 27, 2023
ca96cdc
:bug: resolved a bug that caused app crush when double clicking ANC b…
cozej4 Mar 27, 2023
a0cddaa
:heavy_plus_sign: bumped up version code
cozej4 Mar 27, 2023
6a2faf6
:hammer: reordered Navigation Menu Items
cozej4 Mar 27, 2023
1398e67
Fix/cdp issuing in app reports (#1240)
tbwahacker Mar 30, 2023
8575ef1
:hammer: code refactoring
cozej4 Apr 3, 2023
e11a509
Merge remote-tracking branch 'origin/tanzania-ministry-of-health-nacp…
cozej4 Apr 13, 2023
afbd7f3
Cdp translation (#1241)
ChrissDisigale Apr 14, 2023
c6272df
Merge remote-tracking branch 'origin/tanzania-ministry-of-health-nacp…
cozej4 Apr 14, 2023
0a6cd05
Fix/issues from update of training materials workshop (#1242)
cozej4 Apr 18, 2023
bedba7d
:hammer: merged changes from remote
cozej4 May 15, 2023
309fae7
Fix/issues from update of training materials workshop (#1245)
cozej4 May 15, 2023
ee2f95b
Merge branch 'tanzania-ministry-of-health-nacp' of https://github.com…
cozej4 May 15, 2023
7d4b161
:hammer: updated DB version and DB onUpgrade scripts
cozej4 May 15, 2023
230e8b4
:hammer: code cleaning
cozej4 May 18, 2023
38e3550
:hammer: refactored publishing configs
cozej4 Jun 3, 2023
9ae72ba
forms changes
eminis94 Jun 15, 2023
02c169d
forms changes
eminis94 Jun 15, 2023
ad34073
forms changes
eminis94 Jun 16, 2023
62f4513
forms changes
eminis94 Jun 16, 2023
7de884a
forms changes
eminis94 Jun 19, 2023
4561cf5
fixes form issues - all client Registration & hiv outcome
eminis94 Jun 20, 2023
5e8c7e2
fixes form issues - hiv outcome match openmrs_entity_id with name
eminis94 Jun 21, 2023
5a5e1ad
fixes form issues - kvp screening adding missing region-Tabora
eminis94 Jun 21, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,9 @@ project.properties
.settings
build/
jacoco.exec
opensrp-chw-hf/nacp/
caches
daemon
native
wrapper
github.properties
190 changes: 171 additions & 19 deletions opensrp-chw-hf/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,43 @@ buildscript {
}
}

def githubProperties = new Properties()
if (rootProject.file("github.properties").exists()) {
githubProperties.load(new FileInputStream(rootProject.file("github.properties")))
}
allprojects {
repositories {
maven { url 'https://maven.google.com' }

maven {

name = "GitHubPackages"

url = uri("https://maven.pkg.github.com/Digital-Square-Tanzania/opensrp-client-chw-core")
credentials {
username = githubProperties['gpr.usr'] ?: System.getenv("GPR_USER")
password = githubProperties['gpr.key'] ?: System.getenv("GPR_API_KEY")
}

}

maven {

name = "GitHubPackages"

url = uri("https://maven.pkg.github.com/Digital-Square-Tanzania/opensrp-client-chw-ld")
credentials {
username = githubProperties['gpr.usr'] ?: System.getenv("GPR_USER")
password = githubProperties['gpr.key'] ?: System.getenv("GPR_API_KEY")
}
}

}
}

android {
useLibrary 'org.apache.http.legacy'
compileSdkVersion 28
compileSdkVersion 32
buildToolsVersion androidBuildToolsVersion

compileOptions {
Expand All @@ -27,15 +61,16 @@ android {

defaultConfig {
applicationId "org.smartregister.chw.hf"
minSdkVersion 18
targetSdkVersion 28
minSdkVersion 21
targetSdkVersion 32
versionCode 11
versionName "1.2.13"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
buildConfigField "String", 'opensrp_url', '"https://boresha-afya.smartregister.org/opensrp/"'
buildConfigField "String", 'opensrp_url_debug', '"https://boresha-afya-stage.smartregister.org/opensrp/"'
// buildConfigField "String", 'opensrp_url_debug', '"https://ba-unified-stage.smartregister.org/opensrp/"'
buildConfigField "String", 'opensrp_url_debug', '"http://50.116.15.4:8082/opensrp/"'
// buildConfigField "String", 'opensrp_url_debug', '"https://boresha-afya-stage.smartregister.org/opensrp/"'
// buildConfigField "String", 'opensrp_url_debug', '"https://ba-unified-stage.smartregister.org/opensrp/"'
buildConfigField "boolean", 'SUPPORT_QR', 'true'
buildConfigField "int", "DATABASE_VERSION", '12'
buildConfigField "int", "DATA_SYNC_DURATION_MINUTES", '15'
Expand All @@ -50,6 +85,22 @@ android {
includeCompileClasspath = true
}
}

if (project.rootProject.file("local.properties").exists()) {
Properties properties = new Properties()
properties.load(project.rootProject.file("local.properties").newDataInputStream())
if (properties != null &&
properties.containsKey("mapbox.sdk.token")) {
buildConfigField "String", "MAPBOX_SDK_ACCESS_TOKEN", properties["mapbox.sdk.token"]
} else {
println("Mapbox key config variables is not set in your local.properties")
buildConfigField "String", "MAPBOX_SDK_ACCESS_TOKEN", "\"sample_key\""
}

} else {
println("local.properties does not exist")
buildConfigField "String", "MAPBOX_SDK_ACCESS_TOKEN", "\"sample_key\""
}
}

android.defaultConfig.javaCompileOptions.annotationProcessorOptions.includeCompileClasspath = true
Expand All @@ -64,17 +115,20 @@ android {
buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '100'
buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
buildConfigField "boolean", "TIME_CHECK", "true"
buildConfigField "int", "DATA_SYNC_DURATION_MINUTES", '15'
buildConfigField "int", "DATA_SYNC_DURATION_MINUTES", '30'
buildConfigField "int", "VACCINE_SYNC_PROCESSING_MINUTES", '30'
buildConfigField "int", "IMAGE_UPLOAD_MINUTES", '180'
buildConfigField "int", "PULL_UNIQUE_IDS_MINUTES", '180'
buildConfigField "int", "REPORT_INDICATOR_GENERATION_MINUTES", '15'
buildConfigField "int", "REPORT_INDICATOR_GENERATION_MINUTES", '150'
buildConfigField "int", "HOME_VISIT_MINUTES", '60'
buildConfigField "int", "STOCK_USAGE_REPORT_MINUTES", '1440'
buildConfigField "boolean", 'SUPPORT_REPORT', 'false'
buildConfigField "String[]", "ALLOWED_LOCATION_LEVELS", '{"Ward" , "Council", "Facility", "MOH Jhpiego Facility Name", "Health Facility", "Village", "Village Sublocations"}'
buildConfigField "String[]", "LOCATION_HIERACHY", '{"Country","Region","District","Ward" ,"Council", "Facility", "MOH Jhpiego Facility Name", "Health Facility", "Village", "Village Sublocations"}'
buildConfigField "String[]", "ALLOWED_LOCATION_LEVELS", '{"Ward" , "Council", "Facility", "Village"}'
buildConfigField "String[]", "LOCATION_HIERACHY", '{"Country","Zone","Region","District","Council","Ward", "Facility","Village"}'
buildConfigField "String", 'DEFAULT_LOCATION', '"Facility"'
buildConfigField "boolean", "BUILD_FOR_BORESHA_AFYA_SOUTH", "true"
buildConfigField "boolean", "BUILD_FOR_PMTCT_CASE_BASED_MANAGEMENT", "true"
buildConfigField "boolean", "ENABLED_MALARIA_MODULE", "false"
buildConfigField "String[]", 'FACILITY_LEVEL', '{"MOH Jhpiego Facility Name", "Health Facility", "Facility"}'
}

Expand All @@ -83,17 +137,20 @@ android {
buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '15'
buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
buildConfigField "boolean", "TIME_CHECK", "false"
buildConfigField "int", "DATA_SYNC_DURATION_MINUTES", '15'
buildConfigField "int", "DATA_SYNC_DURATION_MINUTES", '30'
buildConfigField "int", "VACCINE_SYNC_PROCESSING_MINUTES", '30'
buildConfigField "int", "IMAGE_UPLOAD_MINUTES", '15'
buildConfigField "int", "PULL_UNIQUE_IDS_MINUTES", '15'
buildConfigField "int", "REPORT_INDICATOR_GENERATION_MINUTES", '15'
buildConfigField "int", "REPORT_INDICATOR_GENERATION_MINUTES", '150'
buildConfigField "int", "HOME_VISIT_MINUTES", '60'
buildConfigField "int", "STOCK_USAGE_REPORT_MINUTES", '1440'
buildConfigField "boolean", 'SUPPORT_REPORT', 'false'
buildConfigField "String[]", "ALLOWED_LOCATION_LEVELS", '{"Ward" , "Council", "Facility", "MOH Jhpiego Facility Name", "Health Facility", "Village", "Village Sublocations"}'
buildConfigField "String[]", "LOCATION_HIERACHY", '{"Country","Region","District","Ward" ,"Council", "Facility", "MOH Jhpiego Facility Name", "Health Facility", "Village", "Village Sublocations"}'
buildConfigField "String[]", "ALLOWED_LOCATION_LEVELS", '{"Ward" , "Council", "Facility", "Village"}'
buildConfigField "String[]", "LOCATION_HIERACHY", '{"Country","Zone","Region","District","Council","Ward", "Facility","Village"}'
buildConfigField "String", 'DEFAULT_LOCATION', '"Facility"'
buildConfigField "boolean", "BUILD_FOR_BORESHA_AFYA_SOUTH", "true"
buildConfigField "boolean", "BUILD_FOR_PMTCT_CASE_BASED_MANAGEMENT", "false"
buildConfigField "boolean", "ENABLED_MALARIA_MODULE", "true"
buildConfigField "String[]", 'FACILITY_LEVEL', '{"MOH Jhpiego Facility Name", "Health Facility", "Facility"}'
testCoverageEnabled true
}
Expand Down Expand Up @@ -138,41 +195,134 @@ android {
}
}

flavorDimensions 'baseDimension'
productFlavors {
nacp {
applicationId "org.smartregister.chw.moh.hf"
minSdkVersion 21
targetSdkVersion 31
versionCode 21
versionName "1.1.13"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
buildConfigField "String", 'opensrp_url', '"https://ucs.nacp.go.tz/opensrp/"'
// buildConfigField "String", 'opensrp_url_debug', '"http://50.116.15.4:8082/opensrp/"'
buildConfigField "String", 'opensrp_url_debug', '"http://170.187.199.69:8082/opensrp/"'
buildConfigField "boolean", 'SUPPORT_QR', 'true'
buildConfigField "int", "DATABASE_VERSION", '17'
buildConfigField "int", "DATA_SYNC_DURATION_MINUTES", '15'
buildConfigField "long", "MAX_SERVER_TIME_DIFFERENCE", "1800000l"
buildConfigField "boolean", "TIME_CHECK", "false"
buildConfigField "String", "SYNC_TYPE", '"teamId"'
buildConfigField "int", "MAX_SYNC_RETRIES", '3'
buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L"
buildConfigField "boolean", "IS_SYNC_SETTINGS", "false"
javaCompileOptions {
annotationProcessorOptions {
includeCompileClasspath = true
}
}
}
ba {
applicationId "org.smartregister.chw.hf"
minSdkVersion 21
targetSdkVersion 28
versionCode 11
versionName "1.2.13"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
buildConfigField "String", 'opensrp_url', '"https://boresha-afya.smartregister.org/opensrp/"'
buildConfigField "String", 'opensrp_url_debug', '"https://boresha-afya-stage.smartregister.org/opensrp/"'
// buildConfigField "String", 'opensrp_url_debug', '"https://ba-unified-stage.smartregister.org/opensrp/"'
buildConfigField "boolean", 'SUPPORT_QR', 'true'
buildConfigField "int", "DATABASE_VERSION", '12'
buildConfigField "int", "DATA_SYNC_DURATION_MINUTES", '15'
buildConfigField "long", "MAX_SERVER_TIME_DIFFERENCE", "1800000l"
buildConfigField "boolean", "TIME_CHECK", "false"
buildConfigField "String", "SYNC_TYPE", '"teamId"'
buildConfigField "int", "MAX_SYNC_RETRIES", '3'
buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L"
buildConfigField "boolean", "IS_SYNC_SETTINGS", "false"
javaCompileOptions {
annotationProcessorOptions {
includeCompileClasspath = true
}
}
}
}

lintOptions {
checkReleaseBuilds false
abortOnError false
}

dataBinding {
enabled = true
}

bundle {
language {
// Specifies that the app bundle should not support
// configuration APKs for language resources. These
// resources are instead packaged with each base and
// dynamic feature APK.
enableSplit = false
}
}

}

def flavors = android.productFlavors.collect { flavor -> flavor.name }
if (!flavors) flavors.add('')

def testDependencies = []
flavors.each { productFlavorName ->
testDependencies.add("test${productFlavorName.capitalize()}DebugUnitTest")
testDependencies.add("create${productFlavorName.capitalize()}DebugCoverageReport")
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation('org.smartregister:opensrp-client-chw-core:1.5.27-SNAPSHOT@aar') {
implementation('org.smartregister:opensrp-client-chw-core:1.5.36.15-NACP-SNAPSHOT@aar') {
// implementation(project(":opensrp-chw-core")) {
transitive = true
exclude group: 'com.android.support', module: 'appcompat-v7'
exclude group: 'androidx.legacy', module: 'legacy-support-v4'
exclude group: 'androidx.appcompat', module: 'appcompat'
exclude group: 'androidx.constraintlayout', module: 'constraintlayout'
exclude group: 'com.google.guava', module: 'guava'
exclude group: 'com.rengwuxian.materialedittext', module: 'library'
exclude group: 'org.smartregister', module: 'opensrp-client-materialedittext'
exclude group: 'org.smartregister', module: 'opensrp-client-chw-ld'
}

implementation('org.smartregister:opensrp-client-chw-ld:1.0.31-NACP-SNAPSHOT@aar') {
transitive = true
exclude group: 'org.smartregister', module: 'opensrp-client-core'
exclude group: 'org.smartregister', module: 'opensrp-client-native-form'
exclude group: 'org.smartregister', module: 'opensrp-client-configurable-views'
exclude group: 'com.android.support', module: 'appcompat-v7'
exclude group: 'id.zelory', module: 'compressor'
}

//Do not upgrade to 1.1.0 due to compatibility issues
implementation 'com.github.rey5137:material:1.2.5'
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
//Do not upgrade to 1.1.0 due to compatibility issues
implementation 'androidx.recyclerview:recyclerview:1.0.2'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
implementation 'com.android.support:multidex:1.0.3'
//Do not upgrade to 24.jre-1 due to compatibility issues
implementation 'com.google.guava:guava:20.0'
implementation 'androidx.webkit:webkit:1.4.0'
implementation 'com.whiteelephant:monthandyearpicker:1.3.0'

androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
androidTestImplementation 'org.mockito:mockito-android:3.0.0'

implementation 'com.github.lecho:hellocharts-android:v1.5.8'
implementation 'com.github.lecho:hellocharts-library:1.5.8@aar'

testImplementation 'junit:junit:4.13'
testImplementation 'org.mockito:mockito-core:3.1.0'
Expand All @@ -187,7 +337,9 @@ tasks.withType(Test) {
jacoco.includeNoLocationClasses = true
}

task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'createDebugCoverageReport']) {
task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'createDebugCoverageReport',
'testBaDebugUnitTest', 'createBaDebugCoverageReport',
'testNacpDebugUnitTest', 'createNacpDebugCoverageReport']) {

reports {
xml.enabled = true
Expand Down
Loading