Stream2/master

.github/workflows/build_and_upload_package.yml

@@ -0,0 +1,21 @@
+name: Default config - Github action to package default_config as zip
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ stream2/master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Package
+        run:
+          /bin/bash ./scripts/package.sh
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: default_config
+          path: target/default_config.zip

.gitignore

@@ -7,4 +7,3 @@
 */.idea/*
 .tmp
 target
-

openmrs/apps/clinical/app.json

@@ -81,6 +81,27 @@
         "maxConceptSetLevels": 3,
         "allowOnlyCodedDiagnosis": false,
         "conceptSetUI": {
+            "COVID-19-Starter, Vaccine Recipient Category": {
+                "dropdown": true
+            },
+            "COVID-19-Starter, Reason for not eligible for vaccine": {
+                "multiSelect": true
+            },
+            "COVID-19-Starter, Comorbidities": {
+                "multiSelect": true
+            },
+            "Vaccine lot expiration date": {
+                "allowFutureDates": true
+            },
+            "Date medication refills due": {
+                "allowFutureDates": true
+            },
+            "COVID-19-Starter, Side effects reported after vaccination": {
+                "allowAddMore": true
+            },
+            "COVID-19-Starter, Symptoms": {
+                "multiSelect": true
+            },
             "Chief Complaint Data": {
                 "autocomplete":true,
                 "codedConceptName":"Chief Complaint",

openmrs/apps/clinical/dashboard.json

@@ -402,32 +402,13 @@
                     "template": "<patient-appointments-dashboard section='config' patient='patient'></patient-appointments-dashboard>"
                 }
             },
-	    "Forms-2.0": {
-                "type": "formsV2",
-                "displayOrder": 23,
-                "dashboardConfig": {
-                    "title": null,
-                    "maximumNoOfVisits": 1
-                },
-                "formGroup": [ ],
-                "translationKey": "DASHBOARD_TITLE_FORMS2_DISPLAY_CONTROL_KEY"
-            },
-            "Form 2 Obs To Obs": {
-                "displayType": "Half-Page",
-                "translationKey": "DASHBOARD_TITLE_FORMS2_OBS_TO_OBS_DISPLAY_CONTROL_KEY",
-                "type": "obsToObsFlowSheet",
-                "dashboardConfig": {
-                    "numberOfVisits": 1,
-                    "formNames": [],
-                    "groupByConcept": "",
-                    "isEditable": true,
-                    "conceptNames": []
-                },
-                "expandedViewConfig": {
-                    "formNames": [],
-                    "isEditable": true,
-                    "groupByConcept": "",
-                    "conceptNames": []
+
+            "Vaccination": {
+                "type": "custom",
+                "displayOrder": 25,
+                "config": {
+                    "title": "DASHBOARD_TITLE_VACCINATION_KEY",
+                    "template": "<vaccination></vaccination>"
                 }
             }
         }

openmrs/apps/clinical/formConditions.js

@@ -24,5 +24,86 @@ Bahmni.ConceptSet.FormConditions.rules = {
                 disable: ["Posture"]
             }
         }
+    },
+    'Eligible for Vaccine': function (formName, formFieldValues) {
+        var eligibleValue = formFieldValues['Eligible for Vaccine'];
+        if (eligibleValue == 'False') {
+            var reasons = formFieldValues["COVID-19-Starter, Reason for not eligible for vaccine"];
+            var showList = ["COVID-19-Starter, Reason for not eligible for vaccine"];
+
+            return {
+                show: showList
+            }
+        } else {
+            return {
+                hide: ["COVID-19-Starter, Reason for not eligible for vaccine", "Currently taking medication", "COVID-19-Starter, Others"]
+            }
+        }
+    },
+    'COVID-19-Starter, Reason for not eligible for vaccine': function (formName, formFieldValues) {
+        var reasons = formFieldValues["COVID-19-Starter, Reason for not eligible for vaccine"];
+        var showList = [];
+        var hideList = [];
+
+        var showMed = false;
+        var showOthers = false;
+
+        for (i = 0; i < reasons.length; i++) {
+            if (reasons[i] == 'Currently taking medication') {
+                showMed = true;
+                showList.push("Currently taking medication");
+            } else if (reasons[i] == 'COVID-19-Starter, Others') {
+                showOthers = true;
+                showList.push("COVID-19-Starter, Others");
+            }
+        }
+        if (!showOthers) {
+            hideList.push("COVID-19-Starter, Others");
+        }
+        if (!showMed) {
+            hideList.push("Currently taking medication");
+        }
+
+        return {
+            show: showList,
+            hide: hideList
+        }
+    },
+   'COVID-19-Starter, New symptoms since vaccination': function (formName, formFieldValues) {
+        var newSymptomsValue = formFieldValues['COVID-19-Starter, New symptoms since vaccination'];
+        console.log(newSymptomsValue);
+        if (newSymptomsValue == 'True') {
+            var showList = ["COVID-19-Starter, Side effects reported after vaccination"];
+
+            return {
+                show: showList
+            }
+        } else {
+            return {
+                hide: ["COVID-19-Starter, Side effects reported after vaccination"]
+            }
+        }
+    },
+    'COVID-19-Starter, Symptoms': function (formName, formFieldValues) {
+        var reasons = formFieldValues["COVID-19-Starter, Symptoms"];
+        var showList = [];
+        var hideList = [];
+
+        var showOthers = false;
+
+        for (i = 0; i < reasons.length; i++) {
+           if (reasons[i] == 'COVID-19-Starter, Other') {
+                showOthers = true;
+                showList.push("COVID-19-Starter, Other");
+            }
+        }
+        if (!showOthers) {
+            hideList.push("COVID-19-Starter, Other");
+        }
+
+        return {
+            show: showList,
+            hide: hideList
+        }
     }
 };

openmrs/apps/customDisplayControl/js/customControl.js

@@ -212,4 +212,60 @@ angular.module('bahmni.common.displaycontrol.custom')
         },
         template: '<ng-include src="contentUrl"/>'
     };
+}]).directive('vaccination', ['observationsService', 'appService', 'spinner', 'printer', function (observationsService, appService, spinner, printer) {
+    var link = function ($scope) {
+        var conceptNames = ["COVID-19-Starter, Vaccine"];
+        $scope.contentUrl = appService.configBaseUrl() + "/customDisplayControl/views/vaccination.html";
+        $scope.certificateUrl = appService.configBaseUrl() + "/customDisplayControl/views/covid19VaccineCertificate.html";
+        $scope.observationData = [];
+        spinner.forPromise(observationsService.fetch($scope.patient.uuid, conceptNames, undefined, undefined, $scope.visitUuid, undefined).then(function (response) {
+            $scope.observationData = response.data[0];
+            $scope.dosages = {};
+            if ($scope.observationData != null) {
+                for (var i=0; i<$scope.observationData.groupMembers.length; i++) {
+                    var groupMember = $scope.observationData.groupMembers[i];
+                    if (groupMember.concept.name === 'COVID-19-Starter, COVID-19 Vaccine Name') {
+                        $scope.dosages.vaccineName = groupMember.valueAsString;
+                    } 
+                    if (groupMember.concept.name === 'VACCINE MANUFACTURER') {
+                        $scope.dosages.manufacturer = groupMember.valueAsString;
+                    } 
+                    if (groupMember.concept.name.startsWith('COVID-19-Starter, Dose')) {
+                        var isDose1 = groupMember.concept.name === 'COVID-19-Starter, Dose-1' ? true : false;
+                        if (isDose1) {
+                            $scope.dosages.dose1 = {};
+                        } else {
+                            $scope.dosages.dose2 = {};
+                        }
+                        for (var j=0; j<groupMember.groupMembers.length; j++) {
+                            if (groupMember.groupMembers[j].concept.name === 'VACCINE LOT NUMBER') {
+                                if (isDose1) {
+                                    $scope.dosages.dose1.lotNumber = groupMember.groupMembers[j].valueAsString;
+                                    $scope.dosages.dose1.date = groupMember.groupMembers[j].visitStartDateTime;
+                                } else {
+                                    $scope.dosages.dose2.lotNumber = groupMember.groupMembers[j].valueAsString;
+                                    $scope.dosages.dose2.date = groupMember.groupMembers[j].visitStartDateTime;
+                                }
+                            } 
+                            if (groupMember.groupMembers[j].concept.name === 'Date medication refills due') {
+                                if (isDose1) {
+                                    $scope.dosages.dose1.dueDate = groupMember.groupMembers[j].valueAsString;
+                                } else {
+                                    $scope.dosages.dose2.dueDate = groupMember.groupMembers[j].valueAsString;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }));
+        $scope.print = function () {
+            printer.print(appService.configBaseUrl() + "/customDisplayControl/views/printVaccination.html", {patient: $scope.patient, dosages: $scope.dosages, currentDashboardTemplateUrl: $scope.certificateUrl});
+        };
+    };
+    return {
+        restrict: 'E',
+        template: '<ng-include src="contentUrl"/>',
+        link: link
+    }
 }]);

openmrs/apps/customDisplayControl/styles/printVaccination.css

@@ -0,0 +1,76 @@
+.vaccination-display-control {
+  position: absolute;
+  top: 40%;
+  transform: translateY(-40%);
+  width: 90%;
+  left: 5%;
+}
+
+.template-container {
+  border: 1px solid #669999;
+  border-radius: 5px 5px 0 0;
+  background: #FFFFFF;
+  padding: 10px 20px;
+  width: 90%;
+  margin-bottom: 25px;
+  margin-top: 25px;
+  height: 98%;
+}
+
+.section-title {
+  padding: 10px;
+  margin-top: 0;
+  margin-bottom: 0;
+  text-align: center;
+  font-size: 18px;
+  color: #00473f;
+}
+
+section {
+  margin-bottom: 15px;
+}
+
+table {
+  margin: 0;
+  width: 100%;
+  border-collapse: collapse;
+  border-spacing: 0;
+  border: 1px solid #ddd;
+}
+
+table td {
+  font-size: 12px;
+  width: 50%;
+}
+
+table tr {
+  border: 0;
+  border-bottom: 1px solid #ddd;
+}
+
+table td {
+  padding: 5px 10px;
+}
+
+h1, h2 {
+  padding: 0px;
+  font-size: 20px;
+  color: #00473f;
+  clear: both;
+  margin: 10px 0;
+}
+
+h2 {
+  color: #669999;
+  font-size: 16px;
+}
+
+div, ul, li {
+  margin: 0px;
+  padding: 0px;
+}
+
+ul {
+  list-style: none;
+}
+