Merge remote-tracking branch 'origin/master'

PIH · May 6, 2021 · 76a53b2 · 76a53b2
2 parents a2f19d7 + 40bd62e
commit 76a53b2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/configuration/pih/htmlforms/mentalHealth.xml b/configuration/pih/htmlforms/mentalHealth.xml
@@ -186,7 +186,7 @@
         <script type="text/javascript">
             var $j = jQuery;
 
-            jq(function() {
+            <!--jq(function() {
 
                 // return appointment date can never be before encounter date
                 var setMinReturnVisitDate = function () {
@@ -198,7 +198,7 @@
                     if (returnVisitDate  &amp;&amp; returnVisitDate != getValue('return-visit-date.value')) {
                         setValue('return-visit-date.value','');  // reset return visit date if change to encounter date makes it invalid
                         alert('<uimessage code="pihcore.mentalhealth.returnVisitDateResetWarning"/>');
-                    }
+                    }-->
                 }
 
                 getField('encounterDate.value').change(setMinReturnVisitDate);

diff --git a/configuration/pih/htmlforms/section-anc-intake.xml b/configuration/pih/htmlforms/section-anc-intake.xml
@@ -248,6 +248,14 @@
                     <obs conceptId="CIEL:160077" required="true"/>
                 </p>
 
+                <p>
+                    <!-- for the mother, next of kin -->
+                    <label>
+                        <uimessage code="pihcore.mch.nextofkin"/>
+                    </label>
+                    <obs conceptId="CIEL:162729"/>
+                </p>
+
                 <br/><br/>
                 <br/><br/><br/><br/>
 

diff --git a/configuration/pih/htmlforms/vitals.xml b/configuration/pih/htmlforms/vitals.xml
@@ -802,7 +802,7 @@
         <!-- !! make sure this fieldset template stays aligned with field order below or data with be inaccurate !! -->
          <fieldset display-template="{{#if field.[0]}}{{ message 'pihcore.tbscreen.cough' }}: {{field.[0]}}, {{/if}}{{#if field.[1]}}{{ message 'pihcore.tbscreen.nightsweat' }}: {{field.[1]}}, {{/if}}{{#if field.[2]}}{{ message 'pihcore.tbscreen.weightloss' }}: {{field.[3]}} {{/if}}" class="required">
              <legend><uimessage code="pihcore.tbscreen.title"/></legend>
-             <h3><uimessage code="pihcore.tbscreen.title"/><p>If any questions answered Yes request AFB test</p></h3>
+             <h3><uimessage code="pihcore.tbscreen.title"/><p>If at least two questions answers yes</p></h3>
             <table>
                 <repeat with="['Cough > 2 weeks','11567'], ['Fever','5945'], ['Night Sweat','6029'],['Weight Loss','6477']">
                    <tr>