renalware-core 2.0.46 → 2.0.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 732d240382d52f901ed4a804957ec8e0292e26488815f741621e14a970d15e23
-  data.tar.gz: 6cf0e31ee2963a78d8aa91b9998f5081fb390fcb15bb80a1300d16507b283743
+  metadata.gz: 3ceaae4c4c26c671caa4da27416d96cc43315b50219b3982bae000496fef512c
+  data.tar.gz: ce820d00e37efabd91cd73048d9dc0f7291934405a13efec313a210c22deff7c
 SHA512:
-  metadata.gz: d066affb2c30cc96a351589326374ae2405b9fc961bd5b01417a042033dbfaf35837dccfb988a4da6a07e16f8f939f85ce90244f85aac246801ceed8c3f6eb46
-  data.tar.gz: 639120743e01a18283491366adb983c4647ffa97efd8408b11d0a259883a2b98e2e4cb27d347cd40dc28eff7228b1cfd6a15d69a15138f15957813c6846679fb
+  metadata.gz: 3be41bddd11e27dee28f68f622c82c1b86a3c1c63b914796545734086e3ffaa666841e2e7b83b3f43359c46670c49cb162bf1fce7071ddbbaf78e3b8605ab9b7
+  data.tar.gz: 29d06725b86f2bed93d794278f605f6af9f0298f03f9b87d00c3a3922e502c26ac4c4add04b44b00f1948034991e847f597dfde16ddc488c18b0bffb2c46d14f

data/README.md

@@ -120,20 +120,15 @@ delayed_job logs to its own log. To see the output:
 
 On a Mac:
 
-```
-brew install chromedriver
-gem install chromedriver-helper
-chromedriver-update
-```
+- Download chromedriver from eg [here](https://chromedriver.storage.googleapis.com/index.html?path=2.38/)
+- Unzip and place in location in your PATH eh `/usr/local/bin`
+- If you have chromedriver errors it maybe your installed version of Chrome is not
+compatible your chromedriver version. In this case check your versions with
 
-If you have chromedriver errors it maybe your installed version of Chrome is not
-compatible your chromedriver version.
-
-In this case check your versions
 ```
 chromedriver -v
 chrome -v
-``
+```
 and consult the driver release notee eg for [2.38](https://chromedriver.storage.googleapis.com/2.38/notes.txt)
 to check compatibility
 
@@ -220,7 +215,7 @@ To make awesome_print the default formatter in irb, add the following to `~/.irb
     require "awesome_print"
     AwesomePrint.irb!
 
-#### Docker - WIP!
+#### Docker -  WIP!
 
 ```
 docker build -t renalware .

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

@@ -14,4 +14,41 @@ $(document).ready(function(){
       $.post(invocation_url);
     }
   });
+
+
+  // Adapted from https://alligator.io/js/copying-to-clipboard/
+  // When a user clicks on a .clipboardable, copy the contents to the clipboard
+  // and toggle a 'success' class for shot while to provide visual feedback.
+  /*
+  Have disabled this for now until we can get the UI a little better. Atm if the user
+  drags to select the text, we remove their selection here - a bit confusing for them.
+  We maybe should highlight the element text on a click and then copy, but leave the
+  text highlighted so the usr can manually copy if they don't realise it has been done for them.
+  And allow them to highlight manually. Or provide a Copy button which pops up or something.
+
+  $(".clipboardable").on('click', function(e) {
+    var selection = window.getSelection();
+    var range = document.createRange();
+    range.selectNodeContents(this);
+    selection.removeAllRanges();
+    selection.addRange(range);
+
+    console.log(range);
+
+    try {
+      document.execCommand('copy');
+      selection.removeAllRanges();
+
+      var original = this.textContent;
+      this.classList.add('success');
+
+      setTimeout(() => {
+        this.classList.remove('success');
+      }, 1200);
+    } catch(e) {
+      // for now do nothing as this is not a crucial error
+      // but we could display a js modal error dialog
+    }
+  });
+  */
 });

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

@@ -9,9 +9,9 @@ $(document).ready(function(){
     }
   });
 
-
-  $("dd").each(function(){
-    var $href = $(this).find('a').attr('href');
+  // Auto select the active tab based on the url, unless the subnav has the no-js-selection class
+  $(".sub-nav:not('.no-js-selection') dd").each(function(){
+    var $href = $(this).find("a").attr('href');
     if ($href === window.location.pathname) {
       $(this).addClass('active');
     }

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

@@ -61,6 +61,8 @@ $drug-type-default-colour: none;
 $drug-type-esa-colour: #FFFF99;
 $drug-type-immunosuppressant-colour: #CCFeFF;
 
+$tab-border-color: $off-white;
+
 // Patient header/banner
 $patient-header-muted-color: #777;
 $patient-header-icon-color: #bbb;

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

@@ -123,6 +123,7 @@ $alert-color: lighten($original-alert-color, 10%);
 // $info-color: #a0d3e8;
 
 $white:         #FFFFFF;
+$nearly-white:  #FEFEFE;
 $ghost:         #FAFAFA;
 $snow:          #F9F9F9;
 // $vapor:        #F6F6F6;

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

@@ -0,0 +1,12 @@
+/* After a click and copied to clipboard */
+
+.clipboardable {
+  transition: background-color .1s ease-in;
+  transition: background-color .3s ease-out;
+  border: solid 1px transparent;
+  border-radius: 3px;
+
+  &.success {
+    background-color: $nhs-light-blue;
+  }
+}

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

@@ -154,6 +154,9 @@ ul.provider {
       padding: 0;
       text-transform: uppercase;
 
+      // Don't highlight the dt if a user double clicks/highlights the adjacent dd
+      user-select: none;
+
       @media print, #{$large-up} {
         font-size: .7em;
       }
@@ -165,6 +168,12 @@ ul.provider {
       font-size: 1em;
       margin: 0 .5em 0 .1em;
 
+      // When the user clicks the content, select it all
+      &.selectable {
+        user-select: all;
+        -ms-user-select: all;
+      }
+
       &.name {
         display: inline;
         font-size: 1.4em;

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

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

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

@@ -139,10 +139,38 @@ section.display {
 }
 
 .non-patient-page {
-  padding-top: 1rem;
   padding-bottom: 3rem;
 
+  .non-patient-page-header {
+    margin: 0;
+    padding:0;
+    margin-bottom: .5rem;
+
+    &.with-tabs {
+      border-bottom: 1px solid $tab-border-color;
+      margin-bottom: 1.5rem;
+
+      .page-heading {
+        margin-bottom: .8rem;
+      }
+    }
+  }
+
+  ul, dl {
+    float: none;
+    display: block;
+    margin-bottom: 0;
+  }
+
+  .sub-nav {
+    top: 1px;
+    position: relative;
+  }
+
   .page-heading {
-    margin-bottom: 0.5rem;
+    padding: 1.4rem 0 .7rem;
+    margin: 0;
+    float: left;
+    clear: both;
   }
 }

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

@@ -201,7 +201,7 @@ dd.patient-name {
 }
 
 .sub-nav {
-  background-color: $white;
+  background-color: transparent;
   float: left;
   margin: 0 0 1rem;
   padding: 0;
@@ -212,35 +212,44 @@ dd.patient-name {
   margin: 0 0.25rem 0 0;
 }
 
+// Used when tabs are local to an area of a page and not inside a page-heading
+// Adds a border under the tabs, and the tabs within must be offset down by 1px
+// so that the active one seems to have no bottom border.
+.tabs-container {
+  border-bottom: 1px solid $tab-border-color;
+  float: left;
+  width: 100%;
+  clear: both;
+  margin-bottom: 1rem;
+
+  .sub-nav {
+    margin: 0;
+    position: relative;
+    top: 1px;
+  }
+}
+
 .sub-nav dd a {
-  background-color: $off-white;
-  border-top-left-radius: 3px;
-  border-top-right-radius: 3px;
-  border-bottom-left-radius: 0;
-  border-bottom-right-radius: 0;
-  color: $link-colour;
   display: block;
-  padding: 0.2rem 0.5rem;
-  text-decoration: underline;
+  color: $monsoon;
+  background-color: transparent;
+  text-decoration: none;
+  white-space: nowrap;
+  border: solid transparent;
+  border-width: 3px 1px 1px;
+  border-radius: 3px 3px 0 0;
+  padding: 0.3rem 1.3rem;
 }
 
 .sub-nav dd a:hover {
-  background-color: $link-colour;
-  color: $white;
+  color: $dark-grey;
 }
 
 .sub-nav dd.active a {
-  background-color: $white;
-  border-top: 1px solid $table-border-colour;
-  border-right: 1px solid $table-border-colour;
-  border-left: 1px solid $table-border-colour;
-  border-top-left-radius: 3px;
-  border-top-right-radius: 3px;
-  border-bottom-left-radius: 0;
-  border-bottom-right-radius: 0;
+  border-color: $nhs-orange $tab-border-color transparent;
   color: $dark-grey;
-  padding: 0.2rem 0.5rem;
-  text-decoration: none;
+  background-color: $white;
+  padding: 0.3rem 1.3rem;
 }
 
 .sub-nav dd.active {

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

@@ -46,11 +46,12 @@ table {
   border-collapse: collapse;
 
   thead {
+    background-color: transparent;
     border-bottom: solid 1px $letter-preview-background-colour;
-    border-top: solid 1px $letter-preview-background-colour;
+    //border-top: solid 1px $letter-preview-background-colour;
 
     a {
-      color: $oil;
+      color: $muted-dark-grey;
       text-decoration: underline;
     }
 
@@ -244,9 +245,14 @@ table {
       min-width: 12rem;
     }
 
+    &.col-width-medium-plus {
+      width: 15rem;
+      min-width: 14rem;
+    }
+
     &.col-width-large {
       width: 20rem;
-      min-width: 15rem;
+      min-width: 17rem;
     }
 
     &.column-6-width {
@@ -269,6 +275,11 @@ table {
       width: 13rem;
     }
 
+    &.col-width-17 {
+      width: 17rem;
+      min-width: 17rem;
+    }
+
     &.at-least {
       width: auto;
     }
@@ -389,3 +400,7 @@ table {
     }
   }
 }
+
+table tr.even, table tr.alt, table tr:nth-of-type(even) {
+  background: $table-even-row-colour;
+}

data/app/controllers/renalware/accesses/plans_controller.rb

@@ -45,6 +45,7 @@ module Renalware
         Plan.transaction do
           if current_plan.present?
             return true if current_plan.identical_to?(plan) # no change, no new plan to be created
+
             current_plan.terminate_by(current_user)
           end
           plan.save!

data/app/controllers/renalware/admissions/requests_controller.rb

@@ -25,6 +25,7 @@ module Renalware
         unless request.save_by(current_user)
           return render_new(request)
         end
+
         flash.now[:notice] = success_msg_for("admission request")
       end
 

data/app/controllers/renalware/clinical/dry_weights_controller.rb

@@ -52,6 +52,7 @@ module Renalware
 
       def save_path_to_return_to
         return unless request.format == :html
+
         session[:return_to] ||= request.referer
       end
 

data/app/controllers/renalware/concerns/cache_busting.rb

@@ -15,7 +15,7 @@ module Renalware
     end
 
     def bust_cache
-      response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate"
+      response.headers["Cache-Control"] = "no-cache, no-store"
       response.headers["Pragma"] = "no-cache"
       response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
     end

data/app/controllers/renalware/events/events_controller.rb

@@ -72,6 +72,7 @@ module Renalware
 
       def save_path_to_return_to
         return unless request.format == :html
+
         session[:return_to] ||= request.path
       end
 
@@ -113,12 +114,14 @@ module Renalware
       def event_type
         return Events::Type.find(event_type_id) if event_type_id.present?
         return Events::Type.find_by!(slug: event_type_slug) if event_type_slug.present?
+
         Events::Type.new
       end
 
       def event_type_id
         @event_type_id ||= begin
           return event_params[:event_type_id] if params[:events_event]
+
           params[:event_type_id]
         end
       end

data/app/controllers/renalware/hd/diary_slots_controller.rb

@@ -152,6 +152,7 @@ module Renalware
         if patient_ids.length > 1
           raise ArgumentError, "More than one id submitted in patient_id[] : #{patient_ids}"
         end
+
         patient_ids.first
       end
 

data/app/controllers/renalware/hospitals/wards_controller.rb

@@ -71,7 +71,7 @@ module Renalware
       end
 
       def ward_params
-        params.require(:ward).permit(:code, :name)
+        params.require(:ward).permit(:code, :name, :active)
       end
     end
   end

data/app/controllers/renalware/letters/base_controller.rb

@@ -3,6 +3,10 @@
 module Renalware
   module Letters
     class BaseController < Renalware::BaseController
+      def patient
+        Letters.cast_patient(super)
+      end
+
       private
 
       def load_patient

data/app/controllers/renalware/letters/formatted_letters_controller.rb

@@ -34,11 +34,16 @@ module Renalware
         LetterPresenterFactory.new(letter)
       end
 
+      # Here we are jsut printing an ahoc letter for manual stuffing so we pass in
+      # an argument to prompt adhic CSS to be included so for example the CCs at the bottom of the
+      # letter will render with more padding. See LetterPresenter
       def render_pdf(letter)
-        send_data(PdfRenderer.call(letter),
-                  filename: letter.pdf_filename,
-                  type: "application/pdf",
-                  disposition: disposition)
+        send_data(
+          PdfRenderer.call(letter, adhoc_printing: true),
+          filename: letter.pdf_filename,
+          type: "application/pdf",
+          disposition: disposition
+        )
       end
 
       def render_rtf(letter)