Cerner merge test deployment

README.md

@@ -5,7 +5,6 @@ elCID is an electronic Clinical Infection Database.
 It is built using the [Opal](https://github.com/openhealthcare/opal) framework.
 
 [![Build
-Status](https://travis-ci.org/openhealthcare/elcid-rfh.png)](https://travis-ci.org/openhealthcare/elcid-rfh)
 [![Coverage Status](https://coveralls.io/repos/github/openhealthcare/elcid/badge.svg?branch=v0.2.4)](https://coveralls.io/github/openhealthcare/elcid?branch=v0.2.4)
 
 http://elcid.openhealthcare.org.uk

elcid/api.py

@@ -573,6 +573,17 @@ def list(self, request, *args, **kwargs):
             hospital_number=hospital_number
         ).last()
 
+        # If we can't find a patient in demographics
+        # check to see if it is an inactive MRN that
+        # has been merged with a different MRN on elcid
+        if not demographics:
+            merged_mrn = emodels.MergedMRN.objects.filter(
+                mrn=hospital_number
+            ).first()
+            if merged_mrn:
+                demographics = merged_mrn.patient.demographics()
+
+
         # the patient is in elcid
         if demographics:
             return json_response(dict(
@@ -584,7 +595,7 @@ def list(self, request, *args, **kwargs):
             return json_response(dict(status=self.PATIENT_NOT_FOUND))
         else:
             if settings.USE_UPSTREAM_DEMOGRAPHICS:
-                demographics = loader.load_demographics(hospital_number)
+                demographics = loader.search_upstream_demographics(hospital_number)
                 if demographics:
                     return json_response(dict(
                         patient=dict(demographics=[demographics]),
@@ -605,6 +616,25 @@ def create(self, request):
             status_code=status.HTTP_201_CREATED
         )
 
+    @item_from_pk
+    def destroy(self, request, item):
+        """
+        Delete a blood culture isolate.
+        Update the updated* and previous_mrn fields of the parent
+        blood culture set.
+        """
+        blood_culture_set = item.blood_culture_set
+
+        # This uses the set_{field_name} behaviour from update_from_dict.
+        # We pass in None as the set_{field_name} interface takes in the value
+        # to set as the first argument but this is unused for the updated* methods.
+        blood_culture_set.set_updated_by_id(None, request.user)
+        blood_culture_set.set_updated(None, request.user)
+        if blood_culture_set.previous_mrn:
+            blood_culture_set.previous_mrn = None
+        blood_culture_set.save()
+        return super().destroy(request, item.id)
+
 
 class AddToServiceViewSet(LoginRequiredViewset):
     basename = 'add_to_service'

elcid/assets/css/elcid.scss

@@ -26,6 +26,10 @@ body{
     height: calc(100%);
 }
 
+.text-strong{
+    font-weight: bold;
+}
+
 .green {
     color: $green;
 }
@@ -292,6 +296,17 @@ a.list-group-item {
   }
 }
 
+.no-touchevents
+table td i.edit{
+  color: $faded;
+
+  &:hover{
+    color: #333;
+  }
+
+}
+
+
 .death-banner {
     margin-top: -95px;
     padding-top: 80px;
@@ -694,3 +709,60 @@ div.add-isolate:hover{
     max-width: 150px;
   }
 }
+
+
+.scrollable-table-container {
+    overflow-y: scroll;
+    height: 75%;
+    position: fixed;
+    width: 100%;
+}
+
+.border-bottom-secondary,
+.table-bordered th.border-bottom-secondary{
+    border-bottom: $secondary 2px solid;
+}
+
+.table-striped > tbody > tr.table-changed-heading:nth-child(odd) > th,
+.table-changed-heading th{
+    background-color: $blue-light;
+    border-bottom: $secondary 1px solid;
+}
+
+h1 small a{
+    font-size: 14px;
+}
+
+#sideroom-ward-nav {
+    position: fixed;
+    padding-top: 12px;
+    top: 142px;
+    border-right: 2px solid $secondary;
+    height: 100%;
+}
+#sideroom-ward-nav a{
+    padding-left: 4px;
+}
+#sideroom-gender-count {
+    color: $obsidian;
+    font-size: 0.4em;
+}
+#sideroom-gender-count div{
+    margin-right: 12px;
+}
+#sideroom-gender-count div,
+#sideroom-gender-count p{
+    display: inline-block;
+}
+
+table.table.table-striped tr.highlighted-row td{
+    background: lighten($blue-light, 18%);
+}
+.max-360 {
+    max-width: 360px;
+}
+.known-wards .row{
+    padding-bottom: 12px;
+    padding-top: 12px;
+    border-bottom: solid 1px $obsidian-light;
+}

elcid/assets/js/elcid/controllers/blood_culture_panel.js

@@ -37,10 +37,15 @@ angular.module('opal.controllers').controller('BloodCulturePanelCtrl', function(
     var deferred = $q.defer();
     $http.get("/api/v0.1/blood_culture_set/" + bcs.id + "/").then(function(result){
       var bcs_idx = _.findIndex($scope.patient.blood_culture_set, {id: bcs.id})
+      // when we update isolates we update the fields the previous_mrn, updated*
+      // fields on the set.
       $scope.patient.blood_culture_set[bcs_idx].isolates = result.data.isolates;
+      $scope.patient.blood_culture_set[bcs_idx].previous_mrn = result.data.previous_mrn;
+      $scope.patient.blood_culture_set[bcs_idx].updated = result.data.updated;
+      $scope.patient.blood_culture_set[bcs_idx].updated_by_id = result.data.updated_by_id;
       deferred.resolve();
     })
 
     return deferred.promise;
   };
-});
+});

elcid/assets/js/elcid/directives.js

@@ -193,20 +193,53 @@ directives.directive('printPage', function () {
 
 
 directives.directive('scrollOnClick', function() {
-  return {
-    restrict: 'A',
-    link: function(scope, $elm, attrs) {
-      var idToScroll = attrs.target;
-      $elm.on('click', function() {
-        var $target;
-        if (idToScroll) {
-          $target = $(idToScroll);
-        } else {
-          $target = $elm;
+    return {
+        restrict: 'A',
+        link: function(scope, $elm, attrs) {
+            var idToScroll = attrs.target;
+            var offset = attrs.offset
+            $elm.on('click', function() {
+                var $target;
+                if (idToScroll) {
+                    $target = $(idToScroll);
+                } else {
+                    $target = $elm;
+                }
+                if (offset){
+                    offset = parseInt(offset);
+                } else {
+                    offset = 100
+                }
+                $("html,body").animate({scrollTop: $target.offset().top-offset}, "slow");
+                return false;
+            });
         }
-          $("html,body").animate({scrollTop: $target.offset().top-100}, "slow");
-          return false;
-      });
     }
-  }
 });
+
+
+directives.directive('labNumberString', function(){
+    return {
+        // require: "ngModel",
+        scope: true,
+        template: "[[text]]<br/><span ng-repeat=\"lab_number in lab_numbers\"><a class=\"orange-link pointer\" ng-click=\"open_modal('LabDetailModalCtrl', '/templates/lab/lab_detail_modal.html', {'lab_number': lab_number} )\">[[ lab_number ]]</a> </span>",
+        link: function(scope, element, attrs){
+            if(attrs.text){
+                var text = scope.$eval(attrs.text);
+            }
+            if(attrs.rawText){
+                var text = attrs.rawText
+            }
+
+            var regexp = /[0-9]+[LK][0-9]+/g;
+            scope.text = text;
+            scope.lab_numbers = [];
+
+            if(text){ // sometimes patients don't have Covid.
+                matches = text.match(regexp);
+                scope.lab_numbers = _.map(matches, function(x){ return x.replace(/^0+/, '') });
+            }
+        }
+    }
+
+})