Skip to content

Commit

Permalink
DSDM Model management and display on patient dashboard (#365)
Browse files Browse the repository at this point in the history
  • Loading branch information
@slubwama @ssmusoke
slubwama authored and ssmusoke committed Feb 25, 2019
1 parent 2eb0d53 commit 241551d
Show file tree
Hide file tree
Showing 17 changed files with 973 additions and 27 deletions.
4 changes: 4 additions & 0 deletions api/src/main/java/org/openmrs/module/aijar/AijarConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ public class AijarConstants {
public static final String GP_NHPI_DEFAULT_ALERT_MESSAGE="The National Health Provider Identifier is not set please go to admin then Settings then Aijar and set it";
public static final String GP_DHIS2_DEFAULT_ALERT_MESSAGE="The organization code in DHIS2 is not set please go to admin then Settings then Ugandaemr and set it";

public static final String GP_DSDM_PROGRAM_UUID_NAME="ugandaemr.dsdm.programsuuid";

public static final String GP_DSDM_CONCEPT_ID="ugandaemr.dsdm.conceptId";


/**x
* Concepts
Expand Down
20 changes: 10 additions & 10 deletions api/src/main/java/org/openmrs/module/aijar/metadata/core/Programs.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,12 @@ public String conceptUuid() {

@Override
public String name() {
return "Facility Based Individual Management";
return "FBIM";
}

@Override
public String description() {
return "This is a DSDM model for patients that need extra management at the health centre";
return "Facility Based Individual Management a DSDM model for patients that need extra management at the health centre";
}

@Override
Expand All @@ -147,12 +147,12 @@ public String conceptUuid() {

@Override
public String name() {
return "Fast Track Drug Refill";
return "FTR";
}

@Override
public String description() {
return "DSDM Model for patients who only pick drugs at the health centre";
return "Fast Track Drug Refill is a DSDM Model for patients who only pick drugs at the health centre";
}

@Override
Expand All @@ -170,12 +170,12 @@ public String conceptUuid() {

@Override
public String name() {
return "Facility Based Groups";
return "FGB";
}

@Override
public String description() {
return "DSDM for stable or unstable clients who need peer support";
return "Facility Based Groups a DSDM for stable or unstable clients who need peer support";
}

@Override
Expand All @@ -193,12 +193,12 @@ public String conceptUuid() {

@Override
public String name() {
return "Community Client Led ART Delivery";
return "CCLAD";
}

@Override
public String description() {
return "DSDM Model with client lead groups with rotation drug pickup by client them selves and distribution";
return "Community Client Led ART Delivery is a DSDM Model with client lead groups with rotation drug pickup by client them selves and distribution";
}

@Override
Expand All @@ -216,12 +216,12 @@ public String conceptUuid() {

@Override
public String name() {
return "Community Drug Distribution Point";
return "CDDP";
}

@Override
public String description() {
return "DSDM Model in community where patients pick drugs from a distribution point in community set by their health centre";
return " Community Drug Distribution Point DSDM Model in community where patients pick drugs from a distribution point in community set by their health centre";
}

@Override
Expand Down
3 changes: 3 additions & 0 deletions api/src/main/resources/messages.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ aijar.registrationapp.deceased.confirmdeath.question=Check if this person is dec
aijar.registrationapp.nationalid=National ID
aijar.registrationapp.nationalid.confirm=Confirm National ID
aijar.registrationapp.nationalid.question=National ID
aijar.dsdm.program.addPatientProgram=Enroll In DSDM
aijar.dsdm.select.program=Select DSDM Model
aijar.dsdm.select.location=Select Location

ugandaemr.encounter.creator=Entered By
ugandaemr.encounter.datecreated=Entered On
Expand Down
18 changes: 16 additions & 2 deletions api/src/main/resources/metadata/Custom_Concepts.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,12 +323,12 @@
<concept concept_id="164981" retired="0" datatype_id="4" class_id="11" is_set="0" creator="1" date_created="2017-10-03 06:59:42" version="NULL" changed_by="1" date_changed="2017-10-03 06:59:42" uuid="164981AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
<concept concept_id="164985" retired="0" datatype_id="3" class_id="5" is_set="0" creator="1" date_created="2017-10-13 15:50:22" version="NULL" changed_by="1" date_changed="2017-10-13 15:50:22" uuid="164985AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
<concept concept_id="1628" retired="0" datatype_id="2" class_id="4" is_set="0" creator="1" date_created="2009-01-08 14:49:30" version="NULL" uuid="1628AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>

<concept concept_id="116023" retired="0" datatype_id="4" class_id="4" is_set="0" creator="1" date_created="2007-11-03 00:00:00" version="NULL" changed_by="1" date_changed="2016-03-07 16:12:50" uuid="116023AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
<concept concept_id="164989" retired="0" datatype_id="2" class_id="5" is_set="0" creator="1" date_created="2017-11-23 12:46:38" version="1.0" changed_by="1" date_changed="2017-11-23 12:46:38" uuid="164989AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
<concept concept_id="164988" retired="0" datatype_id="2" class_id="5" is_set="0" creator="1" date_created="2017-11-23 12:45:43" version="1.0" changed_by="1" date_changed="2017-11-23 12:45:43" uuid="164988AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
<concept concept_id="164987" retired="0" datatype_id="2" class_id="5" is_set="0" creator="1" date_created="2017-11-23 12:44:15" version="1.0" changed_by="1" date_changed="2017-11-23 12:44:15" uuid="164987AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
<concept concept_id="164986" retired="0" datatype_id="3" class_id="5" is_set="0" creator="1" date_created="2017-11-23 12:42:49" version="1.0" changed_by="1" date_changed="2017-11-23 12:44:05" uuid="164986AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
<concept concept_id="165144" retired="0" datatype_id="2" class_id="5" is_set="0" creator="1" date_created="2018-11-23 17:46:41" version="1.0" changed_by="1" date_changed="2018-11-23 17:46:41" uuid="cc183c11-0f94-4992-807c-84f33095ce37"/>


<!--KP-->
Expand Down Expand Up @@ -581,7 +581,7 @@
<concept concept_id="160541" retired="false" datatype_id="4" class_id="11" is_set="false" creator="1" date_created="2012-06-14 16:17:34.0" uuid="160541AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
<concept concept_id="160552" retired="false" datatype_id="4" class_id="11" is_set="false" creator="1" date_created="2012-06-14 18:30:42.0" uuid="160552AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
<concept concept_id="160631" retired="false" datatype_id="4" class_id="18" is_set="false" creator="1" date_created="2012-06-23 14:33:42.0" uuid="160631AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
<concept concept_id="165143" retired="false" datatype_id="4" class_id="18" is_set="true" creator="1" date_created="2018-09-28 12:18:23" uuid="73312fee-c321-11e8-a355-529269fb1459"/>
<concept concept_id="165143" retired="false" datatype_id="2" class_id="18" is_set="true" creator="1" date_created="2018-09-28 12:18:23" uuid="73312fee-c321-11e8-a355-529269fb1459"/>
<concept concept_id="165142" retired="false" datatype_id="4" class_id="18" is_set="false" creator="1" date_created="2018-09-28 12:10:10" uuid="73313728-c321-11e8-a355-529269fb1459"/>
<concept concept_id="165141" retired="false" datatype_id="4" class_id="18" is_set="false" creator="1" date_created="2018-09-28 12:07:25" uuid="733139e4-c321-11e8-a355-529269fb1459"/>
<concept concept_id="165140" retired="false" datatype_id="4" class_id="18" is_set="false" creator="1" date_created="2018-09-28 12:01:04" uuid="73313c96-c321-11e8-a355-529269fb1459"/>
Expand Down Expand Up @@ -1309,6 +1309,7 @@
<concept_name concept_name_id="159993" concept_id="164988" name="Restarted IAC" locale="en" locale_preferred="1" creator="1" date_created="2017-11-23 12:45:43" concept_name_type="FULLY_SPECIFIED" voided="0" uuid="159993BBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"/>
<concept_name concept_name_id="159992" concept_id="164987" name="Serum Crag Screening" locale="en" locale_preferred="1" creator="1" date_created="2017-11-23 12:44:15" concept_name_type="FULLY_SPECIFIED" voided="0" uuid="159992BBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"/>
<concept_name concept_name_id="159991" concept_id="164986" name="Serum Crag Screening Result" locale="en" locale_preferred="1" creator="1" date_created="2017-11-23 12:44:05" concept_name_type="FULLY_SPECIFIED" voided="0" uuid="159991BBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"/>
<concept_name concept_name_id="160179" concept_id="165144" name="Stable In DSDM" locale="en" locale_preferred="1" creator="1" date_created="2018-11-23 17:46:41" concept_name_type="FULLY_SPECIFIED" voided="0" uuid="6f6e2d05-abcb-4e5d-9e3c-172a64747e5d"/>

<!--KP-->
<concept_name concept_id="1533" name="RESPONDENT GENDER" locale="en" creator="1" date_created="2008-02-16 13:53:50" concept_name_id="1792" voided="0" voided_by="1" uuid="1792BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" concept_name_type="FULLY_SPECIFIED" locale_preferred="1"/>
Expand Down Expand Up @@ -3555,6 +3556,10 @@
<concept_answer concept_answer_id="6858" concept_id="164988" answer_concept="1066" creator="1" date_created="2017-11-23 12:45:43" sort_weight="2" uuid="6858CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"/>
<concept_answer concept_answer_id="6855" concept_id="164987" answer_concept="1066" creator="1" date_created="2017-11-23 12:44:15" sort_weight="2" uuid="6855CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"/>
<concept_answer concept_answer_id="6856" concept_id="164987" answer_concept="1065" creator="1" date_created="2017-11-23 12:44:15" sort_weight="1" uuid="6856CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"/>
<concept_answer concept_answer_id="7092" concept_id="165144" answer_concept="90003" creator="1" date_created="2018-11-23 17:46:41" sort_weight="1" uuid="1d72d660-7781-4b0e-81a7-09ad988a9840"/>
<concept_answer concept_answer_id="7091" concept_id="165144" answer_concept="90004" creator="1" date_created="2018-11-23 17:46:41" sort_weight="2" uuid="1cc402f9-e757-4892-81bb-e81537426023"/>



<!--KP-->
<concept_answer concept_answer_id="3907" concept_id="160666" answer_concept="1066" creator="1" date_created="2012-06-25 22:43:01" uuid="3907CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC" sort_weight="3907"/>
Expand Down Expand Up @@ -4006,6 +4011,15 @@
<concept_answer concept_answer_id="7025" concept_id="165113" answer_concept="165103" creator="1" date_created="2017-12-04 16:38:04" sort_weight="3" uuid="2e035fda-661f-4a47-a9eb-8a4dd1282484"/>
<concept_answer concept_answer_id="7026" concept_id="165113" answer_concept="5622" creator="1" date_created="2017-12-04 16:38:04" sort_weight="4" uuid="658418df-0b58-4c36-8be4-b9e848b8b7dd"/>

<!--Program-->
<concept_answer concept_answer_id="7089" concept_id="165143" answer_concept="165141" creator="1" date_created="2018-10-15 13:02:40" sort_weight="4" uuid="0a2ac1f3-69ca-4b7d-99ba-0f55a512fa29"/>
<concept_answer concept_answer_id="7088" concept_id="165143" answer_concept="165139" creator="1" date_created="2018-10-15 13:02:40" sort_weight="3" uuid="84b93497-934c-44c8-b3c2-86b188b0751d"/>
<concept_answer concept_answer_id="7087" concept_id="165143" answer_concept="165140" creator="1" date_created="2018-10-15 13:02:40" sort_weight="2" uuid="7e9c8a31-3aee-4cd1-b3b8-32d18df2292a"/>
<concept_answer concept_answer_id="7090" concept_id="165143" answer_concept="165142" creator="1" date_created="2018-10-15 13:02:40" sort_weight="5" uuid="cf6cea6f-c3e7-49f6-a447-15613f36504e"/>
<concept_answer concept_answer_id="7086" concept_id="165143" answer_concept="165138" creator="1" date_created="2018-10-15 13:02:40" sort_weight="1" uuid="2faf6c05-3a99-41ef-be84-9fca5412b36c"/>



<!--CONCEPT SET-->
<!--MCH-->
<concept_set concept_set_id="167" concept_id="1410" concept_set="1421" sort_weight="2.0" creator="1" date_created="2006-12-08 18:48:21.0" uuid="167AEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"/>
Expand Down
Loading

0 comments on commit 241551d

Please sign in to comment.