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

CO 852 #335

Open
wants to merge 848 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
848 commits
Select commit Hold shift + click to select a range
6a0c377
Merge branch 'dev' into COM-679
tmvumbi2 Feb 28, 2020
b62d63e
Merge pull request #245 from jembi/COM-679
tmvumbi2 Feb 28, 2020
6b7a4a0
COM-683 Add testing indicator 7 part c
tmvumbi2 Feb 28, 2020
f12b7d4
COM-687 Add testing indicator 7 part d and e
tmvumbi2 Feb 28, 2020
058107c
Merge pull request #246 from jembi/COM-683
lauravignoli Mar 2, 2020
6de4a81
Merge pull request #247 from jembi/COM-687
lauravignoli Mar 2, 2020
e3b668c
COM-689 Add testing indicator 7 part f
tmvumbi2 Mar 2, 2020
17c627f
COM-774 Add biological relatioships translations
lauravignoli Mar 2, 2020
d6033c0
Merge pull request #248 from jembi/COM-689
lauravignoli Mar 2, 2020
35176e1
COM-775 Add testing indicator 8 to template
lauravignoli Mar 2, 2020
d449075
Merge pull request #249 from jembi/COM-774
tmvumbi2 Mar 2, 2020
381a178
Merge pull request #250 from jembi/COM-775
tmvumbi2 Mar 2, 2020
90dd19b
COM-787 Move the html folder to the config repo
lauravignoli Mar 4, 2020
eb5aac0
COM-787 Move omods to config repo
lauravignoli Mar 5, 2020
07d07cb
COM-787 Move metadata to config repo
lauravignoli Mar 5, 2020
b9a1ff7
COM-787 Update travis scripts
lauravignoli Mar 5, 2020
0a4dd35
Merge pull request #255 from jembi/COM-787
lauravignoli Mar 5, 2020
867ea55
COM-786 Update hiv not reported on template
lauravignoli Mar 5, 2020
dced83a
COM-786 Add hiv completeness check template
lauravignoli Mar 5, 2020
349952b
COM-786 Implement util functions for data completeness check report
tmvumbi2 Mar 6, 2020
2c7f503
COM-786 Fix format to improve readability
tmvumbi2 Mar 6, 2020
187e0d8
Merge pull request #256 from jembi/COM-786
tmvumbi2 Mar 6, 2020
f1453af
COM-786 Use the concept short name value for 'Index & Modality' obs a…
tmvumbi2 Mar 6, 2020
441f68a
COM-786 Fix the logic to calculate num of visits and date of last visit
tmvumbi2 Mar 6, 2020
7f03bb8
Merge pull request #257 from jembi/COM-786
tmvumbi2 Mar 6, 2020
d7a4b42
COM-786 Update CD4 function to use most recent date between Elis and …
tmvumbi2 Mar 6, 2020
eff1418
Merge pull request #258 from jembi/COM-778
tmvumbi2 Mar 6, 2020
6b41340
COM-791 Fix function name in GP
lauravignoli Mar 9, 2020
7ace976
Merge pull request #262 from jembi/COM-791
lauravignoli Mar 9, 2020
8c023e2
COM-781 Add config to display "Is breast feeding" only in the HIV pro…
tmvumbi2 Mar 3, 2020
7afa298
COM-781 Adds a new program attribute for "Is breast feeding"
lauravignoli Mar 10, 2020
5e4f13c
Merge pull request #252 from jembi/COM-781
lauravignoli Mar 10, 2020
cb55604
COM-776 Add treatment indicator 3b to template
lauravignoli Mar 3, 2020
8478937
COM-670 Implement treatment indicator 3b
lauravignoli Mar 3, 2020
97998f6
COM-670 Grey out the last total column for treatment indicator 3b
tmvumbi2 Mar 4, 2020
8fca55f
COM-670 Implement treatment indicator 3b
lauravignoli Mar 10, 2020
e265e4f
Merge pull request #253 from jembi/COM-670
lauravignoli Mar 10, 2020
7273aa6
COM-777 Add template for treatment indicator 5
tmvumbi2 Mar 3, 2020
1a46dbd
Merge pull request #254 from jembi/COM-777
lauravignoli Mar 10, 2020
194cbd2
COM-778 Add treatment indicator 6 to the template
tmvumbi2 Mar 9, 2020
e9b1a0d
Merge pull request #259 from jembi/COM-778
lauravignoli Mar 10, 2020
10ca55a
COM-778 Implement treatment indicator 6
tmvumbi2 Mar 9, 2020
f8ad0f1
Merge pull request #261 from jembi/COM-673
lauravignoli Mar 10, 2020
3043ace
COM-669 Implement testing indicator 8a
tmvumbi2 Mar 10, 2020
f242b41
Merge pull request #264 from jembi/COM-669
lauravignoli Mar 18, 2020
1e3ed96
COM-788 Implement testing indicator 8b
tmvumbi2 Mar 17, 2020
0591358
COM-788 Remove duplicate check from ind8b
lauravignoli Mar 18, 2020
f82312a
Merge pull request #265 from jembi/COM-788
lauravignoli Mar 18, 2020
26f2814
COM-789 Implement testing indicator 8c
tmvumbi2 Mar 17, 2020
1088efa
COM-789 Move indicator8b between 8a and 8c
lauravignoli Mar 18, 2020
73285c4
COM-789 Remove duplicate check from ind8c
lauravignoli Mar 18, 2020
c7761e2
Merge pull request #266 from jembi/COM-789
lauravignoli Mar 18, 2020
6995b99
COM-671 Implement testing indicator 8d
tmvumbi2 Mar 17, 2020
8b4aeda
COM-671 Remove unused variables
lauravignoli Mar 18, 2020
e1b69cc
Merge pull request #267 from jembi/COM-671
lauravignoli Mar 18, 2020
fa0b3d8
COM-672 Implement treatment indicator 5a
tmvumbi2 Mar 18, 2020
5a99673
COM-795 Update function patientHIVFinalTestResultIsWithinReportingPeriod
lauravignoli Mar 18, 2020
c4d5a7d
COM-779 Update template: add treatment indicator 7
tmvumbi2 Mar 19, 2020
5ea31ce
Merge pull request #271 from jembi/COM-779
lauravignoli Mar 19, 2020
6cb12e1
COM-672 Fix function getPatientDateOfEnrollementInProgram
tmvumbi2 Mar 19, 2020
2260b45
Merge pull request #268 from jembi/COM-672
lauravignoli Mar 19, 2020
55acb9d
COM-795 Fix condition
lauravignoli Mar 23, 2020
bdf7eeb
COM-790 Implement treatment indicator 5b
tmvumbi2 Mar 18, 2020
0eff9b1
Merge pull request #269 from jembi/COM-790
lauravignoli Mar 23, 2020
26cd960
COM-674 Add treatment ind 7a
lauravignoli Mar 23, 2020
2dcac65
COM-782 Add TB Screened Result to Adult HIV Initial Form
tmvumbi2 Mar 24, 2020
8e8d6f8
Merge pull request #270 from jembi/COM-795
tmvumbi2 Mar 24, 2020
1245714
Merge pull request #272 from jembi/COM-674
tmvumbi2 Mar 24, 2020
38faadf
COM-783 Add treatment indicator 7b
tmvumbi2 Mar 25, 2020
ff2f03b
COM-800 Add import files
lauravignoli Mar 25, 2020
f7597d8
COM-802 Update indicators not implemented yet to return only 1 record
tmvumbi2 Mar 25, 2020
ae57c51
COM-800 Add encounter import file
lauravignoli Mar 25, 2020
7d79c26
Merge pull request #276 from jembi/COM-800
tmvumbi2 Mar 26, 2020
07cbafa
Merge pull request #277 from jembi/COM-802
tmvumbi2 Mar 26, 2020
00940ab
COM-803 Update report to use HIV Prog Enrol Date rather than ARV Star…
tmvumbi2 Mar 27, 2020
fedc219
COM-803 Fix unit test
tmvumbi2 Mar 30, 2020
616944c
Merge pull request #273 from jembi/COM-782
lauravignoli Mar 30, 2020
fd4fa70
Merge pull request #274 from jembi/COM-783
lauravignoli Mar 30, 2020
7e8f6dd
COM-803 Update ARV treatment functions to return 0 when enrollment da…
tmvumbi2 Mar 30, 2020
8637c21
Revert "Merge pull request #273 from jembi/COM-782"
lauravignoli Mar 31, 2020
469cdc6
Merge pull request #278 from jembi/COM-803
lauravignoli Mar 31, 2020
b634daa
COM-678 Add testing indicator 6a
tmvumbi2 Apr 1, 2020
3f97373
Merge pull request #281 from jembi/COM-806
tmvumbi2 Apr 1, 2020
2cec8a6
COM-797 Add config for important form fields
lauravignoli Apr 1, 2020
a85af44
Merge pull request #283 from jembi/COM-797
lauravignoli Apr 1, 2020
d230035
COM-678 Update implementation of testing indicator 6a
tmvumbi2 Apr 1, 2020
a1bcd3e
COM-805 Add prevention and support report template
lauravignoli Apr 1, 2020
5f4362f
COM-805 Update columns width in report
lauravignoli Apr 6, 2020
c46bf21
COM-809 Use Treatment Date in HIV Program for ART initiation date
tmvumbi2 Apr 6, 2020
7c1629d
COM-817 Add template for index report
tmvumbi2 Apr 6, 2020
9937cd3
Merge pull request #285 from jembi/COM-805
tmvumbi2 Apr 6, 2020
ac7e721
COM-809 Update return type for function
lauravignoli Apr 6, 2020
5f49aa9
COM-678 Update getTestResultWithinReportingPeriod to use the most rec…
tmvumbi2 Apr 6, 2020
c3f1b66
Merge pull request #287 from jembi/COM-809
lauravignoli Apr 6, 2020
63cc86f
COM-818 Extract treatment indicator 7 to its own report
tmvumbi2 Apr 7, 2020
4d1f004
COM-678 Fix lab-form query in getTestResultWithinReportingPeriod
tmvumbi2 Apr 7, 2020
914e64a
Merge pull request #282 from jembi/COM-678
lauravignoli Apr 7, 2020
07946b5
COM-801 Add testing indicator 6b
tmvumbi2 Apr 1, 2020
c3e2a88
Merge pull request #284 from jembi/COM-801
lauravignoli Apr 7, 2020
f762345
COM-807 Add testing indicator 6c
tmvumbi2 Apr 3, 2020
6f3dee7
COM-680 Add index indicator 1a
tmvumbi2 Apr 7, 2020
b4f3ee9
Merge pull request #288 from jembi/COM-817
lauravignoli Apr 8, 2020
13503a7
Merge pull request #289 from jembi/COM-818
lauravignoli Apr 8, 2020
e6bb3d2
COM-680 Add index indicator 1a
tmvumbi2 Apr 7, 2020
bf1ca49
Merge branch 'COM-680' of https://github.com/jembi/cameroon-bahmni-co…
tmvumbi2 Apr 9, 2020
5b6a446
COM-680 Use the report end age to calculate patient age
tmvumbi2 Apr 9, 2020
067a04b
COM-680 Use location of the obs "date offered"
tmvumbi2 Apr 9, 2020
0832ef9
COM-680 Update Index reports names in template and reports page
lauravignoli Apr 9, 2020
1b070c5
Merge pull request #290 from jembi/COM-680
lauravignoli Apr 9, 2020
c9447a2
COM-807 Fix testing indicator 6c
tmvumbi2 Apr 9, 2020
f0d47cb
COM-681 Add index indicator 1b
tmvumbi2 Apr 8, 2020
0efd3e9
Merge pull request #291 from jembi/COM-681
lauravignoli Apr 14, 2020
6b014ff
Merge pull request #286 from jembi/COM-807
lauravignoli Apr 14, 2020
8728c7b
COM-797 Add extra important fields to config
lauravignoli Apr 9, 2020
ebc3e8a
Merge pull request #293 from jembi/COM-797
lauravignoli Apr 14, 2020
2c84579
COM-797 Make TB screened an important form field
lauravignoli Apr 14, 2020
3fdd858
Merge pull request #294 from jembi/COM-797
lauravignoli Apr 14, 2020
25c49e6
COM-684 Add index indicator 1c
tmvumbi2 Apr 9, 2020
8a2f6e3
COM-684 Use the report end age to calculate patient age
tmvumbi2 Apr 9, 2020
312c632
Merge pull request #292 from jembi/COM-684
lauravignoli Apr 14, 2020
22f229b
COM-685 Add index indicator 1d
tmvumbi2 Apr 14, 2020
7dcc457
COM-807 Fix testing indicator 6c
tmvumbi2 Apr 15, 2020
b579930
Merge pull request #295 from jembi/COM-685
lauravignoli Apr 15, 2020
00ed759
COM-686 Add index indicator 1e
lauravignoli Apr 16, 2020
c459bae
Merge pull request #296 from jembi/COM-807
lauravignoli Apr 16, 2020
42a30a4
COM-824 Remove ARV Start Date from adult and child hiv initial form
tmvumbi2 Apr 20, 2020
774ef53
COM-821 Add config to make program fields important
lauravignoli Apr 20, 2020
ece8bf2
COM-824 Add query to retire the concept ARV Start Date
tmvumbi2 Apr 20, 2020
02d6837
COM-824 Retire concept using csv file instead of script
lauravignoli Apr 22, 2020
7e4f107
Merge pull request #299 from jembi/COM-824
tmvumbi2 Apr 22, 2020
3914f41
Merge pull request #298 from jembi/COM-821
lauravignoli Apr 22, 2020
748f71c
Merge pull request #297 from jembi/COM-686
tmvumbi2 Apr 22, 2020
9cbe4c6
COM-823 Add version
lauravignoli Apr 23, 2020
a69b5ba
Merge pull request #302 from jembi/COM-823_2
lauravignoli Apr 23, 2020
f4cfeed
COM-828 Add column to visit report
lauravignoli Apr 29, 2020
f4df87e
Merge pull request #304 from jembi/COM-828
tmvumbi2 Apr 30, 2020
64595d2
COM-823 Vagrant as service (#300)
lauravignoli May 5, 2020
3b77e22
Add files via upload
rmrlangford May 6, 2020
521ca58
Add files via upload
rmrlangford May 6, 2020
65afc74
Add files via upload
rmrlangford May 6, 2020
8caee7b
Add files via upload
rmrlangford May 6, 2020
eb5a67e
Add files via upload
rmrlangford May 6, 2020
d9bcf8a
Add files via upload
rmrlangford May 7, 2020
3121405
Add files via upload
rmrlangford May 7, 2020
14a4c3c
Update README.md
rmrlangford May 7, 2020
834bbb6
Update README.md
rmrlangford May 7, 2020
220da8e
Update README.md
rmrlangford May 7, 2020
5fd7f73
Update README.md
rmrlangford May 7, 2020
e6e8ad5
Update README.md
rmrlangford May 7, 2020
31b880f
Update README.md
rmrlangford May 7, 2020
50009c1
Update README.md
rmrlangford May 7, 2020
505d8db
Update README.md
rmrlangford May 7, 2020
aab9d62
Update README.md
rmrlangford May 7, 2020
2505faa
Update README.md
rmrlangford May 7, 2020
494a265
COM-830 Add a script to visit report to date fields into excel dates
lauravignoli May 7, 2020
1c77e66
Update README.md
rmrlangford May 7, 2020
68559d9
Update README.md
rmrlangford May 7, 2020
4db5588
Update README.md
rmrlangford May 7, 2020
d5f19e1
Merge pull request #306 from jembi/COM-830
lauravignoli May 7, 2020
d354f67
Update README.md
rmrlangford May 7, 2020
66c1393
Update README.md
rmrlangford May 7, 2020
930cb45
Update README.md
rmrlangford May 7, 2020
5cf74fd
Update README.md
rmrlangford May 7, 2020
70369e8
Update README.md
rmrlangford May 7, 2020
77d7144
Update README.md
rmrlangford May 7, 2020
9918bc4
COM-830 Apply date format on reports
lauravignoli May 7, 2020
e843b83
Update README.md
rmrlangford May 7, 2020
35f54b5
Update README.md
rmrlangford May 7, 2020
01c46ad
COM-830 Apply date format on ltfu report
lauravignoli May 7, 2020
7bfcf9a
Merge pull request #308 from jembi/COM-830
lauravignoli May 7, 2020
8a3bcc9
Merge pull request #309 from jembi/COM-823
lauravignoli May 7, 2020
8648296
Update version to v1.6.0-SNAPSHOT
lauravignoli May 12, 2020
e181cbd
Update README.md
rmrlangford May 12, 2020
41f8de9
Update README.md
rmrlangford May 12, 2020
fe4d4b2
COM-829 Remove drug duplicates from visit report
lauravignoli May 12, 2020
7d4af40
Merge pull request #310 from jembi/COM-829
tmvumbi2 May 13, 2020
99ce315
COM-834 Add HIV columns to visit report
lauravignoli May 13, 2020
13649f1
COM-838 Update Bahmni service (#313)
lauravignoli May 19, 2020
4efd86e
COM-840 Group functions in a more efficient way
lauravignoli May 20, 2020
c951dee
COM-840-2 Restore function arvInitiationDateSpecified
tmvumbi2 May 21, 2020
e3efd93
Merge pull request #314 from jembi/COM-840-2
tmvumbi2 May 21, 2020
defc35f
Merge branch 'dev' into COM-834
tmvumbi2 May 21, 2020
d5ea3f6
COM-834 Add new functions to retrieve the HIV test date and result
tmvumbi2 May 21, 2020
c4827c4
COM-840 Add radet report setup
lauravignoli May 15, 2020
37d35bc
COM-834 Update logic
lauravignoli May 22, 2020
ea6bcd7
Merge pull request #311 from jembi/COM-834
tmvumbi2 May 26, 2020
9712d36
Merge pull request #315 from jembi/COM-840
tmvumbi2 May 26, 2020
1f578b0
COM-841 Populate Radet report
lauravignoli May 19, 2020
80cd1a4
COM-841 Populate index testing tab
lauravignoli May 26, 2020
f924e65
COM-841 Populate more fields
lauravignoli May 28, 2020
6d5a219
COM-841 Added getObsCodedValueInSectionByNames function
lauravignoli May 29, 2020
e2cfe99
COM-841 Populate fields treatment report
tmvumbi2 May 29, 2020
b35cffe
COM-841 Add index calculation functions
lauravignoli May 29, 2020
eb3b3cf
Merge branch 'COM-841' of https://github.com/jembi/cameroon-bahmni-co…
tmvumbi2 May 29, 2020
a72e6e2
COM-841 Populate fields pmtct report
tmvumbi2 May 29, 2020
827c311
COM-841 Populate more fields
lauravignoli May 29, 2020
0111fe9
COM-841 Move calculateDurationInDays to drug_functions.sql
tmvumbi2 Jun 1, 2020
9a8a57c
COM-841 Extend retrieveViralLoadTestDateAndResult to return the VL In…
tmvumbi2 Jun 1, 2020
ea08dc6
COM-841 Add Current ART Regimen to treatment report
tmvumbi2 Jun 1, 2020
9e4f288
COM-841 Fix getObsCodedValueInSectionByNames: add LIMIT 1
tmvumbi2 Jun 1, 2020
29ba0e2
COM-841 Add column "status of missed appointment"
tmvumbi2 Jun 1, 2020
6e4f060
COM-841 Include only patients that started ARV treat. in the treat. r…
tmvumbi2 Jun 1, 2020
6b1e0af
COM-841 Include only pregnant patients in the pmtct report
tmvumbi2 Jun 1, 2020
79a0a3b
COM-841 Use risk group for KP status
lauravignoli Jun 2, 2020
f669609
COM-841 Add child's section of the pmtct report
tmvumbi2 Jun 3, 2020
228f286
COM-846 Add login location - encounter type mappings
lauravignoli Jun 3, 2020
3119e57
COM-841 Add more columns to child's section of the pmtct report
tmvumbi2 Jun 3, 2020
512a7d6
COM-841 Add VL indication to treatment tab
lauravignoli Jun 5, 2020
b81ad61
COM-841 Include only non-voided patients into the treatment report
tmvumbi2 Jun 5, 2020
88f5506
COM-841 Updates to testing and index testing tabs
lauravignoli Jun 5, 2020
156e660
Merge pull request #316 from jembi/COM-841
lauravignoli Jun 5, 2020
2636352
COM-841 Update getFirstIndexRelationship function
lauravignoli Jun 9, 2020
186d2c4
COM-841 Update index testing tab
lauravignoli Jun 9, 2020
052cbfd
COM-841 Update function getHIVDefaulterStatus
lauravignoli Jun 10, 2020
cffedda
Merge pull request #317 from jembi/COM-846
tmvumbi2 Jun 11, 2020
addae7f
COM-841 Add getPregnancyStatus function
lauravignoli Jun 11, 2020
67ac4d2
COM-841 Call getPregnancyStatus and bug fix
tmvumbi2 Jun 11, 2020
475af92
Merge pull request #319 from jembi/COM-841-2
tmvumbi2 Jun 11, 2020
806a360
COM-841 Remove 'patient_id' column from treatment report
tmvumbi2 Jun 12, 2020
5abb5b1
Merge pull request #320 from jembi/COM-841-2
tmvumbi2 Jun 12, 2020
6aad631
COM-848 Add "Differentiated ART delivery model" to radet
tmvumbi2 Jun 12, 2020
71a5812
COM-848 Update getDifferentiatedARTDeliveryModelAtLastRefill
tmvumbi2 Jun 15, 2020
302094a
COM-849 Move appointment functions to their own file
lauravignoli Jun 15, 2020
1b491ed
COM-849 Add getNextARTPickupDate function
lauravignoli Jun 15, 2020
411a69a
COM-848 Set the start date to 2001
tmvumbi2 Jun 17, 2020
5028381
Merge pull request #321 from jembi/COM-848
lauravignoli Jun 18, 2020
57d7e3c
Merge branch 'dev' into COM-849
tmvumbi2 Jun 19, 2020
fbbbb09
Merge pull request #324 from jembi/COM-849
tmvumbi2 Jun 19, 2020
85227e3
COM-841 Add getPatientGenderFullname
tmvumbi2 Jun 23, 2020
524f5ea
Merge pull request #326 from jembi/COM-841-3
tmvumbi2 Jun 23, 2020
1f9d6ce
COM-861 Prioritize program TARV value
tmvumbi2 Jun 24, 2020
a035aa2
Merge pull request #327 from jembi/COM-861
tmvumbi2 Jun 24, 2020
1e95aa3
COM-862 Update getLastArvPickupDate: drug must be dispensed
tmvumbi2 Jun 24, 2020
677448f
Merge pull request #328 from jembi/COM-862
tmvumbi2 Jun 24, 2020
0d4145d
COM-864 Update getLocationOfArvRefill to return "Facility" or "Commun…
tmvumbi2 Jun 24, 2020
1d5dcd0
Merge pull request #329 from jembi/COM-864
tmvumbi2 Jun 24, 2020
ab313fc
COM-875 Add getLabTestOrderDate function
lauravignoli Jun 25, 2020
24d5c38
COM-852 Add column "Date initiated TPT" to radet
tmvumbi2 Jun 18, 2020
36eacf2
Merge pull request #325 from jembi/COM-852
lauravignoli Jun 25, 2020
aae4771
COM-873 Implement column 'APS' for testing and index_testing
tmvumbi2 Jun 25, 2020
8ad09c6
Merge pull request #331 from jembi/COM-873
lauravignoli Jun 25, 2020
598e853
COM-875 Update getLabTestOrderDate to also check tha lab order name
tmvumbi2 Jun 25, 2020
aee3e66
Merge pull request #330 from jembi/COM-875
lauravignoli Jun 25, 2020
c51203c
COM-852 Display a comma separated list of date on "Date initiated TPT"
tmvumbi2 Jun 26, 2020
8ef7d49
Merge pull request #332 from jembi/COM-852
tmvumbi2 Jun 26, 2020
0870890
COM-876 Verify that drugs counted in "Days of ARV Refill" are dispensed
tmvumbi2 Jun 26, 2020
1288b8d
Merge pull request #333 from jembi/COM-876
tmvumbi2 Jun 26, 2020
2a5508b
COM-852 Include patient for which "Date initiated TPT" is not null
tmvumbi2 Jun 29, 2020
8a24d96
Merge pull request #334 from jembi/COM-852
tmvumbi2 Jun 29, 2020
9a85d32
COM-852 Update the EMR version to 1.5.1
tmvumbi2 Jun 29, 2020
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
  •  
  •  
  •  
Binary file added .deploy_key.enc
Binary file not shown.
26 changes: 26 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
language: java
jdk: openjdk8
before_install:
- openssl aes-256-cbc -K $encrypted_b6b540ec2d3b_key -iv $encrypted_b6b540ec2d3b_iv -in .deploy_key.enc -out /tmp/deploy_key -d
- eval "$(ssh-agent -s)"
- chmod 600 /tmp/deploy_key
- ssh-add /tmp/deploy_key
- cd report-testing-framework
- sh start_mysql_test_db.sh
addons:
ssh_known_hosts:
- cmr-dev.jembi.org
- cmr-staging.jembi.org
script:
- cd report-testing
- mvn test
- cd ../..
deploy:
- provider: script
script: bash scripts/travis/deploy.sh dev $mysql_password
on:
branch: dev
- provider: script
script: bash scripts/travis/deploy.sh staging $mysql_password
on:
branch: staging
61 changes: 61 additions & 0 deletions dhis2/Daily_monitor_report.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"orgUnit": "Q3ngM9lPHgI",
"reports": {
"RegistrationsByLocation": {
"dataValues": [
{
"dataElement": "z8HJhmfdvvy",
"categoryOptionCombo": "TEDGbPnFfQj",
"row": 1,
"column": 1
},
{
"dataElement": "z8HJhmfdvvy",
"categoryOptionCombo": "CrJCb2UtVSH",
"row": 1,
"column": 2
},
{
"dataElement": "z8HJhmfdvvy",
"categoryOptionCombo": "pTEtnavRw5N",
"row": 1,
"column": 3
},
{
"dataElement": "z8HJhmfdvvy",
"categoryOptionCombo": "kHXteIlarj2",
"row": 1,
"column": 4
}
]
},
"HIVEncountersByForm":{
"dataValues": [
{
"categoryOptionCombo": "f6zRmxNeUFk",
"dataElement": "FK9lN5aDr7D",
"row": 1,
"column": 1
},
{
"categoryOptionCombo": "uJDJc48H4Iy",
"dataElement": "FK9lN5aDr7D",
"row": 1,
"column": 2
},
{
"categoryOptionCombo": "U1LeGiVTeXA",
"dataElement": "FK9lN5aDr7D",
"row": 1,
"column": 3
},
{
"categoryOptionCombo": "ECetHVRRhqJ",
"dataElement": "FK9lN5aDr7D",
"row": 1,
"column": 4
}
]
}
}
}
109 changes: 109 additions & 0 deletions dhis2/HIV_lost_to_followup_patients.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
{
"orgUnit": "Q3ngM9lPHgI",
"reports": {
"Report": { "dataValues": [] },
"ReportHospitalRegion": { "dataValues": [] },
"ReportHospitalDistrict": { "dataValues": [] },
"ReportHospitalName": { "dataValues": [] },
"ReportSummary": {
"dataValues": [
{
"dataElement": "hSE7tyCs3E2",
"categoryOptionCombo": "Cg4g0Z3CNLU",
"row": 1,
"column": 1
},
{
"dataElement": "cuGNsvJ4gns",
"categoryOptionCombo": "Cg4g0Z3CNLU",
"row": 1,
"column": 2
},
{
"dataElement": "hSE7tyCs3E2",
"categoryOptionCombo": "Pwb9lgwKUBE",
"row": 1,
"column": 3
},
{
"dataElement": "cuGNsvJ4gns",
"categoryOptionCombo": "Pwb9lgwKUBE",
"row": 1,
"column": 4
},
{
"dataElement": "hSE7tyCs3E2",
"categoryOptionCombo": "L9FvgUvSo3X",
"row": 1,
"column": 5
},
{
"dataElement": "cuGNsvJ4gns",
"categoryOptionCombo": "L9FvgUvSo3X",
"row": 1,
"column": 6
},
{
"dataElement": "hSE7tyCs3E2",
"categoryOptionCombo": "iXoOsTeawXY",
"row": 1,
"column": 7
},
{
"dataElement": "cuGNsvJ4gns",
"categoryOptionCombo": "iXoOsTeawXY",
"row": 1,
"column": 8
},
{
"dataElement": "hSE7tyCs3E2",
"categoryOptionCombo": "AyTVRCThLZk",
"row": 1,
"column": 9
},
{
"dataElement": "cuGNsvJ4gns",
"categoryOptionCombo": "AyTVRCThLZk",
"row": 1,
"column": 10
},
{
"dataElement": "hSE7tyCs3E2",
"categoryOptionCombo": "Y7cde49jU5X",
"row": 1,
"column": 11
},
{
"dataElement": "cuGNsvJ4gns",
"categoryOptionCombo": "Y7cde49jU5X",
"row": 1,
"column": 12
},
{
"dataElement": "hSE7tyCs3E2",
"categoryOptionCombo": "Ya0cwFAE1s7",
"row": 1,
"column": 13
},
{
"dataElement": "cuGNsvJ4gns",
"categoryOptionCombo": "Ya0cwFAE1s7",
"row": 1,
"column": 14
},
{
"dataElement": "hSE7tyCs3E2",
"categoryOptionCombo": "Ek4Lhu9G8Dn",
"row": 1,
"column": 15
},
{
"dataElement": "cuGNsvJ4gns",
"categoryOptionCombo": "Ek4Lhu9G8Dn",
"row": 1,
"column": 16
}
]
}
}
}
34 changes: 34 additions & 0 deletions dhis2/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Dhis-integration configuration
Configuration to setup the dhis-integration app, that integrates bahmni reports with a dhis2 instance.

## Install dhis-integration

1- Install from rpm file:

```
sudo wget https://github.com/jembi/cameroon-openmrs-module-bahmniapps/releases/download/v1.2.1/dhis-integration-1.0-1.noarch.rpm
sudo yum install dhis-integration-1.0-1.noarch.rpm
```

2- Add ssl config:

```
cd /etc/httpd/conf.d/
sudo wget https://raw.githubusercontent.com/Possiblehealth/possible-config/89662e8e823fac3dbcaf111aa72713a63139bb03/playbooks/roles/possible-dhis-integration/templates/dhis_integration_ssl.conf
sudo service httpd restart
```

3- Update configuration file:

```
sudo vi /etc/dhis-integration/dhis-integration.yml (replace emr.com with server domain name, and any other info)
sudo service dhis-integration start
```

## Deploy

From the dhis2 folder in this repo run:

```
./deploy.sh
```
2 changes: 2 additions & 0 deletions dhis2/deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sudo cp dhis-integration-1.0-SNAPSHOT.jar /opt/dhis-integration/bin/dhis-integration.jar
sudo service dhis-integration restart
Binary file added dhis2/dhis-integration-1.0-SNAPSHOT.jar
Binary file not shown.
Binary file added html/images/hospitalLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added html/images/mohLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading