Bahmni · simaomazive · Oct 15, 2018 · Oct 15, 2018 · Jan 28, 2019 · Jan 31, 2019
diff --git a/.gitignore b/.gitignore
diff --git a/.tx/config b/.tx/config
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/offline/openmrs/apps/clinical/.extension.json.swp b/offline/openmrs/apps/clinical/.extension.json.swp
diff --git a/openelis/images/labLogo.jpg b/openelis/images/labLogo.jpg
diff --git a/openelis/migrations/liquibase.xml b/openelis/migrations/liquibase.xml
diff --git a/openmrs/apps/JsBarcode.all.min.js b/openmrs/apps/JsBarcode.all.min.js
diff --git a/openmrs/apps/admin/app.json b/openmrs/apps/admin/app.json
diff --git a/openmrs/apps/admin/extension.json b/openmrs/apps/admin/extension.json
diff --git a/openmrs/apps/adt/app.json b/openmrs/apps/adt/app.json
diff --git a/openmrs/apps/adt/extension.json b/openmrs/apps/adt/extension.json
diff --git a/openmrs/apps/appointments/app.json b/openmrs/apps/appointments/app.json
@@ -9,7 +9,7 @@
   ],
   "config": {
     "minCharLengthToTriggerPatientSearch": 3,
-    "enableSpecialities": true,
+    "enableSpecialities": false,
     "startOfWeek": 2,
     "weekStart": "isoWeek",
     "calendarSlotDuration": "00:30",
@@ -42,6 +42,12 @@
       "#FF1493",
       "#00BFFF"
     ],
+    "appointmentBlocks":[
+      {"name":"APP_BLOCK_1","startTime":"12:00 am","endTime":"08:59 am"},
+      {"name":"APP_BLOCK_2","startTime":"09:00 am","endTime":"11:59 am"},
+      {"name":"APP_BLOCK_3","startTime":"12:00 pm","endTime":"03:29 pm"},
+      {"name":"APP_BLOCK_4","startTime":"03:30 pm","endTime":"11:59 pm"}
+    ],
     "allowedActions": ["CheckedIn", "Completed", "Missed", "Cancelled"],
     "allowedActionsByStatus": {
       "Scheduled": ["CheckedIn", "Missed", "Cancelled"],

diff --git a/openmrs/apps/appointments/extension.json b/openmrs/apps/appointments/extension.json
diff --git a/openmrs/apps/appointments/printListView.html b/openmrs/apps/appointments/printListView.html
diff --git a/openmrs/apps/clinical/app.json b/openmrs/apps/clinical/app.json
@@ -1,10 +1,6 @@
 {
     "id": "bahmni.clinical",
     "extensionPoints": [
-        {
-            "id": "org.bahmni.clinical.consultation.board",
-            "description": "Bahmni Clinical Consultation Page"
-        },
         {
             "id": "org.bahmni.clinical.conceptSetGroup.*",
             "description": "Define conceptsets part of a conceptset group"
@@ -44,11 +40,8 @@
                 "ID_Number": {
                     "required" : true
                 },
-                "Co-morbidites": {
-                    "excludeFrom": ["HIV Program"]
-                },
-                "Doctor": {
-                    "excludeFrom": ["TB Program"]
+                "Stage": {
+                    "excludeFrom": ["ART","TB Program","PTV program"]
                 }
             },
             "patientContext": {
@@ -113,6 +106,10 @@
             "Set1": {
                 "allowAddMore": true
             },
+            "Home equipment": {
+                "dropdown": true,
+                "disableAddNotes": true
+            },
             "Set2": {
                 "allowAddMore": true
             },