renalware-core 2.0.51 → 2.0.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d15eecf18eb6f1251466a94ad8a2ead910474270024e55b8194165404e42156
-  data.tar.gz: 6c4c2149f75c2e4c40f70f777677ce17f8f450073a76adbe02b1f5af032ca5a1
+  metadata.gz: 48b285c50a9ac0c12b46189e5c538cb118fd6d8919159d616bc294a247e3c4ef
+  data.tar.gz: cc6af6a441e72c2ad778b961cd80cff1fe63ebaead859cbac8c67eaf4c55b928
 SHA512:
-  metadata.gz: d172d24371940e39b65bf0efae5e0a4cd4d492600cc5549fcb01ba7b5e392d861ace27c2871c0249fa6ab1925f415f86a29f8468b252f929a0d109845c5d060c
-  data.tar.gz: 95331d208f3af5c0f3ce2d91edf85428d270d0957cc3cbba81fadb88d5b2fa3f18264fe4c91b5b8b659c8671f049e5747cf444bcde0bf1b48bacbfab55e2839c
+  metadata.gz: 82443a7b267b40a80dacc3017f615b3411dfff84de173f8da1188024aec2cdb3d96186bdc8e060e3ad01f610ee84d53f24e0212bb8d6e3766c8eeec388fdffde
+  data.tar.gz: 8370017d70446d66d0b455c94b863baf1abba1d2768c4a05b5580936a83c00d887626dfbd3e4b5a519e677e39fe8db78ff4a9ba09103b62e36aaa04b46ebb853

data/README.md

@@ -215,6 +215,7 @@ To make awesome_print the default formatter in irb, add the following to `~/.irb
     require "awesome_print"
     AwesomePrint.irb!
 
+
 #### Docker -  WIP!
 
 ```

data/app/assets/stylesheets/renalware/application.scss

@@ -12,11 +12,12 @@
 @import "dataTables/jquery.dataTables.foundation";
 @import "chosen";
 @import "trix";
+@import "renalware/balloon";
 @import "./lib/foundation_and_overrides";
 @import "./lib/clockpicker";
 @import "./base/variables";
 @import "./base/mixins";
-@import "./lib/select2-foundation5";
+@import "renalware/select2-foundation5";
 @import "./lib/select2-foundation5-overrides";
 @import "./modules/**/*";
 @import "renalware/print.min";

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

@@ -2,11 +2,11 @@
 // @import "base/mixins"
 
 @mixin badge {
+  background-color: $letter-state-unknown;
   border-radius: 0.2rem;
-  padding: 0.15rem 0.4rem;
   color: $white;
-  white-space: nowrap;
   font-size: 0.9rem;
   font-weight: normal;
-  background-color: $letter-state-unknown;
+  padding: 0.15rem 0.4rem;
+  white-space: nowrap;
 }

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

@@ -17,25 +17,25 @@
 //
 
 // NHS Colours
-$nhs-yellow: #FAE100;
-$nhs-warm-yellow: #FFB81C;
-$nhs-orange: #ED8B00;
-$nhs-red: #D81E05;
-
-$nhs-emergency-red: #DA291C;
-$nhs-dark-red: #8A1538;
-$nhs-dark-pink: #7C2855;
+$nhs-yellow: #fae100;
+$nhs-warm-yellow: #ffb81c;
+$nhs-orange: #ed8b00;
+$nhs-red: #d81e05;
+
+$nhs-emergency-red: #da291c;
+$nhs-dark-red: #8a1538;
+$nhs-dark-pink: #7c2855;
 $nhs-purple: #330072;
-$nhs-pink: #AE2573;
+$nhs-pink: #ae2573;
 
 $nhs-dark-blue: #003087;
-$nhs-blue: #005EB8;
-$nhs-bright-blue: #0072CE;
-$nhs-light-blue: #41B6E6;
-$nhs-aqua-blue: #00A9CE;
+$nhs-blue: #005eb8;
+$nhs-bright-blue: #0072ce;
+$nhs-light-blue: #41b6e6;
+$nhs-aqua-blue: #00a9ce;
 
-$nhs-aqua-green: #00A499;
-$nhs-light-green: #78BE20;
+$nhs-aqua-green: #00a499;
+$nhs-light-green: #78be20;
 $nhs-green: #009639;
 $nhs-dark-green: #006747;
 
@@ -43,12 +43,12 @@ $dashboard-muted-color: #888;
 $link-colour: $primary-color; // #008CBA;
 $link-focus-colour: #0078a0;
 $link-hover-colour: #64d6fb;
-$white: #FFF;
-$off-white: #EEE;
+$white: #fff;
+$off-white: #eee;
 $dark-grey: #222;
 $muted-dark-grey: #555;
-$winter-sky: #AAA;
-$light-grey: #DDD;
+$winter-sky: #aaa;
+$light-grey: #ddd;
 $mid-grey: #999;
 $very-light-grey: #f5f5f5;
 $error-background: $off-white;
@@ -58,8 +58,8 @@ $light-green: #00e658;
 
 // Drug type colours
 $drug-type-default-colour: none;
-$drug-type-esa-colour: #FFFF99;
-$drug-type-immunosuppressant-colour: #CCFeFF;
+$drug-type-esa-colour: #ff9;
+$drug-type-immunosuppressant-colour: #ccfeff;
 
 $tab-border-color: $off-white;
 
@@ -69,7 +69,7 @@ $patient-header-icon-color: #bbb;
 $patient-header-bg-color: $nhs-blue;
 
 // Bookmarks
-$bookmark-urgent-colour: #FFFFC8;
+$bookmark-urgent-colour: #ffffc8;
 
 // Letter states
 $letter-state-unknown: $mid-grey;
@@ -94,27 +94,27 @@ $priority-low: $nhs-green;
 // Modals
 $max-modal-height: 600px;
 
-$mini-profile-backgound-colour: #DEF0F6;
-$mini-profile-renal-backgound-colour: #DEF0F6;
+$mini-profile-backgound-colour: #def0f6;
+$mini-profile-renal-backgound-colour: #def0f6;
 $mini-profile-allergies-backgound-colour: $nhs-yellow;
 
 $letter-preview-background-colour: #ddd;
 
 // tables
-$table-even-row-colour: #FCFCFC;
-$table-border-colour: #CCC;
-$table-toggled-content-colour: #FEFFF1;
+$table-even-row-colour: #fcfcfc;
+$table-border-colour: #ccc;
+$table-toggled-content-colour: #fefff1;
 $table-urgent-colour: $nhs-yellow;
 
-$patient-menu-background-colour: #eeeeee;
-$menu-divider-colour: #E6E6E6;
+$patient-menu-background-colour: #eee;
+$menu-divider-colour: #e6e6e6;
 
 $footer-colour: $patient-header-muted-color;
-$footer-bg-colour:$patient-menu-background-colour;
+$footer-bg-colour: $patient-menu-background-colour;
 
 // Forms
-$form-hint-colour: #BBB;
-$disabled-colour: #CCC;
+$form-hint-colour: #bbb;
+$disabled-colour: #ccc;
 
 // Menus
 $patient-menu-icon-color: $gainsboro;
@@ -136,7 +136,7 @@ $patient-side-nav-width: 15rem;
 $select2-input-height: 2.2rem;
 
 // Breakpoints
-$small-range: (0em, 40em);
+$small-range: (0, 40em);
 $medium-range: (40.063em, 64em);
 $large-range: (64.063em, 90em);
 $xlarge-range: (90.063em, 120em);

data/app/assets/stylesheets/renalware/clipboard.scss

@@ -1,5 +1,5 @@
 button.clipboard-btn {
-  padding: 0;
-  margin: 0;
   background-color: transparent !important;
+  margin: 0;
+  padding: 0;
 }

data/app/assets/stylesheets/renalware/hd_diary_pdf.scss

@@ -1,7 +1,7 @@
 html,
 body {
-  font-size: 10px;
   font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
+  font-size: 10px;
 }
 
 h1 {
@@ -9,22 +9,22 @@ h1 {
 }
 
 .page-break {
-  display:block;
-  clear:both;
-  page-break-after:always;
+  clear: both;
+  display: block;
+  page-break-after: always;
 }
 
 .noprint {
   display: none !important;
-  min-width: 0em !important;
+  min-width: 0 !important;
 }
 
 .hd-diary-pdf {
   table {
-    width: 100%;
+    border-collapse: collapse;
     border-spacing: 0;
-    border-collapse:collapse;
     margin-bottom: 5px;
+    width: 100%;
 
     tr {
       page-break-inside: avoid;
@@ -48,8 +48,8 @@ h1 {
       // No border on the diurnal period row eg AM, PM etc
       tr:first-child {
         th {
-          border: 0;
           background-color: #fff;
+          border: 0;
         }
       }
     }

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

@@ -62,7 +62,7 @@ $rem-base: 14px;
 // Since the typical default browser font-size is 16px, that makes the calculation for grid size.
 // If you want your base font-size to be different and not have it affect the grid breakpoints,
 // set $rem-base to $base-font-size and make sure $base-font-size is a px value.
-$base-font-size:13px;
+$base-font-size: 13px;
 
 // The $base-font-size is 100% while $base-line-height is 150%
 // $base-line-height: 150%;
@@ -94,15 +94,15 @@ $column-gutter: rem-calc(20);
 // Still a question over whether to use a webfont like Roboto or OpenSans so there is visual
 // consistency across devices.
 $font-family-sans-serif: "Helvetica Neue",
-                         -apple-system,
-                         BlinkMacSystemFont,
-                         "Segoe UI",
-                         Roboto,
-                         Oxygen,
-                         Ubuntu,
-                         Cantarell,
-                         "Open Sans",
-                         sans-serif;
+-apple-system,
+BlinkMacSystemFont,
+"Segoe UI",
+Roboto,
+Oxygen,
+Ubuntu,
+Cantarell,
+"Open Sans",
+sans-serif;
 
 // $font-family-sans-serif: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
 // $font-family-serif: Georgia, Cambria, "Times New Roman", Times, serif;
@@ -122,26 +122,26 @@ $alert-color: lighten($original-alert-color, 10%);
 // $warning-color: #f08a24;
 // $info-color: #a0d3e8;
 
-$white:         #FFFFFF;
-$nearly-white:  #FEFEFE;
-$ghost:         #FAFAFA;
-$snow:          #F9F9F9;
+$white:         #fff;
+$nearly-white:  #fefefe;
+$ghost:         #fafafa;
+$snow:          #f9f9f9;
 // $vapor:        #F6F6F6;
 // $white-smoke:  #F5F5F5;
 // $silver:       #EFEFEF;
-$smoke:         #EEEEEE;
-$gainsboro:     #DDDDDD;
+$smoke:         #eee;
+$gainsboro:     #ddd;
 // $iron:         #CCCCCC;
 // $base:         #AAAAAA;
-$aluminum:      #999999;
-$jumbo:         #888888;
-$monsoon:       #777777;
-$steel:         #666666;
-$charcoal:      #555555;
-$tuatara:       #444444;
-$oil:           #333333;
-$jet:           #222222;
-$black:         #000000;
+$aluminum:      #999;
+$jumbo:         #888;
+$monsoon:       #777;
+$steel:         #666;
+$charcoal:      #555;
+$tuatara:       #444;
+$oil:           #333;
+$jet:           #222;
+$black:         #000;
 
 // We use these to control various global styles
 // $body-bg: $white;

data/app/assets/stylesheets/renalware/lib/_select2-foundation5-overrides.scss

@@ -22,3 +22,15 @@ span.select2 {
     // min-width: 500px !important;
   }
 }
+
+.select2-container .select2-selection--single {
+  height: $select2-input-height;
+}
+
+.select2-container--default .select2-selection--single .select2-selection__rendered {
+  line-height: $select2-input-height;
+}
+
+.select2-container--classic .select2-selection--single .select2-selection__rendered {
+  line-height: $select2-input-height;
+}

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

@@ -1,5 +1,6 @@
 .admissions-table table {
-  td, th {
+  td,
+  th {
     vertical-align: top;
   }
 
@@ -27,7 +28,7 @@
 
 .admissions_requests {
 
-   td.priority {
+  td.priority {
     span {
       @include badge;
     }
@@ -66,4 +67,3 @@
     }
   }
 }
-

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

@@ -11,14 +11,14 @@ article.clinical-allergies {
     padding: 0.5rem 0;
 
     .flex-container {
-      flex-align: stretch;
-      margin: 0 1rem;
       align-items: center;
+      flex-align: stretch;
       justify-content: center;
+      margin: 0 1rem;
 
       &.disabled {
-        pointer-events:none;
         opacity: .5;
+        pointer-events: none;
       }
 
       input {
@@ -37,21 +37,21 @@ article.clinical-allergies {
 
   ul {
     li {
-      padding: 0.3rem 0.3rem 0 .2rem;
-      border: none;
-      margin: 0.1rem 0.3rem 0.2rem 0;
-      border-radius: 0.3rem;
       background-color: $light-grey;
+      border: 0;
+      border-radius: 0.3rem;
       display: inline-block;
-      padding: 0;
-      margin: 0.2rem .6rem .2rem 0
+      margin: 0.1rem 0.3rem 0.2rem 0;
+      margin: 0.2rem .6rem .2rem 0;
+      padding: 0.3rem 0.3rem 0 .2rem;
+      padding: 0
     }
   }
 }
 
 .clinical-header {
   background-color: $table-border-colour;
-  padding: 0em .2em .2em .6em;
+  padding: 0 .2em .2em .6em;
 
   @media print {
     display: none;
@@ -63,44 +63,45 @@ article.clinical-allergies {
 
     ul {
       li {
-        padding: 0.3rem 0.3rem;
-        border: none;
-        margin: 0.1rem 0.3rem 0.2rem 0;
-        border-radius: 0.3rem;
         background-color: $light-grey;
+        border: 0;
+        border-radius: 0.3rem;
+        margin: 0.1rem 0.3rem 0.2rem 0;
+        padding: 0.3rem 0.3rem;
       }
     }
 
     dl {
-      padding: 0;
-      margin: 0;
       font-size: 0.9rem;
       line-height: 0.9rem;
+      margin: 0;
+      padding: 0;
     }
   }
 
   ul {
-    padding: 0;
     margin: 0;
+    padding: 0;
 
     li {
-      display: inline-block;
-      padding: 0;
       border-bottom: 1px dotted $winter-sky;
-      margin: 0.2rem .6rem .2rem 0
+      display: inline-block;
+      margin: 0.2rem .6rem .2rem 0;
+      padding: 0
     }
   }
 
   dl {
-    padding: 0;
-    margin: 0;
     font-size: 0.9rem;
     line-height: 0.8rem;
+    margin: 0;
+    padding: 0;
 
-    dt, dd {
-      padding: 0;
-      margin: 0;
+    dt,
+    dd {
       display: inline-block;
+      margin: 0;
+      padding: 0;
     }
 
     dt {
@@ -112,9 +113,9 @@ article.clinical-allergies {
       padding-left: 0.2rem;
 
       &.date {
-        font-weight: normal;
-        font-style: italic;
         color: $muted-dark-grey;
+        font-style: italic;
+        font-weight: normal;
       }
 
       &.empty {
@@ -139,10 +140,10 @@ article.clinical-allergies {
       li {
         background-color: $nhs-orange;
         color: $white;
-        margin: 0 .3rem 0 0;
         display: inline-block;
-        padding: 0 .4rem;
+        margin: 0 .3rem 0 0;
         margin: 0.1rem 0.3rem 0.2rem 0;
+        padding: 0 .4rem;
 
         &:hover {
           background-color: darken($nhs-orange, 5);
@@ -165,8 +166,8 @@ article.clinical-allergies {
           }
 
           a {
-            color: $white;;
-            border-bottom: 1px dotted $white
+            border-bottom: 1px dotted $white;;
+            color: $white
           }
 
           .date {
@@ -190,8 +191,8 @@ article.clinical-allergies {
         .date,
         .author,
         .actions {
-          font-style: italic;
           border-left: 1px solid $winter-sky;
+          font-style: italic;
           white-space: nowrap;
 
           .fa,
@@ -205,8 +206,8 @@ article.clinical-allergies {
         }
 
         .actions {
-          padding-right: .1rem;
           padding-left: .6rem;
+          padding-right: .1rem;
         }
       }
     }