From 11c88a71a00df8f0c0e4e77fc3c80f8e29dd20f5 Mon Sep 17 00:00:00 2001 From: werick Date: Thu, 5 Sep 2013 13:07:22 +0300 Subject: [PATCH 1/5] testing add on module with test adherence form --- .gitignore | 0 README.md | 0 api/pom.xml | 0 .../keaddonexample/ExampleActivator.java | 0 .../keaddonexample/ExampleConstants.java | 5 + api/src/main/resources/messages.properties | 0 .../resources/metadata/Example_Metadata-1.zip | Bin .../main/resources/metadata/testForms2-1.zip | Bin 0 -> 1352 bytes .../resources/moduleApplicationContext.xml | 47 +++++-- omod/pom.xml | 0 .../page/controller/HomePageController.java | 25 +++- omod/src/main/resources/config.xml | 0 .../resources/webModuleApplicationContext.xml | 0 omod/src/main/webapp/pages/home.gsp | 0 .../webapp/resources/htmlforms/adherence.xml | 133 ++++++++++++++++++ .../webapp/resources/htmlforms/example.xml | 0 .../webapp/resources/images/forms/example.png | Bin pom.xml | 10 +- 18 files changed, 206 insertions(+), 14 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 README.md mode change 100644 => 100755 api/pom.xml mode change 100644 => 100755 api/src/main/java/org/openmrs/module/keaddonexample/ExampleActivator.java mode change 100644 => 100755 api/src/main/java/org/openmrs/module/keaddonexample/ExampleConstants.java mode change 100644 => 100755 api/src/main/resources/messages.properties mode change 100644 => 100755 api/src/main/resources/metadata/Example_Metadata-1.zip create mode 100755 api/src/main/resources/metadata/testForms2-1.zip mode change 100644 => 100755 api/src/main/resources/moduleApplicationContext.xml mode change 100644 => 100755 omod/pom.xml mode change 100644 => 100755 omod/src/main/java/org/openmrs/module/keaddonexample/page/controller/HomePageController.java mode change 100644 => 100755 omod/src/main/resources/config.xml mode change 100644 => 100755 omod/src/main/resources/webModuleApplicationContext.xml mode change 100644 => 100755 omod/src/main/webapp/pages/home.gsp create mode 100755 omod/src/main/webapp/resources/htmlforms/adherence.xml mode change 100644 => 100755 omod/src/main/webapp/resources/htmlforms/example.xml mode change 100644 => 100755 omod/src/main/webapp/resources/images/forms/example.png mode change 100644 => 100755 pom.xml diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/api/pom.xml b/api/pom.xml old mode 100644 new mode 100755 diff --git a/api/src/main/java/org/openmrs/module/keaddonexample/ExampleActivator.java b/api/src/main/java/org/openmrs/module/keaddonexample/ExampleActivator.java old mode 100644 new mode 100755 diff --git a/api/src/main/java/org/openmrs/module/keaddonexample/ExampleConstants.java b/api/src/main/java/org/openmrs/module/keaddonexample/ExampleConstants.java old mode 100644 new mode 100755 index 8def3db..63124ff --- a/api/src/main/java/org/openmrs/module/keaddonexample/ExampleConstants.java +++ b/api/src/main/java/org/openmrs/module/keaddonexample/ExampleConstants.java @@ -22,4 +22,9 @@ public class ExampleConstants { public static final String APP_EXAMPLE = "keaddonexample.example"; public static final String EXAMPLE_ADDON_FORM_UUID = "b694b1bc-2086-47dd-a4ad-ba48f9471e4b"; + + public static final String ADHERENCE_FORM_UUID = "07197743-026a-4c7c-af60-42c166bf4acd"; + + //Encounter Type uuid + public static final String ADHERENCE_TYPE_UUID = "b586c79d-ab57-102d-be97-85aedb3d9f67"; } \ No newline at end of file diff --git a/api/src/main/resources/messages.properties b/api/src/main/resources/messages.properties old mode 100644 new mode 100755 diff --git a/api/src/main/resources/metadata/Example_Metadata-1.zip b/api/src/main/resources/metadata/Example_Metadata-1.zip old mode 100644 new mode 100755 diff --git a/api/src/main/resources/metadata/testForms2-1.zip b/api/src/main/resources/metadata/testForms2-1.zip new file mode 100755 index 0000000000000000000000000000000000000000..a14b6358b4e0348b0ef12b0de72058e6a966db2a GIT binary patch literal 1352 zcmWIWW@Zs#-~dAFvfEA!NPr8-&PYv6NiEW=$j#Xr=9~XmL16Fq@Q8iQ2ag@=iwVCK zs{M6W*7rWcvVgy;3OCd0|MtyYGCS<`md-6fA_ps;8QQc}J}F-x`#N{(#;O zSH|&8eK$M$|Ie3YYAL7pnB=B+e3U~&buss#lv)*GGyLw%5jJ{Qi*nan7;ygoOe#Cv2UO<5cS+2`{rrWgM#;Z_Pf~?r~X|i zm3v;e=;uMr#jdOCyH|!j4&R`4aqiBV8Txt?+1syK`ELncz`jZJ+PzD15S&#A|sS*%zZ2?EUyn>L#{mYdm&8#j#xSInNY(AC{y^-YTzJ z6vVt{sidB5S#vLN+9dq~GtU3vE4=*Y$!>Iia8q!-)2I0>oBk}fn$yl!CBG+E&R+M- z8U6=XMP=s29z81`;LXm#nyFiHnTdg61t$YT0M4wy1I!A!sU?Xii6x1k%rJM-$-HI* zfwuRRT;02qlf{^oTtdCB#8s`h#cojHG2uqaf~@=d%v#hkXFF^Ed@%E8`p4&;+uxVA z-gEexdOJs_+EZmN{##Pq*b;le?*F^(OfM&8>&L!Z?nuwOVtVZ&uXT*CDTu zr!jo}bn&1{l9-fx@yR_0&R1$|JYmz9drIY;!V`-REGN!POnmrxwXC=$hbXFC|>Q#1X(|1`Khby#&OxdjlYGRjUi;1DY75F-EfC6Y7*jm>Z7AicAs`oHedNS zVOM^rt?vsx4bAP&=VIA|pK-r=W^;Ve2hFm`yx(Lq|aNo`Tv$_o%c@7&^ada>X^^^Cm&-zzWMRgdqPuE z-O8K3MHkEBom79nH2f#CtZX1zCLk;V(g#>TJOByPMV$Zu literal 0 HcmV?d00001 diff --git a/api/src/main/resources/moduleApplicationContext.xml b/api/src/main/resources/moduleApplicationContext.xml old mode 100644 new mode 100755 index d5628f2..ff960c6 --- a/api/src/main/resources/moduleApplicationContext.xml +++ b/api/src/main/resources/moduleApplicationContext.xml @@ -3,11 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> + + + @@ -29,30 +32,52 @@ + - + + + + + + + + + + + + + + + + - + - - - - - - - - + + diff --git a/omod/pom.xml b/omod/pom.xml old mode 100644 new mode 100755 diff --git a/omod/src/main/java/org/openmrs/module/keaddonexample/page/controller/HomePageController.java b/omod/src/main/java/org/openmrs/module/keaddonexample/page/controller/HomePageController.java old mode 100644 new mode 100755 index 93fd80a..65b3834 --- a/omod/src/main/java/org/openmrs/module/keaddonexample/page/controller/HomePageController.java +++ b/omod/src/main/java/org/openmrs/module/keaddonexample/page/controller/HomePageController.java @@ -19,11 +19,13 @@ import org.openmrs.module.keaddonexample.ExampleConstants; import org.openmrs.module.kenyacore.metadata.MetadataUtils; import org.openmrs.module.kenyaui.annotation.AppPage; +import org.openmrs.ui.framework.SimpleObject; import org.openmrs.ui.framework.UiUtils; import org.openmrs.ui.framework.page.PageModel; import org.springframework.web.bind.annotation.RequestParam; -import java.util.Collections; +import java.util.ArrayList; +import java.util.List; /** * Home page controller @@ -38,7 +40,26 @@ public void controller(@RequestParam(required=false, value="patientId") Patient model.addAttribute("patient", patient); Form exampleForm = MetadataUtils.getForm(ExampleConstants.EXAMPLE_ADDON_FORM_UUID); + Form adherenceForm = MetadataUtils.getForm(ExampleConstants.ADHERENCE_FORM_UUID); + + //model.addAttribute("forms", Collections.singletonList(ui.simplifyObject(exampleForm))); + + + + List forms = new ArrayList(); + forms.add(ui.simplifyObject(exampleForm)); + forms.add(ui.simplifyObject(adherenceForm)); + + //List oneTimeForms = new ArrayList(); + + //List oneTimeFormDescriptors = emr.getFormManager().getFormsForPatient(thisApp, patient); + + //for (FormDescriptor formDescriptor : oneTimeFormDescriptors) { + // Form form = formDescriptor.getTarget(); + // oneTimeForms.add(ui.simplifyObject(form)); + // } + //model.addAttribute("oneTimeForms", oneTimeForms); + model.addAttribute("forms", forms); - model.addAttribute("forms", Collections.singletonList(ui.simplifyObject(exampleForm))); } } \ No newline at end of file diff --git a/omod/src/main/resources/config.xml b/omod/src/main/resources/config.xml old mode 100644 new mode 100755 diff --git a/omod/src/main/resources/webModuleApplicationContext.xml b/omod/src/main/resources/webModuleApplicationContext.xml old mode 100644 new mode 100755 diff --git a/omod/src/main/webapp/pages/home.gsp b/omod/src/main/webapp/pages/home.gsp old mode 100644 new mode 100755 diff --git a/omod/src/main/webapp/resources/htmlforms/adherence.xml b/omod/src/main/webapp/resources/htmlforms/adherence.xml new file mode 100755 index 0000000..6f12fe3 --- /dev/null +++ b/omod/src/main/webapp/resources/htmlforms/adherence.xml @@ -0,0 +1,133 @@ + + +
+ Adherence Form +
+ + + + + + + + + +
Date:
Site:
+
+ + + + + + + + + + + + + + + +
Phone number:Alternate Phone Number: {TBD-CIEL}
What work do you do now to meet daily needs? (purpose: to determine if currently earning income or not)
[TBD-CIEL]-Current Work(Specify)[TBD-CIEL]-Not Working Now
+
+ Medications + + + + + + + + +
Arv Regimen:Anti TB Medication:
Other Medications
+ +
+
+ Adherence Buddy + + + + + + + + + + + + + +
Do you currently have adherence buddy
Buddy's Fullname: Buddy's Relationship:
Buddy's Phone Number: or:
+ +
+
+ Adherence Dates + + + + + + + + + + + + + +
Adherence Counselling Dates (dd/mm/yyy)Time Preferred for Taking Pills
+ 1st Session:
+ 2nd Session:
+ 3rd Session:
+ Booster Session:
+ 		AM:---- PM----
+ Reminders of Time
+ +
Buddy's Phone Number:or:
+ +
+
+ Disclosure + + + + + +
Have you disclosed your HIV Status to any of the following?
+
+
+ Observation Infor + + + + + + + + + +
Weight:
Height:
+
+
+ + + + + +
Form Filled by:
+
+ +
+ \ No newline at end of file diff --git a/omod/src/main/webapp/resources/htmlforms/example.xml b/omod/src/main/webapp/resources/htmlforms/example.xml old mode 100644 new mode 100755 diff --git a/omod/src/main/webapp/resources/images/forms/example.png b/omod/src/main/webapp/resources/images/forms/example.png old mode 100644 new mode 100755 diff --git a/pom.xml b/pom.xml old mode 100644 new mode 100755 index e0e1839..9dc7a19 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,8 @@ 1.9.3 13.3-SNAPSHOT 1.5 - 2.6 + 0.8.2 + 3.0 1.5 UTF-8 @@ -53,6 +54,13 @@ provided + + org.openmrs.module + kenyacore-api + ${kenyacoreVersion} + provided + + org.openmrs.module uiframework-api From 639bfb5c34676b3633c82b24342f3e2d1061093d Mon Sep 17 00:00:00 2001 From: werick Date: Mon, 9 Sep 2013 16:20:48 +0300 Subject: [PATCH 2/5] testing add on module with test adherence form --- .../resources/htmlforms/moh257enroll.xml | 470 ++++++++++++++++++ 1 file changed, 470 insertions(+) create mode 100644 omod/src/main/webapp/resources/htmlforms/moh257enroll.xml diff --git a/omod/src/main/webapp/resources/htmlforms/moh257enroll.xml b/omod/src/main/webapp/resources/htmlforms/moh257enroll.xml new file mode 100644 index 0000000..97d1aea --- /dev/null +++ b/omod/src/main/webapp/resources/htmlforms/moh257enroll.xml @@ -0,0 +1,470 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + COMPREHENSIVE CARE CLINIC PATIENT CARD (INITIAL VISIT) - MOH 257 +
+
+ + + + + + +
Enrollment date: Enrolled by:
+
+ Facility Name (Site) + Patient Clinic Number: +
PATIENT PROFILE
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Unique Patient Number:
Patient's Names:
Date of Birth + Age: +
Sex
+ + + + + + + + + + + + +
Marital Status
+
Treatment Supporter
Name: Relationship:
Postal Address: Tel No:
+
Patient Source
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Entry Point
VMMC [TBD- Waiting CIEL concept]
+ +
Transfer In: + + + + + + + + + + + + + + +
Date:From: District
Facility:Date started ART
+ +
+
ART History
+ Previously on ARVs (PMTCT & PEP included)? +
+ + + + + + + + + + + + + + + +
If "Yes" then PurposeList Drug Names & Dates Last Used
+ + + + + + + + + + + + + + + + + +

Date Confirmed HIV Positive

Where?
Date Enrolled in HIV CareWHO Stage + + + + + + + + + + +
Any Drug Allegies?[TBD CIEL to provide concept]
+
HIV Status of Family Members -> Use family information table form
+
+ +
+
+ + \ No newline at end of file From ac1bf3301ed3c17f01a907cac6de286b89b20102 Mon Sep 17 00:00:00 2001 From: werick Date: Mon, 9 Sep 2013 17:17:57 +0300 Subject: [PATCH 3/5] testing add on module with test enrollment form --- .../resources/htmlforms/moh257ArvTherapy.xml | 743 ++++++++++++++++++ 1 file changed, 743 insertions(+) create mode 100644 omod/src/main/webapp/resources/htmlforms/moh257ArvTherapy.xml diff --git a/omod/src/main/webapp/resources/htmlforms/moh257ArvTherapy.xml b/omod/src/main/webapp/resources/htmlforms/moh257ArvTherapy.xml new file mode 100644 index 0000000..596b53b --- /dev/null +++ b/omod/src/main/webapp/resources/htmlforms/moh257ArvTherapy.xml @@ -0,0 +1,743 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Facility Name (Site) + Provider (Site) + Patient Clinic Number: +
+ ARV THERAPY +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Date Medically Eligible
Eligible Thru.? + + + + + + +
Date Started on 1st Line:
COHORT: Regimen:

At Start of ART:
+ Weight(kgs): + Height(cms): + + WHO Stage +

Substitution of ARVs within 1st Line Regimen
DatesRegimenReason(s)
+ +

Switch to 2nd Line Regimen
DatesRegimenReason(s)
+ +

Substitution of ARVs within 2nd Line Regimen
DatesRegimenReason(s)
+ +
+
Transfer Out and Death
+ + + + + + + + + + + + + + + + +
DatesEventWhere?
Patient Transferred Out
Patient DiedCause of Death
+
ART Treatment Interruptions
+ + + + + + + + + + + +
DatesReason for InterruptionReason For StopDate Restarted
+
+
+ +
+
+ + \ No newline at end of file From 811af6cefc22dee09a672543a3d396041d8a1c4a Mon Sep 17 00:00:00 2001 From: werick Date: Mon, 9 Sep 2013 17:32:16 +0300 Subject: [PATCH 4/5] testing add on module with test moh257 ARV therapy form --- .../resources/htmlforms/moh257ArvTherapy.xml | 580 +----------------- 1 file changed, 19 insertions(+), 561 deletions(-) diff --git a/omod/src/main/webapp/resources/htmlforms/moh257ArvTherapy.xml b/omod/src/main/webapp/resources/htmlforms/moh257ArvTherapy.xml index 596b53b..b2c3359 100644 --- a/omod/src/main/webapp/resources/htmlforms/moh257ArvTherapy.xml +++ b/omod/src/main/webapp/resources/htmlforms/moh257ArvTherapy.xml @@ -25,481 +25,27 @@ text-align: left; } - + + + @@ -540,7 +86,7 @@ - + @@ -563,42 +109,7 @@ - - - - - - - - - - - @@ -627,39 +138,7 @@ - - - - - - - -
- Facility Name (Site) - Provider (Site) +
+ + + + + + +
Enrollment date: Enrolled by: Enrolled at:
+
+
+ Facility Name + Provider Patient Clinic Number:
Date Started on 1st Line:
Date Started on 1st Line:
 COHORT: Regimen:
Regimen Reason(s)
- -

Switch to 2nd Line Regimen
Regimen Reason(s)
- -
@@ -676,12 +155,12 @@ Where? - + Patient Transferred Out - + - + Patient Died Cause of Death @@ -701,27 +180,6 @@ Date Restarted - From 92edbc22af3b1a41f8c239560d9dac229414027e Mon Sep 17 00:00:00 2001 From: werick Date: Wed, 11 Sep 2013 19:31:25 +0300 Subject: [PATCH 5/5] Update moh257 face page and arv therapy page --- .../resources/htmlforms/moh257enroll.xhtml | 470 ++++++++++++++++++ .../resources/htmlforms/moh257enroll.xml | 470 ------------------ 2 files changed, 470 insertions(+), 470 deletions(-) create mode 100755 omod/src/main/webapp/resources/htmlforms/moh257enroll.xhtml delete mode 100644 omod/src/main/webapp/resources/htmlforms/moh257enroll.xml diff --git a/omod/src/main/webapp/resources/htmlforms/moh257enroll.xhtml b/omod/src/main/webapp/resources/htmlforms/moh257enroll.xhtml new file mode 100755 index 0000000..7b91f06 --- /dev/null +++ b/omod/src/main/webapp/resources/htmlforms/moh257enroll.xhtml @@ -0,0 +1,470 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + COMPREHENSIVE CARE CLINIC PATIENT CARD (INITIAL VISIT) - MOH 257 +
+
+ + + + + + +
Enrollment date: Enrolled by:
+
+ Facility Name (Site) + Patient Clinic Number: +
PATIENT PROFILE
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Unique Patient Number:
Patient's Names:
Date of Birth + Age: +
Sex
+ + + + + + + + + + + + +
Marital Status
+
Treatment Supporter
Name: Relationship:
Postal Address: Tel No:
+
Patient Source
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Entry Point
VMMC [TBD- Waiting CIEL concept]
+ +
Transfer In: + + + + + + + + + + + + + + +
Date:From: District
Facility:Date started ART
+ +
+
ART History
+ Previously on ARVs (PMTCT & PEP included)? +
+ + + + + + + + + + + + + + + +
If "Yes" then PurposeList Drug Names & Dates Last Used
+ + + + + + + + + + + + + + + + + +

Date Confirmed HIV Positive

Where?
Date Enrolled in HIV CareWHO Stage + + + + + + + + + + +
Any Drug Allegies?[TBD CIEL to provide concept]
+
HIV Status of Family Members -> Use family information table form
+
+ +
+
+ + \ No newline at end of file diff --git a/omod/src/main/webapp/resources/htmlforms/moh257enroll.xml b/omod/src/main/webapp/resources/htmlforms/moh257enroll.xml deleted file mode 100644 index 97d1aea..0000000 --- a/omod/src/main/webapp/resources/htmlforms/moh257enroll.xml +++ /dev/null @@ -1,470 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - COMPREHENSIVE CARE CLINIC PATIENT CARD (INITIAL VISIT) - MOH 257 -
-
- - - - - - -
Enrollment date: Enrolled by:
-
- Facility Name (Site) - Patient Clinic Number: -
PATIENT PROFILE
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Unique Patient Number:
Patient's Names:
Date of Birth - Age: -
Sex
- - - - - - - - - - - - -
Marital Status
-
Treatment Supporter
Name: Relationship:
Postal Address: Tel No:
-
Patient Source
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Entry Point
VMMC [TBD- Waiting CIEL concept]
- -
Transfer In: - - - - - - - - - - - - - - -
Date:From: District
Facility:Date started ART
- -
-
ART History
- Previously on ARVs (PMTCT & PEP included)? -
- - - - - - - - - - - - - - - -
If "Yes" then PurposeList Drug Names & Dates Last Used
- - - - - - - - - - - - - - - - - -

Date Confirmed HIV Positive

Where?
Date Enrolled in HIV CareWHO Stage - - - - - - - - - - -
Any Drug Allegies?[TBD CIEL to provide concept]
-
HIV Status of Family Members -> Use family information table form
-
- -
-
- - \ No newline at end of file