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

Kvp prep enhancement #144

Open
wants to merge 3,375 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
3375 commits
Select commit Hold shift + click to select a range
bdcef0d
:construction: fixed a list of KVP and PrEP issues
cozej4 Jun 13, 2023
acd72de
:hammer: fixed codacy issues
cozej4 Jun 13, 2023
907f3ee
Merge pull request #1 from Digital-Square-Tanzania/implement/synchron…
cozej4 Jun 13, 2023
46af732
:hammer: merged changes from origin
cozej4 Jun 13, 2023
e280555
Merge pull request #2 from Digital-Square-Tanzania/fix/hiv-modules-tr…
cozej4 Jun 13, 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
4a75bf8
:hammer: implemented editing of KVP Visits
cozej4 Jun 19, 2023
8058af7
:hammer: implemented issuing of LFTU Referrals for PrEP Clients
cozej4 Jun 19, 2023
af72757
:hammer: implented Editing of PrEP Visits
cozej4 Jun 19, 2023
870669e
:hammer: updated prep initiation status for new clients
cozej4 Jun 19, 2023
4561cf5
fixes form issues - all client Registration & hiv outcome
eminis94 Jun 20, 2023
7b5b164
:hammer: added a question on whether the registered PrEP Client is Pr…
cozej4 Jun 21, 2023
f0b2b72
:hammer: added implementation for limiting entering of more than one …
cozej4 Jun 21, 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
0636ab0
:hammer: implented Filtering of PrEP clients by next appointment date
cozej4 Jun 21, 2023
2c57f9b
Merge pull request #9 from Digital-Square-Tanzania/esl
eminis94 Jun 21, 2023
3187339
Merge pull request #13 from Digital-Square-Tanzania/fix/prep-and-kvp-…
cozej4 Jun 21, 2023
5195715
:hammer: code refactoring
cozej4 Jun 21, 2023
7bd416d
:hammer: code refactoring
cozej4 Jun 21, 2023
131c7e2
pnc mother examination lochia issues and pnc child examination mixed …
eminis94 Jun 21, 2023
82e3365
:hammer: implemented manual processing of HEI visits on the same day
cozej4 Jun 24, 2023
0e5cb71
:hammer: implemented manual processing of PMTCT visits on the same day
cozej4 Jun 24, 2023
26c2014
:arrow_up: updated dependencies
cozej4 Jun 24, 2023
e43f4b1
:hammer: fixed codacy issues
cozej4 Jun 24, 2023
3edad5e
Merge pull request #24 from Digital-Square-Tanzania/implement/process…
cozej4 Jun 24, 2023
c2a8ef4
fixing PNC codacy issues
eminis94 Jun 24, 2023
5d15d54
fixing pnc_mother_general_examination v_regex codacy issues
eminis94 Jun 24, 2023
4a4818c
Merge pull request #23 from Digital-Square-Tanzania/fix/form-issues
cozej4 Jun 24, 2023
a9d1e95
:hammer: added lab-personel to list of clinician positions in dna-pcr…
cozej4 Jun 24, 2023
596be37
:hammer: refactored infant feeding practices by HEI age
cozej4 Jun 24, 2023
262bec5
:hammer: fixed codacy issues
cozej4 Jun 24, 2023
f8a0321
:hammer: code refactoring
cozej4 Jul 10, 2023
8095e5f
:construction: implemented Medical History for PNC No Mother Children
cozej4 Jul 15, 2023
eae2b86
:hammer: implemented Lochia assessment Validation rules
cozej4 Jul 16, 2023
cdf1b22
:hammer: fixed an issue in Index contacts elicitation capturing of re…
cozej4 Jul 20, 2023
12390ca
:hammer: refactored HIVST mobilization forms to set a limit in the nu…
cozej4 Jul 21, 2023
a4042df
:hammer: code refactoring
cozej4 Jul 21, 2023
98effe7
:hammer: code refactoring
cozej4 Jul 21, 2023
61a95c7
:hammer: merged changes from origin
cozej4 Jul 21, 2023
cd766da
:hammer: fixed codacy issues
cozej4 Jul 24, 2023
218101c
Merge pull request #25 from Digital-Square-Tanzania/fix/reported-cbm-…
cozej4 Jul 24, 2023
792e859
:hammer: refactored No Mother Child PNC Visits, adding HepB and Vit K…
cozej4 Jul 26, 2023
a660a83
:hammer: fixed a bug in LD Vaginal Examination, showing of prompt for…
cozej4 Jul 26, 2023
c96d557
Merge pull request #32 from Digital-Square-Tanzania/fix/reported-cbm-…
cozej4 Jul 31, 2023
f9187e2
:hammer: code refactoring
cozej4 Aug 1, 2023
7fdbac2
:hammer: fixed a bug in HEI for children over 7 months that caused is…
cozej4 Aug 2, 2023
fb2ccc8
Merge pull request #33 from Digital-Square-Tanzania/implement/fix-hei…
cozej4 Aug 9, 2023
9149b0b
:hammer: refactored counting of Pregnant Clients with four or more pr…
cozej4 Aug 9, 2023
e584819
:hammer: refactored counting of Pregnant Clients 35+ year olds with 1…
cozej4 Aug 9, 2023
fd3ef06
:hammer: implemented automatic refresh of options menu on All clients…
cozej4 Aug 10, 2023
2e7141c
:hammer: code refactoring
cozej4 Aug 12, 2023
35f0072
:hammer: refactored updating of options menu after editing clients de…
cozej4 Aug 30, 2023
6d9ba0c
Merge branch 'tanzania-ministry-of-health-nacp' into implement/fix-he…
cozej4 Aug 30, 2023
c245891
Merge pull request #35 from Digital-Square-Tanzania/implement/fix-hei…
cozej4 Aug 30, 2023
1fe20de
:hammer: refactored LTFU fragments and bottom navigation buttons titles
cozej4 Aug 30, 2023
328f65b
:hammer: added implementation for showing last visit date for clients…
cozej4 Aug 30, 2023
5196a7e
:hammer: added migrations for database onUpgrade to version 20
cozej4 Aug 30, 2023
f4f3e46
:hammer: added an implementation to capture ANC details on whether cl…
cozej4 Aug 30, 2023
a65a4a2
:hammer: fixed codacy issues
cozej4 Aug 30, 2023
ce3db5a
Merge branch 'tanzania-ministry-of-health-nacp' into fix/anc-issues
cozej4 Aug 30, 2023
b95e31c
Merge pull request #37 from Digital-Square-Tanzania/fix/anc-issues
cozej4 Aug 30, 2023
194ec0e
Merge branch 'tanzania-ministry-of-health-nacp' into fix/ltfu-issues
cozej4 Aug 30, 2023
ff9ed85
Merge pull request #36 from Digital-Square-Tanzania/fix/ltfu-issues
cozej4 Aug 30, 2023
f645391
:hammer: Created Edit HEI number forms
cozej4 Aug 31, 2023
689cf8a
:arrow_up: updated chw-core dependencies
cozej4 Aug 31, 2023
2c90271
:hammer: implemented Editing of HEI Number
cozej4 Aug 31, 2023
ccc5f6d
:hammer: implemented processing of the Edit Hei Number events
cozej4 Aug 31, 2023
1add7be
:hammer: updated migrations for database upgrade
cozej4 Aug 31, 2023
0e4b98c
:hammer: fixed codacy issues
cozej4 Aug 31, 2023
167aa7b
Merge pull request #38 from Digital-Square-Tanzania/implement/editing…
cozej4 Aug 31, 2023
f7fb45a
:arrow_up: updated chw-core library dependencies
cozej4 Sep 16, 2023
284d980
Code cleaning
cozej4 Sep 16, 2023
a547dd3
:construction: Refactored to include implementation for new Family Pl…
cozej4 Sep 16, 2023
63e71b7
:hammer: added FP forms
cozej4 Sep 17, 2023
f5c5a4b
:hammer: refactored ec_client_fields and ec_client_classifications
cozej4 Sep 17, 2023
ba945a9
:hammer: renamed FPMemberProfile Activity
cozej4 Sep 17, 2023
8103937
:hammer: added FP activities to Manifest
cozej4 Sep 17, 2023
d92ff99
implemented FP Reports
cozej4 Sep 17, 2023
16d2b12
:hammer: refactored ec_client_fields and ec_client_classifications
cozej4 Sep 17, 2023
828df9b
:bug: fixed a bug in get Last FP Visit and checking whether FP visit …
cozej4 Sep 17, 2023
29abced
:hammer: refactored fp_counseling form
cozej4 Sep 17, 2023
cef9c35
:hammer: code cleaning
cozej4 Sep 17, 2023
3b73889
:hammer: refactored various FP Form Activities
cozej4 Sep 17, 2023
23abd67
:hammer: fp forms cleaning
cozej4 Sep 17, 2023
5151e21
:hammer: added processing of FP Visits
cozej4 Sep 17, 2023
9f5f980
Refractor fp-module forms
fredsabuni Sep 17, 2023
c205d2b
Merge pull request #40 from Digital-Square-Tanzania/refractor/fp-module
fredsabuni Sep 17, 2023
f692016
Refactor screening forms
fredsabuni Sep 17, 2023
44fa259
Merge pull request #41 from Digital-Square-Tanzania/refractor/fp-module
fredsabuni Sep 17, 2023
6af4d75
fix adding exclusive to None form items
fredsabuni Sep 17, 2023
f17dad5
:hammer: more library implementation for handling followup visits
cozej4 Sep 17, 2023
cca751c
Merge branch 'implement/fp-module' of https://github.com/Digital-Squa…
cozej4 Sep 17, 2023
333a2c5
:hammer: refactored fp_followup_visit_vitals form, setting LNMP to on…
cozej4 Sep 17, 2023
2dc4c1c
:hammer: code refactoring
cozej4 Sep 19, 2023
5bde6f3
:bug: fixed codacy issues
cozej4 Sep 19, 2023
06fbd5f
Pull Latest Updates
fredsabuni Sep 19, 2023
e928ea2
FP module form translations part 1
fredsabuni Sep 20, 2023
db603eb
Merge branch 'implement/fp-module' into refractor/fp-module
fredsabuni Sep 20, 2023
dc69935
Merge pull request #42 from Digital-Square-Tanzania/refractor/fp-module
fredsabuni Sep 20, 2023
41a977e
:bug: minor bugs fixes
cozej4 Sep 20, 2023
d55bf5b
:arrow_up: updated CHW CORE dependencies
cozej4 Sep 20, 2023
4a44286
:hammer: fixed codacy issues
cozej4 Sep 20, 2023
847432c
fp Refractor fp swahili forms
fredsabuni Sep 20, 2023
c12c32d
update fp form swahili translations
fredsabuni Sep 20, 2023
622436c
Get core update
fredsabuni Sep 20, 2023
9879689
Update fp report and forms
fredsabuni Sep 22, 2023
df90a84
Update fp-module report and forms
fredsabuni Sep 22, 2023
dc6f85b
:hammer: fixed issues in capturing complications in Past Obstetric Hi…
cozej4 Sep 22, 2023
a06d2cd
:construction: implemented capturing of L&D Stage during L&D Client R…
cozej4 Sep 22, 2023
03d32db
:hammer: refactored capturing of HEI CTX Prescription for also captur…
cozej4 Sep 22, 2023
6563ecd
fix gradle version
fredsabuni Sep 22, 2023
deefa0e
Merge pull request #43 from Digital-Square-Tanzania/fix/fp-module-report
fredsabuni Sep 22, 2023
91fbbb0
:hammer: refactored LD Post Delivert Management for clients registere…
cozej4 Sep 24, 2023
48a160b
:hammer: merged implement/fp-moodule
cozej4 Sep 25, 2023
c27bd8f
:hammer: code refactoring
cozej4 Sep 28, 2023
3033e74
:hammer: refactored opensrp-chw-hf/src/main/assets/ec_client_fields.json
cozej4 Sep 28, 2023
8a6e4d8
:hammer: refactored FP forms
cozej4 Sep 28, 2023
483aefa
:hammer: merged changes from origin
cozej4 Sep 28, 2023
678918c
:hammer: code refactoring
cozej4 Sep 28, 2023
f52d2dc
:hammer: fix swahili forms and update on fp provide method form
fredsabuni Sep 28, 2023
2c2a902
:hammer: code refactoring
cozej4 Sep 28, 2023
319e528
Merge branch 'implement/fp-module' of https://github.com/Digital-Squa…
cozej4 Sep 28, 2023
9f88532
:hammer: code refactoring
cozej4 Sep 28, 2023
c00804b
:hammer: code refactoring
cozej4 Sep 28, 2023
636ef77
:hammer: fix remove today in the meta data
fredsabuni Sep 28, 2023
92f063d
:hammer: code refactoring
cozej4 Sep 28, 2023
f6cfe40
Merge branch 'implement/fp-module' of https://github.com/Digital-Squa…
cozej4 Sep 28, 2023
da77e5d
:hammer: adding questions in string
fredsabuni Sep 28, 2023
10bf087
:hammer:fix counseling screen
fredsabuni Sep 28, 2023
ae7220b
:hammer: fix add global in continue
fredsabuni Sep 28, 2023
f66c42f
:hammer: fix continue form
fredsabuni Sep 28, 2023
9b6410e
:hammer: refactored editing of Visits in FpMedical History
cozej4 Sep 28, 2023
b1af329
:hammer: fix report question 6 and form rafactor
fredsabuni Sep 29, 2023
0bb77cf
Merge branch 'implement/fp-module' of https://github.com/Digital-Squa…
cozej4 Sep 29, 2023
70d4bf9
:hammer: fixed UAT issues
cozej4 Sep 29, 2023
abf7ee6
:hammer: fixed UAT issues
cozej4 Sep 29, 2023
c6ab0f2
:hammer: added type of child death
fredsabuni Sep 29, 2023
db68a4d
:hammer: implementing vmmc module
ChrissDisigale Oct 6, 2023
01f5b67
codecy check fix
ChrissDisigale Oct 6, 2023
d9af7c4
:hammer: edited report
ChrissDisigale Oct 6, 2023
93f8b76
codecy issue fix
ChrissDisigale Oct 6, 2023
a1b072a
:hammer: fixing Codacy Issues
cozej4 Oct 11, 2023
234641d
:hammer: refactored android github workflows
cozej4 Oct 11, 2023
b3ab8b3
:hammer: refactored build.gradle
cozej4 Oct 11, 2023
bba23ff
:hammer: refactored build.gradle
cozej4 Oct 11, 2023
4fc377e
Addition of ecp forms
fredsabuni Oct 13, 2023
09679ad
:hammer: edit vmmc forms for superset
ChrissDisigale Oct 14, 2023
fc453b7
:constraction: vmmc module filter
ChrissDisigale Oct 15, 2023
eb463d9
filter in vmmc module
ChrissDisigale Oct 17, 2023
fc0570a
vmmc fix vmmc-theatre register issue
ChrissDisigale Oct 17, 2023
026f121
codeacy issue fix
ChrissDisigale Oct 17, 2023
11b01ea
codecy fix issue
ChrissDisigale Oct 17, 2023
d1d3bb9
vmmc-service-register edited column name
ChrissDisigale Oct 18, 2023
ed33eb1
:hammer: added SBC implementation
cozej4 Oct 19, 2023
abc9eef
Merge branch 'implement/fp-module' of https://github.com/Digital-Squa…
cozej4 Oct 19, 2023
4979a84
:hammer: code refactoring
cozej4 Oct 24, 2023
716b014
vmmc-fix
ChrissDisigale Oct 24, 2023
c1df900
Merge branch 'fix/reported-issues' into implement/fp-module
cozej4 Oct 26, 2023
8a968ec
:hammer: code refactoring
cozej4 Oct 26, 2023
539a1f2
:hammer: code refactoring
cozej4 Oct 26, 2023
5467b5e
:hammer: code refactoring
cozej4 Oct 26, 2023
b1d35ac
:heavy_plus_sign: bumped up version code
cozej4 Oct 26, 2023
667027f
:hammer: Added ECP Register Fragment
cozej4 Oct 27, 2023
ff59788
:hammer: vmmc fliter button
ChrissDisigale Oct 27, 2023
b9941d3
:hammer: refactored ec_client_fields and ec_client_classifications
cozej4 Oct 29, 2023
daa5719
:hammer: finalized implementation of FP ECP and Added some SBC Resources
cozej4 Oct 30, 2023
fbea39a
:hammer: added implementation for conducting FP ECP Screening for FP …
cozej4 Oct 30, 2023
8b5fbf4
:hammer: Minor bugs fixes
cozej4 Oct 30, 2023
b1b2b69
:arrow_up: updated CHW-CORE dependencies
cozej4 Oct 31, 2023
acbd743
:hammer: refactored HfClientProcessor added custom processing of SBC_…
cozej4 Oct 31, 2023
4261370
:hammer: added string resources for SBC visit history
cozej4 Oct 31, 2023
8bde4c6
:hammer: fixed codacy issues
cozej4 Nov 1, 2023
9caa2d8
:hammer: fixed codacy issues
cozej4 Nov 1, 2023
d43ca72
Merge pull request #44 from Digital-Square-Tanzania/implementing-vmmc…
ChrissDisigale Nov 2, 2023
6ca9cd4
:Hammer: Refactor FP Forms Remove ECP as Family Plan Method and Add E…
fredsabuni Nov 2, 2023
3732566
:hammer: code refactoring
cozej4 Nov 6, 2023
9399b7b
Merge branch 'implement/fp-module' of https://github.com/Digital-Squa…
cozej4 Nov 6, 2023
9b0dc87
:hammer: implement:Non Biological Children Relationship in Index Cont…
cozej4 Nov 13, 2023
687cbaf
:hammer: refactored swahili index contacts elicitation form
cozej4 Nov 13, 2023
fa1830c
Merge pull request #5 from AbtPS3/implement/non-biological-child-rela…
cozej4 Nov 13, 2023
56d6d47
:hammer: merged changes from origin
cozej4 Nov 17, 2023
cfd4b17
:hammer: fixed a minor bug during code merging
cozej4 Nov 17, 2023
cb08776
:bug: fixed failing tests
cozej4 Nov 17, 2023
1b1ebcc
:hammer: fixed minor issues wit CI github action
cozej4 Nov 17, 2023
a8a5050
Merge pull request #39 from Digital-Square-Tanzania/implement/fp-module
cozej4 Nov 17, 2023
33cfc72
:hammer: implemented sending Followup for TEPI Elicitation referrals …
cozej4 Nov 27, 2023
5796f9d
Merge branch 'lift-up-initiative' of https://github.com/AbtPS3/opensr…
cozej4 Nov 27, 2023
299ea0a
Merge pull request #6 from AbtPS3/tanzania-ministry-of-health-nacp
cozej4 Nov 27, 2023
1535caf
Merge branch 'lift-up-initiative' of https://github.com/AbtPS3/opensr…
cozej4 Nov 27, 2023
7556914
:hammer: fixed codacy issues
cozej4 Nov 27, 2023
d7f9b10
vmmc-translation
ChrissDisigale Dec 7, 2023
976ad15
:hammer: added data_source to ec_family_member table
cozej4 Dec 11, 2023
538f27b
:hammer: added migrations for database onUpgrade to version 22
cozej4 Dec 11, 2023
e7ca0b9
:hammer: refactored Filter Activity Name
cozej4 Dec 11, 2023
ddb30fc
Merge branch 'lift-up-initiative' into tanzania-ministry-of-health-nacp
cozej4 Dec 11, 2023
7db9da8
Merge pull request #7 from AbtPS3/implement/sending-of-tepi-client-fo…
cozej4 Dec 11, 2023
6570e17
Merge branch 'lift-up-initiative' into tanzania-ministry-of-health-nacp
cozej4 Dec 11, 2023
e79424a
Refactor
ChrissDisigale Jan 8, 2024
e07d81f
after merge commit
ChrissDisigale Jan 11, 2024
9a2d655
:hammer: Refactored setting of Index Contact Testing Outcome to be ma…
cozej4 Jan 19, 2024
ffcbdc2
updated ci.yml
ChrissDisigale Jan 23, 2024
524f912
merge-commit branch 'tanzania-ministry-of-health-nacp' into bug-fix/v…
ChrissDisigale Jan 23, 2024
9c3b299
Update version of chw-core
ChrissDisigale Jan 23, 2024
132470c
updated ci.yml
ChrissDisigale Jan 23, 2024
bdf934e
fix test issue
ChrissDisigale Jan 23, 2024
3220f8a
edited ci.yml
ChrissDisigale Jan 23, 2024
a96e54a
ci.yml edit
ChrissDisigale Jan 23, 2024
33e2cef
changed ci.yml file
ChrissDisigale Jan 23, 2024
6360537
Merge pull request #47 from Digital-Square-Tanzania/bug-fix/vmmc-module
cozej4 Jan 23, 2024
edadba7
:hammer: cleaning up TEPI implementation
cozej4 Jan 23, 2024
39d4f58
:hammer: updated jacoco tool version and updated CI github action for…
cozej4 Jan 23, 2024
8468202
:hammer: refactored CI
cozej4 Jan 23, 2024
0adf1e6
:hammer: Disabled generating of monthly tallies job for now until fur…
cozej4 Feb 11, 2024
f2bc3b9
:hammer: Linked the app with an updated version of opensrp-client-rep…
cozej4 Feb 11, 2024
55d1a68
:hammer: Implemented migrations for DB version 23 that removes the re…
cozej4 Feb 11, 2024
dd3c3e7
:hammer: Code cleaning
cozej4 Feb 11, 2024
ce5e628
:hammer: Updated targetSdkVersion and CompileSdkVersion to 33 as per …
cozej4 Feb 11, 2024
e3a5221
:hammer: code cleaning
cozej4 Feb 11, 2024
056fa8d
:hammer: fixed failing FP reporting indicator queries
cozej4 Feb 11, 2024
61c8dc7
:hammer: Added Logs View on ReportsActivity to show users when the in…
cozej4 Feb 11, 2024
2516b19
:arrow_up: updated chw core dependencies
cozej4 Feb 12, 2024
8b5038b
:hammer: Added migrations for newly implemented db tables
cozej4 Feb 13, 2024
cc88271
Merge pull request #48 from Digital-Square-Tanzania/implement-pefoman…
cozej4 Feb 13, 2024
31da3ba
:hammer: code refactoring
cozej4 Feb 13, 2024
65a2781
:hammer: refactored anc in-app reports indicator definitions
cozej4 Feb 26, 2024
62ca362
:hammer: Added an implementation to fix synchronization of data to th…
cozej4 Mar 16, 2024
0763b08
:hammer: Updated end server endpoint fromm ucs.nacp.go.tz to ucs.moh.…
cozej4 Mar 16, 2024
7c97bc3
:bug: squashed some bugs
cozej4 Mar 16, 2024
f7a8bb2
change number of pills
Andoid-Java Mar 22, 2024
9e4ba89
Number of pills
Mar 22, 2024
b097d28
Number of pills updated
Mar 22, 2024
20da3e1
kvp-prep changes requested
Mar 22, 2024
c19e354
prep-other-services updates
Mar 22, 2024
3abe34a
kvp_prep new changes
Apr 8, 2024
ca07770
Your commit message here
Apr 15, 2024
838de29
kvp-prep new changes
Apr 29, 2024
a16cdc3
changes observed from team during TWG meeting
Apr 30, 2024
88bb336
kvp-prep enhanced issues after UAT
Jun 12, 2024
ecb89d7
Added Albinism disability in all clients registration form
Jun 29, 2024
93a1863
latest updates
Jul 16, 2024
b10ca61
Waiting results actions for HBV,HCV,CrCL in Prep Screening
Aug 7, 2024
6266a4d
PrEP drugs offered with added option named 'Injectable'
Sep 20, 2024
87f45e7
KVP/PrEP requested changes 25092024
Oct 2, 2024
4807871
KVP/PrEP requested Community changes 04102024
Oct 4, 2024
980e4b3
added breasting feeding status while registering or screening a clien…
Oct 9, 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
🔨 updated prep initiation status for new clients
cozej4 committed Jun 19, 2023

Verified

This commit was signed with the committer’s verified signature.
cozej4 Ilakoze Jumanne
commit 870669e75f414cccd4690ebe34edd7ea8c768cae
Original file line number Diff line number Diff line change
@@ -95,13 +95,17 @@ private void evaluatePrEPScreening(Map<String, List<VisitDetail>> details) throw
actionList.put(context.getString(R.string.prep_screening), action);
}

private void evaluatePrEPInitiation(Map<String, List<VisitDetail>> details) throws BaseKvpVisitAction.ValidationException {
private void evaluatePrEPInitiation(Map<String, List<VisitDetail>> details, String prepVisitType) throws BaseKvpVisitAction.ValidationException {
JSONObject prepInitiation = FormUtils.getFormUtils().getFormJson(Constants.PrEP_FOLLOWUP_FORMS.INITIATION);

try {
if (HfKvpDao.isPrEPInitiated(memberObject.getBaseEntityId())) {
JSONArray fields = prepInitiation.getJSONObject(STEP1).getJSONArray(FIELDS);
JSONObject prepStatus = org.smartregister.util.JsonFormUtils.getFieldJSONObject(fields, "prep_status");
JSONArray fields = prepInitiation.getJSONObject(STEP1).getJSONArray(FIELDS);
JSONObject prepStatus = org.smartregister.util.JsonFormUtils.getFieldJSONObject(fields, "prep_status");
if (prepVisitType != null && prepVisitType.equalsIgnoreCase("new_client")) {
prepStatus.getJSONArray("options").remove(4);
prepStatus.getJSONArray("options").remove(2);
prepStatus.getJSONArray("options").remove(1);
} else if (HfKvpDao.isPrEPInitiated(memberObject.getBaseEntityId())) {
prepStatus.getJSONArray("options").remove(3);
prepStatus.getJSONArray("options").remove(0);
}
@@ -150,6 +154,7 @@ public String postProcess(String s) {
if (StringUtils.isNotBlank(visit_type)) {
try {
evaluatePrEPScreening(details);
evaluatePrEPInitiation(details, visit_type);
} catch (BaseKvpVisitAction.ValidationException e) {
e.printStackTrace();
}
@@ -173,7 +178,8 @@ public PrEPScreeningActionHelper(String baseEntityId) {
public String postProcess(String s) {
if (should_initiate.equalsIgnoreCase("yes")) {
try {
evaluatePrEPInitiation(details);
if (!actionList.containsKey(context.getString(R.string.prep_initiation)))
evaluatePrEPInitiation(details, null);
evaluateOtherServices(details);
} catch (BaseKvpVisitAction.ValidationException e) {
e.printStackTrace();