test build

Author: sookwalinga

api/resources/translations/messages-en.properties

@@ -1248,7 +1248,8 @@ targets.last_month.subtitle = Last month
 task.date = Due date
 task.days.left = {DAYS, plural, one{1 day left} other{\# days left}}
 task.list.complete = No more tasks
-task.overdue = Due today
+task.overdue = Overdue
+task.duetoday = Due today
 task.overdue.days = {DAYS, plural, =0{Due today} =1{Due yesterday} other{Due \# days ago}}
 task.priority = Priority
 task.state = Message state

config/default/app_settings.json

@@ -182,7 +182,7 @@ Date of Death: <output value=" /death_report/death_details/date_of_death "/>&lt;
       <bind nodeset="/death_report/patient_name" type="string" calculate="../inputs/contact/name"/>
       <bind nodeset="/death_report/patient_short_name" type="string" calculate="../inputs/contact/short_name"/>
       <bind nodeset="/death_report/patient_display_name" type="string" calculate="if(../patient_short_name = '', ../patient_name, concat(../patient_name, ' (', ../patient_short_name, ')'))"/>
-      <bind nodeset="/death_report/death_details/date_of_death" type="date" required="true()" jr:constraintMsg="jr:itext('/death_report/death_details/date_of_death:jr:constraintMsg')" constraint="(. &lt;= now()) and floor(decimal-date-time(today()) - decimal-date-time(.)) &lt;= 365"/>
+      <bind nodeset="/death_report/death_details/date_of_death" type="date" constraint="(. &lt;= now()) and floor(decimal-date-time(today()) - decimal-date-time(.)) &lt;= 365" required="true()" jr:constraintMsg="jr:itext('/death_report/death_details/date_of_death:jr:constraintMsg')"/>
       <bind nodeset="/death_report/death_details/place_of_death" type="select1" required="true()"/>
       <bind nodeset="/death_report/death_details/place_of_death_other" type="string" required="true()" relevant="selected(../place_of_death, 'other')"/>
       <bind nodeset="/death_report/death_details/death_information" type="string"/>

config/default/forms/app/death_report.xml

@@ -1377,10 +1377,10 @@ selected(../vaginal_bleeding, 'yes') or
 selected(../vaginal_discharge, 'yes') or
 selected(../convulsion, 'yes'), 'yes', 'no')"/>
       <bind nodeset="/delivery/death_info_woman" relevant="selected(../condition/woman_outcome, 'deceased')"/>
-      <bind nodeset="/delivery/death_info_woman/woman_death_date" type="date" constraint=". &lt;= now() and difference-in-months( ., today() ) &lt; 1" jr:constraintMsg="jr:itext('/delivery/death_info_woman/woman_death_date:jr:constraintMsg')" required="true()"/>
+      <bind nodeset="/delivery/death_info_woman/woman_death_date" type="date" required="true()" constraint=". &lt;= now() and difference-in-months( ., today() ) &lt; 1" jr:constraintMsg="jr:itext('/delivery/death_info_woman/woman_death_date:jr:constraintMsg')"/>
       <bind nodeset="/delivery/death_info_woman/woman_death_place" type="select1" required="true()"/>
       <bind nodeset="/delivery/death_info_woman/woman_death_birth" type="select1" required="true()"/>
-      <bind nodeset="/delivery/death_info_woman/woman_death_add_notes" type="string" constraint="string-length(.) &lt;= 300" jr:constraintMsg="jr:itext('/delivery/death_info_woman/woman_death_add_notes:jr:constraintMsg')" required="false()"/>
+      <bind nodeset="/delivery/death_info_woman/woman_death_add_notes" type="string" required="false()" constraint="string-length(.) &lt;= 300" jr:constraintMsg="jr:itext('/delivery/death_info_woman/woman_death_add_notes:jr:constraintMsg')"/>
       <bind nodeset="/delivery/death_info_woman/death_profile_note" readonly="true()" type="string" relevant="../woman_death_date != '' and ../woman_death_place != ''"/>
       <bind nodeset="/delivery/death_info_woman/death_baby_note" readonly="true()" type="string" relevant="../woman_death_date != '' and ../woman_death_place != '' and ../woman_death_birth = 'yes'"/>
       <bind nodeset="/delivery/death_info_woman/death_report/form" type="string" calculate="&quot;death_report&quot;"/>
@@ -1397,24 +1397,24 @@ selected(../convulsion, 'yes'), 'yes', 'no')"/>
       <bind nodeset="/delivery/death_info_woman/woman_death_report_doc" type="string" calculate=" /delivery/death_info_woman/death_report "/>
       <bind nodeset="/delivery/delivery_outcome" relevant="not(selected(../condition/woman_outcome, 'deceased')) or selected(../death_info_woman/woman_death_birth, 'yes')"/>
       <bind nodeset="/delivery/delivery_outcome/babies_delivered" type="select1" required="true()"/>
-      <bind nodeset="/delivery/delivery_outcome/babies_delivered_other" type="int" constraint=". &gt; 3" jr:constraintMsg="jr:itext('/delivery/delivery_outcome/babies_delivered_other:jr:constraintMsg')" relevant="selected(../babies_delivered, 'other')" required="true()"/>
+      <bind nodeset="/delivery/delivery_outcome/babies_delivered_other" type="int" required="true()" relevant="selected(../babies_delivered, 'other')" constraint=". &gt; 3" jr:constraintMsg="jr:itext('/delivery/delivery_outcome/babies_delivered_other:jr:constraintMsg')"/>
       <bind nodeset="/delivery/delivery_outcome/babies_alive" type="select1" required="true()"/>
-      <bind nodeset="/delivery/delivery_outcome/babies_alive_other" type="int" constraint=". &lt;= ../babies_delivered_other" jr:constraintMsg="jr:itext('/delivery/delivery_outcome/babies_alive_other:jr:constraintMsg')" relevant="selected(../babies_alive, 'other')" required="true()"/>
+      <bind nodeset="/delivery/delivery_outcome/babies_alive_other" type="int" required="true()" relevant="selected(../babies_alive, 'other')" constraint=". &lt;= ../babies_delivered_other" jr:constraintMsg="jr:itext('/delivery/delivery_outcome/babies_alive_other:jr:constraintMsg')"/>
       <bind nodeset="/delivery/delivery_outcome/babies_delivered_num" type="string" calculate="if(selected(../babies_delivered, '1'), 1, if(selected(../babies_delivered, '2'), 2, if(selected(../babies_delivered, '3'), 3, if(selected(../babies_delivered, 'other'), ../babies_delivered_other, 0))))"/>
       <bind nodeset="/delivery/delivery_outcome/babies_alive_num" type="string" calculate="if(selected(../babies_alive, '1'), 1, if(selected(../babies_alive, '2'), 2, if(selected(../babies_alive, '3'), 3, if(selected(../babies_alive, 'other'), ../babies_alive_other, 0))))"/>
       <bind nodeset="/delivery/delivery_outcome/babies_deceased_num" type="string" calculate="../babies_delivered_num - ../babies_alive_num"/>
-      <bind nodeset="/delivery/delivery_outcome/delivery_date" type="date" constraint=". &lt;= now() and difference-in-months( ., today() ) &lt; 1" jr:constraintMsg="jr:itext('/delivery/delivery_outcome/delivery_date:jr:constraintMsg')" required="true()"/>
+      <bind nodeset="/delivery/delivery_outcome/delivery_date" type="date" required="true()" constraint=". &lt;= now() and difference-in-months( ., today() ) &lt; 1" jr:constraintMsg="jr:itext('/delivery/delivery_outcome/delivery_date:jr:constraintMsg')"/>
       <bind nodeset="/delivery/delivery_outcome/delivery_place" type="select1" required="true()"/>
-      <bind nodeset="/delivery/delivery_outcome/delivery_place_other" type="string" constraint="string-length(.) &lt;= 100" jr:constraintMsg="jr:itext('/delivery/delivery_outcome/delivery_place_other:jr:constraintMsg')" relevant="../delivery_place = 'other'" required="true()"/>
-      <bind nodeset="/delivery/delivery_outcome/delivery_mode" type="select1" relevant="../delivery_place = 'health_facility'" required="true()"/>
-      <bind nodeset="/delivery/delivery_outcome/delivery_conductor" type="select1" relevant="../delivery_place = 'home' or ../delivery_place = 'other'" required="true()"/>
-      <bind nodeset="/delivery/delivery_outcome/delivery_conductor_other" type="string" constraint="string-length(.) &lt;= 100" jr:constraintMsg="jr:itext('/delivery/delivery_outcome/delivery_conductor_other:jr:constraintMsg')" relevant="../delivery_conductor = 'other'" required="true()"/>
+      <bind nodeset="/delivery/delivery_outcome/delivery_place_other" type="string" required="true()" relevant="../delivery_place = 'other'" constraint="string-length(.) &lt;= 100" jr:constraintMsg="jr:itext('/delivery/delivery_outcome/delivery_place_other:jr:constraintMsg')"/>
+      <bind nodeset="/delivery/delivery_outcome/delivery_mode" type="select1" required="true()" relevant="../delivery_place = 'health_facility'"/>
+      <bind nodeset="/delivery/delivery_outcome/delivery_conductor" type="select1" required="true()" relevant="../delivery_place = 'home' or ../delivery_place = 'other'"/>
+      <bind nodeset="/delivery/delivery_outcome/delivery_conductor_other" type="string" required="true()" relevant="../delivery_conductor = 'other'" constraint="string-length(.) &lt;= 100" jr:constraintMsg="jr:itext('/delivery/delivery_outcome/delivery_conductor_other:jr:constraintMsg')"/>
       <bind nodeset="/delivery/baby_death" relevant="../delivery_outcome/babies_deceased_num &gt; 0"/>
       <bind nodeset="/delivery/baby_death/baby_death_repeat_count" type="string" readonly="true()" calculate=" /delivery/delivery_outcome/babies_deceased_num "/>
-      <bind nodeset="/delivery/baby_death/baby_death_repeat/baby_death_date" type="date" constraint=". &lt;= now() and difference-in-months( ., today() ) &lt; 1" jr:constraintMsg="jr:itext('/delivery/baby_death/baby_death_repeat/baby_death_date:jr:constraintMsg')" required="true()"/>
+      <bind nodeset="/delivery/baby_death/baby_death_repeat/baby_death_date" type="date" required="true()" constraint=". &lt;= now() and difference-in-months( ., today() ) &lt; 1" jr:constraintMsg="jr:itext('/delivery/baby_death/baby_death_repeat/baby_death_date:jr:constraintMsg')"/>
       <bind nodeset="/delivery/baby_death/baby_death_repeat/baby_death_place" type="select1" required="true()"/>
       <bind nodeset="/delivery/baby_death/baby_death_repeat/stillbirth" type="select1" required="true()"/>
-      <bind nodeset="/delivery/baby_death/baby_death_repeat/baby_death_add_notes" type="string" constraint="string-length(.) &lt;= 300" jr:constraintMsg="jr:itext('/delivery/baby_death/baby_death_repeat/baby_death_add_notes:jr:constraintMsg')" required="false()"/>
+      <bind nodeset="/delivery/baby_death/baby_death_repeat/baby_death_add_notes" type="string" required="false()" constraint="string-length(.) &lt;= 300" jr:constraintMsg="jr:itext('/delivery/baby_death/baby_death_repeat/baby_death_add_notes:jr:constraintMsg')"/>
       <bind nodeset="/delivery/baby_death/baby_death_repeat/baby_death_profile/type" type="string" calculate="&quot;person&quot;"/>
       <bind nodeset="/delivery/baby_death/baby_death_repeat/baby_death_profile/name" type="string" calculate="&quot;Deceased baby&quot;"/>
       <bind nodeset="/delivery/baby_death/baby_death_repeat/baby_death_profile/sex" type="string" calculate="&quot;undefined&quot;"/>
@@ -1433,9 +1433,9 @@ selected(../convulsion, 'yes'), 'yes', 'no')"/>
       <bind nodeset="/delivery/babys_condition/baby_repeat/baby_details/baby_name" type="string" required="true()"/>
       <bind nodeset="/delivery/babys_condition/baby_repeat/baby_details/baby_sex" type="select1" required="true()"/>
       <bind nodeset="/delivery/babys_condition/baby_repeat/baby_details/birth_weight_know" type="select1" required="true()"/>
-      <bind nodeset="/delivery/babys_condition/baby_repeat/baby_details/birth_weight" type="decimal" constraint=". &gt;= 1500 and . &lt;= 5000" jr:constraintMsg="jr:itext('/delivery/babys_condition/baby_repeat/baby_details/birth_weight:jr:constraintMsg')" relevant="selected(../birth_weight_know, 'yes')" required="true()"/>
+      <bind nodeset="/delivery/babys_condition/baby_repeat/baby_details/birth_weight" type="decimal" required="true()" relevant="selected(../birth_weight_know, 'yes')" constraint=". &gt;= 1500 and . &lt;= 5000" jr:constraintMsg="jr:itext('/delivery/babys_condition/baby_repeat/baby_details/birth_weight:jr:constraintMsg')"/>
       <bind nodeset="/delivery/babys_condition/baby_repeat/baby_details/birth_length_know" type="select1" required="true()"/>
-      <bind nodeset="/delivery/babys_condition/baby_repeat/baby_details/birth_length" type="decimal" constraint=". &gt;= 35.6 and . &lt;= 70" jr:constraintMsg="jr:itext('/delivery/babys_condition/baby_repeat/baby_details/birth_length:jr:constraintMsg')" relevant="selected(../birth_length_know, 'yes')" required="true()"/>
+      <bind nodeset="/delivery/babys_condition/baby_repeat/baby_details/birth_length" type="decimal" required="true()" relevant="selected(../birth_length_know, 'yes')" constraint=". &gt;= 35.6 and . &lt;= 70" jr:constraintMsg="jr:itext('/delivery/babys_condition/baby_repeat/baby_details/birth_length:jr:constraintMsg')"/>
       <bind nodeset="/delivery/babys_condition/baby_repeat/baby_details/vaccines_received" type="select1" required="true()"/>
       <bind nodeset="/delivery/babys_condition/baby_repeat/baby_details/imm_counsel_note" readonly="true()" type="string" relevant="selected(../vaccines_received, 'none')"/>
       <bind nodeset="/delivery/babys_condition/baby_repeat/baby_details/breastfeeding" type="select1" required="true()"/>
@@ -1494,8 +1494,8 @@ selected(../blue_skin, 'yes'), 'yes', 'no')"/>
 selected(../condition/woman_outcome, 'alive_unwell') or
 ../delivery_outcome/babies_alive_num &gt; 0"/>
       <bind nodeset="/delivery/pnc_visits/who_note" readonly="true()" type="string"/>
-      <bind nodeset="/delivery/pnc_visits/pnc_visits_attended" type="select" constraint="not(selected(.,'none')) or count-selected(.) &lt; 2" required="true()"/>
-      <bind nodeset="/delivery/pnc_visits/pnc_visits_additional" type="int" constraint=". &gt;=0 and . &lt;= 6" jr:constraintMsg="jr:itext('/delivery/pnc_visits/pnc_visits_additional:jr:constraintMsg')" required="false()"/>
+      <bind nodeset="/delivery/pnc_visits/pnc_visits_attended" type="select" required="true()" constraint="not(selected(.,'none')) or count-selected(.) &lt; 2"/>
+      <bind nodeset="/delivery/pnc_visits/pnc_visits_additional" type="int" required="false()" constraint=". &gt;=0 and . &lt;= 6" jr:constraintMsg="jr:itext('/delivery/pnc_visits/pnc_visits_additional:jr:constraintMsg')"/>
       <bind nodeset="/delivery/pnc_visits/days" type="string" calculate="floor(decimal-date-time(today()) - decimal-date-time( /delivery/delivery_outcome/delivery_date ))"/>
       <bind nodeset="/delivery/summary/r_submit_note" readonly="true()" type="string"/>
       <bind nodeset="/delivery/summary/r_summary_details" readonly="true()" type="string"/>

config/default/forms/app/delivery.xml

@@ -263,15 +263,15 @@
       <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/visit_confirm" type="select1" required="true()"/>
       <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/danger_sign_present" type="select1" required="true()"/>
       <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/danger_signs_question_note" readonly="true()" type="string" relevant="../danger_sign_present = 'yes' or ../danger_sign_present = 'no'"/>
-      <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/infected_umbilical_cord" type="select1" required="true()" relevant="../danger_sign_present = 'yes' or ../danger_sign_present = 'no'"/>
-      <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/convulsion" type="select1" required="true()" relevant="../danger_sign_present = 'yes' or ../danger_sign_present = 'no'"/>
-      <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/difficulty_feeding" type="select1" required="true()" relevant="../danger_sign_present = 'yes' or ../danger_sign_present = 'no'"/>
-      <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/vomit" type="select1" required="true()" relevant="../danger_sign_present = 'yes' or ../danger_sign_present = 'no'"/>
-      <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/drowsy" type="select1" required="true()" relevant="../danger_sign_present = 'yes' or ../danger_sign_present = 'no'"/>
-      <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/stiff" type="select1" required="true()" relevant="../danger_sign_present = 'yes' or ../danger_sign_present = 'no'"/>
-      <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/yellow_skin" type="select1" required="true()" relevant="../danger_sign_present = 'yes' or ../danger_sign_present = 'no'"/>
-      <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/fever" type="select1" required="true()" relevant="../danger_sign_present = 'yes' or ../danger_sign_present = 'no'"/>
-      <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/blue_skin" type="select1" required="true()" relevant="../danger_sign_present = 'yes' or ../danger_sign_present = 'no'"/>
+      <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/infected_umbilical_cord" type="select1" relevant="../danger_sign_present = 'yes' or ../danger_sign_present = 'no'" required="true()"/>
+      <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/convulsion" type="select1" relevant="../danger_sign_present = 'yes' or ../danger_sign_present = 'no'" required="true()"/>
+      <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/difficulty_feeding" type="select1" relevant="../danger_sign_present = 'yes' or ../danger_sign_present = 'no'" required="true()"/>
+      <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/vomit" type="select1" relevant="../danger_sign_present = 'yes' or ../danger_sign_present = 'no'" required="true()"/>
+      <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/drowsy" type="select1" relevant="../danger_sign_present = 'yes' or ../danger_sign_present = 'no'" required="true()"/>
+      <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/stiff" type="select1" relevant="../danger_sign_present = 'yes' or ../danger_sign_present = 'no'" required="true()"/>
+      <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/yellow_skin" type="select1" relevant="../danger_sign_present = 'yes' or ../danger_sign_present = 'no'" required="true()"/>
+      <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/fever" type="select1" relevant="../danger_sign_present = 'yes' or ../danger_sign_present = 'no'" required="true()"/>
+      <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/blue_skin" type="select1" relevant="../danger_sign_present = 'yes' or ../danger_sign_present = 'no'" required="true()"/>
       <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/r_danger_sign_present" type="string" calculate="if(selected(../infected_umbilical_cord, 'yes') or
 selected(../convulsion, 'yes') or
 selected(../difficulty_feeding, 'yes') or