Merge branch '2.1.2-merge'

# Conflicts:
#	openmrs/apps/clinical/patientMonitoringConf.json
#	openmrs/apps/reports/macroTemplates/CultureConversion.xls
#	openmrs/apps/reports/reports.json
#	openmrs/apps/reports/sql/cultureConversion.sql
#	playbooks/examples/setup.yml
#	playbooks/roles/bahmni-endtb-batch/tasks/main.yml

Author: mogoodrich

openmrs/apps/clinical/app.json

@@ -22,7 +22,7 @@
   "config": {
     "networkConnectivity" : {
       "showNetworkStatusMessage": true,
-      "networkStatusCheckInterval": 5000,
+      "networkStatusCheckInterval": 8000,
         "locales" : [
           { "locale" : "fr", "css" : "offline-language-french"},
           { "locale" : "es", "css": "offline-language-spanish"},
@@ -710,6 +710,60 @@
       "RETURN VISIT DATE": {
         "allowFutureDates": true
       },
+      "Lab, Erythrocyte sedimentation rate":{
+        "isTabular": true
+      },
+      "Lab, lymphocytes" : {
+        "isTabular": true
+      },
+      "Lab, Mean Red Blood Cell volume": {
+        "isTabular": true
+      },
+      "Lab, Activated partial thromboplastin time": {
+        "isTabular": true
+      },
+      "Lab, Prothombon time" : {
+        "isTabular": true
+      },
+      "Lab, INR" : {
+        "isTabular": true
+      },
+      "Lab, Uric Acid" : {
+        "isTabular": true
+      },
+      "Lab, Creatinine clearance" : {
+        "isTabular": true
+      },
+      "Lab, GGT" : {
+        "isTabular": true
+      },
+      "Erythrocyte sedimentation rate":{
+        "disableAddNotes": true
+      },
+      "lymphocytes" : {
+        "disableAddNotes": true
+      },
+      "Mean Red Blood Cell volume": {
+        "disableAddNotes": true
+      },
+      "Activated partial thromboplastin time": {
+        "disableAddNotes": true
+      },
+      "Prothombon time" : {
+        "disableAddNotes": true
+      },
+      "INR" : {
+        "disableAddNotes": true
+      },
+      "Uric Acid" : {
+        "disableAddNotes": true
+      },
+      "Creatinine clearance" : {
+        "disableAddNotes": true
+      },
+      "GGT" : {
+        "disableAddNotes": true
+      },
       "Lab, Hematocrit": {
         "isTabular": true
       },
@@ -797,6 +851,9 @@
       "SERUM POTASSIUM": {
         "disableAddNotes": true
       },
+      "Erythrocyte sedimentation rate": {
+        "disableAddNotes": true
+      },
       "Lab, Magnesium test result": {
         "disableAddNotes": true
       },
@@ -932,8 +989,35 @@
       "Documents, Date": {
         "required": true
       },
-      "Documents, Image": {
+      "Pregnancy Report Form Template" : {
+        "allowAddMore": true
+      },
+      "Hospital Admission Notification Template" : {
+        "allowAddMore": true
+      },
+      "Hospital Discharge Summary Template" : {
+        "allowAddMore": true
+      },
+      "HTO, The last day the patient received hepatitis C treatment" : {
+        "required": true
+      },
+      "DAS, Date alcohol abuse or PHQ-9 screening performed" : {
         "required": true
+      },
+      "Hep C Treatment Outcome Template" : {
+        "allowAddMore": true
+      },
+      "Hep C Treatment Initiation Template" : {
+        "allowAddMore": true
+      },
+      "Depression Alcohol Score Template" : {
+        "allowAddMore": true
+      },
+      "HTI, Reason to start DAA at this time (chose all those that apply)" : {
+        "multiSelect": true
+      },
+      "HTI, Reason that DAA was not given during the study period" : {
+        "multiSelect": true
       }
     }
   }

openmrs/apps/clinical/dashboard.json

@@ -167,9 +167,24 @@
           "6 month Post Treatment Outcome Template"
         ],
         "translationKey": "DASHBOARD_TITLE_OUTCOME_FORMS"
+      },
+      "HeptitiesCforms": {
+        "type": "forms",
+        "displayOrder": 12,
+        "dashboardConfig": {
+          "title": null,
+          "maximumNoOfVisits": 12
+        },
+        "formGroup": [
+          "Hep C Treatment Outcome Template",
+          "Hep C Treatment Initiation Template",
+          "Depression Alcohol Score Template"
+        ],
+        "translationKey": "DASHBOARD_TITLE_HEP_FORMS"
       }
     },
     "translationKey": "DASHBOARD_TAB_GENERAL_KEY"
+
   },
   "summary": {
     "displayByDefault": true,
@@ -199,6 +214,19 @@
         "displayOrder": 1,
         "translationKey": "SUMMARY_TITLE_TREATMENT_INFORMATION"
       },
+      "HepctreatmentInfo": {
+        "isObservation": true,
+        "displayType": "Full-Page",
+        "dashboardConfig": {
+          "showGroupDateTime": false,
+          "persistOrderOfConcepts": true,
+          "conceptNames": [
+            "HTI, DAA treatment start date:"
+          ]
+        },
+        "displayOrder": 2,
+        "translationKey": "SUMMARY_TITLE_HEPC_TREATMENT_INFORMATION"
+      },
       "casedefinition": {
         "isObservation": true,
         "displayType": "Full-Page",
@@ -774,6 +802,7 @@
         "dashboardConfig": {
           "groupByConcept": "Baseline, Date of baseline physical examination",
           "templateName": "Baseline, Clinical Examination",
+          "obsDelimiter": "\n",
           "conceptNames": [
             "Visual acuity, left eye",
             "Visual acuity, right eye"

openmrs/apps/clinical/formConditions.js

@@ -1065,6 +1065,63 @@ Bahmni.ConceptSet.FormConditions.rules = {      //This is a constant that Bahmni
         }
         else
             return false;
+    },
+    'HTO, DAA treatment outcome': function (formName, formFieldValues) {
+        var conditions = {enable: [], disable: []};
+        var outcome = formFieldValues['HTO, DAA treatment outcome'];
+        var Transferedout = "HTO, If Not evaluated, did the patient transfer out?";
+        var enDOD = "HTO, If death, date of death";
+
+        if (outcome == "HTO, Death") {
+            conditions.enable.push(enDOD);
+        } else {
+            conditions.disable.push(enDOD, Transferedout);
+        }
+        if (outcome == "HTO, Not Evaluated") {
+            conditions.enable.push(Transferedout);
+        } else {
+            conditions.disable.push(Transferedout, enDOD);
+        }
+        return conditions;
+    },
+    'HTO, If Not evaluated, did the patient transfer out?': function (formName, formFieldValues) {
+        var conditions = {enable: [], disable: []};
+        var transfered = formFieldValues['HTO, If Not evaluated, did the patient transfer out?'];
+        var where = "HTO, If transferred out, patient transferred out to where?";
+        var why = "HTO, If did not transfer out, why does the patient have this outcome?";
+
+        if (transfered == "True") {
+            conditions.enable.push(where);
+        } else {
+            conditions.disable.push(where, why);
+        }
+        if (transfered == "False") {
+            conditions.enable.push(why);
+        } else {
+            conditions.disable.push(why, where);
+        }
+        return conditions;
+    },
+
+    'HTI, Reason that DAA was not given during the study period': function (formName, formFieldValues) {
+        var conditions = {enable: [], disable: []};
+        var conditionConcept = formFieldValues['HTI, Reason that DAA was not given during the study period'];
+        if (conditionConcept == "Other") {
+            conditions.enable.push("HTI, Other reason not to start DAA during study period")
+        } else {
+            conditions.disable.push("HTI, Other reason not to start DAA during study period")
+        }
+        return conditions;
+    },
+    'HTI, Reason to start DAA at this time (chose all those that apply)': function (formName, formFieldValues) {
+        var conditions = {enable: [], disable: []};
+        var conditionConcept = formFieldValues['HTI, Reason to start DAA at this time (chose all those that apply)'];
+        if (conditionConcept == "Other") {
+            conditions.enable.push("HTI, Other reasons to start DAA")
+        } else {
+            conditions.disable.push("HTI, Other reasons to start DAA")
+        }
+        return conditions;
     }
 
 };