renalware-core 2.0.77 → 2.0.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f31b746ef727f7d62c938bd6978058aabd3eb52ab5d24529b0e28706446b961
-  data.tar.gz: a510872302ae102f5f78d0f0a92645baace889986336ee55d337313db005a33b
+  metadata.gz: 6fc5fdac47309549e33a38115213df8faa51bf106f66e354a41b594687938168
+  data.tar.gz: d6d87b6b9199f3f95e5ee6cf88b3a553eb819814db336e974e763fa35c5cc36b
 SHA512:
-  metadata.gz: e3f44451da960cba27e7608f53ca1ab6172d1767106a974ab07ab7415450ab2a2e41f83620752bb3af568787134cc1d185021d1af159ad366965e1bb25f0052b
-  data.tar.gz: d1139a781f293dceac77f83703841b8a6a3d158d7e449fa786e72cdc6954ce0edef34ed5d04828dce3240865ffe68b9d0cbccb39dfe99d7f140e58d9a94e2986
+  metadata.gz: 5e73f7af79c6b2ce7654949780644d3de0992015e833a33741c6463dfd95676e4ae15d74d07ee80833f492e8c07aedd13545207b926600bb854e58f7a0b9def5
+  data.tar.gz: 41f49f78bab0117ee76308dcb1ae38009588098f197e28821a0cf11351549a16434f8001c01458b4915db06639e6e9f8bd0d7fc72f1f27fb0f438661cd75ffa6

data/app/assets/javascripts/renalware/table.js

@@ -0,0 +1,16 @@
+// Based on https://css-tricks.com/row-and-column-highlighting/
+// For tables with a class column_hover, highight the column the user is
+// hovering over.
+
+$(function() {
+  $("table.column_hover").delegate('td','mouseover mouseleave', function(e) {
+    if (e.type == 'mouseover') {
+      $(this).parent().addClass("hover");
+      $("colgroup").eq($(this).index()).addClass("hover");
+    }
+    else {
+      $(this).parent().removeClass("hover");
+      $("colgroup").eq($(this).index()).removeClass("hover");
+    }
+  });
+});

data/app/assets/stylesheets/renalware/base/_variables.scss

@@ -105,6 +105,7 @@ $table-even-row-colour: #fcfcfc;
 $table-border-colour: #ccc;
 $table-toggled-content-colour: #fefff1;
 $table-urgent-colour: $nhs-yellow;
+$table-row-hover-colour: #f9f9f9;
 
 $patient-menu-background-colour: #eee;
 $menu-divider-colour: #e6e6e6;
@@ -130,7 +131,7 @@ $hd-weekly-diary-hover-colour: lighten($hd-weekly-diary-colour, 25);
 //
 $dl-horizontal-dt-width: 9rem;
 
-$patient-side-nav-width: 15rem;
+$patient-side-nav-width: 14.5rem;
 
 // Select2
 $select2-input-height: 2.2rem;

data/app/assets/stylesheets/renalware/lib/_foundation_and_overrides.scss

@@ -78,7 +78,7 @@ $include-html-global-classes: $include-html-classes;
 // $include-html-grid-classes: $include-html-classes;
 $include-xl-html-grid-classes: true;
 
-$row-width: 95%;
+$row-width: 96%;
 // $total-columns: 12;
 $column-gutter: rem-calc(20);
 

data/app/assets/stylesheets/renalware/modules/_admissions.scss

@@ -1,9 +1,4 @@
 .admissions-table table {
-  td,
-  th {
-    vertical-align: top;
-  }
-
   th.subhead {
     color: $black;
     text-align: center;

data/app/assets/stylesheets/renalware/modules/_clinical.scss

@@ -33,7 +33,7 @@ article.clinical-allergies {
 }
 
 .lozenge {
-  padding: .2em .3rem 0 .3rem;
+  padding: 0 .3rem;
 
   ul {
     li {
@@ -41,10 +41,11 @@ article.clinical-allergies {
       border: 0;
       border-radius: 0.3rem;
       display: inline-block;
-      margin: 0.1rem 0.3rem 0.2rem 0;
-      margin: 0.2rem .6rem .2rem 0;
+      // margin: 0.1rem 0.3rem 0.2rem 0;
+      margin: 0.1rem .6rem .2rem 0;
       padding: 0.3rem 0.3rem 0 .2rem;
-      padding: 0
+      padding: 0;
+      //padding: .2em .3rem 0 .3rem;
     }
   }
 }
@@ -73,7 +74,7 @@ article.clinical-allergies {
 
     dl {
       font-size: 0.9rem;
-      line-height: 0.9rem;
+      line-height: 0.8rem;
       margin: 0;
       padding: 0;
     }
@@ -125,8 +126,21 @@ article.clinical-allergies {
   }
 }
 
+.patient-alerts--sticky {
+  /*
+  Using  position: sticky is in Chrome 56 and recent Firefox and will not work in IE11
+  but is a simple way for us to fix the alerts under the patient banner when the user
+  has scroll downn, so they are always there
+  https://gedd.ski/post/position-sticky/
+  */
+  position: sticky;
+  top: 0;
+  z-index: 1;
+}
+
 .patient-alerts {
   color: $white;
+  background-color: transparent;
 
   @media print {
     display: none;
@@ -135,6 +149,7 @@ article.clinical-allergies {
   &.lozenge {
     ul {
       margin: 0;
+      //margin-top: 1px;
       //font-size: 0.9rem;
 
       li {
@@ -142,8 +157,9 @@ article.clinical-allergies {
         color: $white;
         display: inline-block;
         margin: 0 .3rem 0 0;
-        margin: 0.1rem 0.3rem 0.2rem 0;
+        margin: 0.1rem 0.3rem 0.1rem 0;
         padding: 0 .4rem;
+        line-height: 1.7rem;
 
         &:hover {
           background-color: darken($nhs-orange, 5);

data/app/assets/stylesheets/renalware/modules/_hd.scss

@@ -226,7 +226,6 @@
 label#toggle-full-hd-profile {
   color: $link-colour;
   display: inline-block;
-  margin: 0.16rem;
 
   &:focus {
     color: $link-focus-colour;
@@ -341,14 +340,6 @@ table.hd-sessions {
   }
 }
 
-table.mdm.audit {
-  thead {
-    th {
-      vertical-align: top;
-    }
-  }
-}
-
 .hd-unmet-preferences {
   thead {
     tr {

data/app/assets/stylesheets/renalware/modules/_pathology.scss

@@ -2,14 +2,37 @@ table.pathology-observation-diff {
   width: auto;
 }
 
+// .embedded-scroll.pathology {
+//   height: 400px;
+// }
+/*
+Note thhat to get position sticky to work in the embedded scroll div we need to
+add a height if using overflow: auto. We also need the top lh th to be both
+left: 0 and top: 0 and have a zindex of 2
+*/
 table#observations {
   border-collapse: collapse;
   white-space: nowrap;
   width: auto;
+  background: transparent;
+  //overflow: hidden;
+
+  thead {
+    th {
+      // position: sticky;
+      // z-index: 1;
+      // top: 0;
+      // background-color: $white;
+    }
+  }
 
   tbody {
     th {
       padding: 0 .3rem;
+      // position: sticky;
+      // z-index: 1;
+      // left: 0;
+      // background-color: $white;
     }
 
     td {
@@ -31,6 +54,10 @@ table#observations {
         top: 0;
         width: 0;
       }
+
+      &:hover {
+        font-weight: bold;
+      }
     }
   }
 
@@ -44,11 +71,28 @@ table#observations {
     background-color: #cf9;
   }
 
-  tr.even,
-  tr.alt,
-  tr:nth-of-type(even) {
-    background-color: $white;
-  }
+  // tr.even,
+  // tr.alt,
+  // tr:nth-of-type(even) {
+  //   background-color: $white;
+  // }
+  //
+
+  /*
+  Highlight the column on hover.
+  See https://css-tricks.com/simple-css-row-column-highlighting/
+  */
+  // td:hover::after,
+  // th:hover::after {
+  //   content: "";
+  //   position: absolute;
+  //   background-color: $off-white;
+  //   left: 0;
+  //   top: -5000px;
+  //   height: 10000px;
+  //   width: 100%;
+  //   z-index: -1;
+  // }
 
   td,
   th {

data/app/assets/stylesheets/renalware/modules/_patients.scss

@@ -15,7 +15,7 @@
   > div {
     display: table-cell;
     margin: 0;
-    padding: 0.4em 0.2em 0.5em 0.6em; // ensures both divs are equal height
+    padding: 0.3em 0.2em 0.2em 0.6em; // ensures both divs are equal height
 
     @media #{$small-only} {
       display: block; // at small widths make allergies and renal profile full width
@@ -113,7 +113,7 @@ ul.provider {
 
 .page-heading {
   float: left;
-  margin: 0.5rem 0 1rem;
+  margin: 0.5rem 0 .7rem;
   width: 100%;
 
   & > li {
@@ -146,12 +146,14 @@ ul.provider {
   dl {
     font-size: 1.1rem;
     margin: 0 0 0 0.5em;
+    line-height: 1.5;
 
     dt {
       color: $white;
       display: inline-block;
       font-size: .6em;
       font-weight: normal;
+      line-height: inherit;
       margin: 0;
       padding: 0;
       text-transform: uppercase;
@@ -169,6 +171,7 @@ ul.provider {
       display: inline;
       font-size: 1em;
       margin: 0 .5em 0 .1em;
+      line-height: inherit;
 
       // When the user clicks the content, select it all
       &.selectable {

data/app/assets/stylesheets/renalware/modules/_system.scss

@@ -33,3 +33,68 @@
 
   }
 }
+
+.download {
+  border: solid 1px $light-grey;
+  border-radius: .2rem;
+  margin-bottom: 1rem;
+  padding: .3rem .5rem;
+
+  &:hover {
+    background-color: $nearly-white;
+  }
+
+  .file {
+    font-size: 1.3rem;
+    display: table-cell;
+    padding-right: 1rem;
+    vertical-align: top;
+
+
+    a {
+      color: $winter-sky;
+      &:active,
+      &:visited {
+        color: $winter-sky;
+      }
+      &:hover {
+        color: $winter-sky;
+      }
+    }
+  }
+  .details {
+    display: table-cell;
+
+    h3 {
+      font-size: 1.3rem;
+      margin: 0;
+
+      a {
+        color: $oil;
+        &:active,
+        &:visited {
+          color: $oil;
+        }
+        &:hover {
+          color: $black;
+          text-decoration: underline;
+        }
+      }
+    }
+
+    .updated_at {
+      font-size: .7rem;
+      color: #888;
+
+    }
+
+    p {
+      padding: 0;
+      margin: 0 0 .2rem 0;
+    }
+
+    .actions {
+      margin-top: 0.3rem;
+    }
+  }
+}

data/app/assets/stylesheets/renalware/partials/_button.scss

@@ -11,7 +11,7 @@
   .button {
     margin-bottom: 0;
     margin-right: 0.8rem;
-    padding: 0.5rem 1rem;
+    padding: 0.4rem 1rem;
   }
 
   @media print {

data/app/assets/stylesheets/renalware/partials/_forms.scss

@@ -128,10 +128,10 @@ form {
 article {
   background-color: $white;
   border: 0;
-  border-top: 2px solid $link-colour;
+  border-top: 1px solid $link-colour;
   float: left;
-  margin: 0 0 1.5rem;
-  padding: 0.5rem 0 0;
+  margin: 0 0 1rem;
+  padding: 0.3rem 0 0;
   position: relative;
   width: 100%;
 
@@ -149,7 +149,7 @@ article {
 
   header {
     float: left;
-    margin: 0 0 0.5rem;
+    margin: 0 0 0.6rem;
     width: 100%;
 
     h1,
@@ -158,7 +158,7 @@ article {
       float: left;
       font-size: 1.2rem;
       font-weight: bold;
-      line-height: 1.8rem;
+      line-height: 1.6rem;
       margin: 0 .5rem 0 0;
       padding: 0;
 
@@ -205,7 +205,7 @@ article {
       color: $white;
       display: block;
       float: right;
-      padding: 0.4rem;
+      padding: 0.3rem 0.4rem;
       text-decoration: none;
     }
 
@@ -253,7 +253,7 @@ article {
   }
 
   dt {
-    color: rgb(153, 153, 153);
+    color: $dashboard-muted-color;
     font-weight: normal;
   }
 

data/app/assets/stylesheets/renalware/partials/_layout.scss

@@ -173,6 +173,6 @@ section.display {
     clear: both;
     float: left;
     margin: 0;
-    padding: 1.4rem 0 .7rem;
+    padding: 1.4rem 0 0.4rem;
   }
 }

data/app/assets/stylesheets/renalware/partials/_lists.scss

@@ -2,6 +2,7 @@
 .dl-horizontal {
   margin-bottom: 0;
   margin-top: 0;
+  line-height: 1.5rem;
 
   p {
     padding-left: 0;
@@ -10,12 +11,22 @@
   dt,
   dd {
     font-weight: normal;
+    // border-top: dotted 1px #ddd;
+
+    // &:first-child {
+    //   border-top: none;
+    // }
+
 
     &.inset {
       margin-left: 0.8em;
     }
   }
 
+  dd:nth-child(2) {
+    border-top: none;
+  }
+
   dt {
     clear: left;
     float: left;