renalware-core 2.0.24 → 2.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 144398e98d896ad11911bf67c7d3c41532a7e7d599d8e753f3ea07fa5cdd1335
-  data.tar.gz: 36f8a5016b94cfa5c67c2b79e3043e97515fb996bfb1ddacb6d960b0aac35bc5
+  metadata.gz: 30e742fd5ca6fbadf5677398c873b1a644ac00076e7da84387ba9892252496ac
+  data.tar.gz: 4a575ab8a82880f2b9e66901415c42fd118e7cd0833d986bd899553ae0dbf317
 SHA512:
-  metadata.gz: 29eb437d433f724352b58695f23453d273270c5aa4e0a3309f6509e39c76ca0589d52000fff1d417787375f353798e658c37f6fb61deb4399b995034389e948b
-  data.tar.gz: 7efd9963d89407778f3ce6d20541824a45845aaf494a3e8c43f0d89392429cb4cb42212599dc12e5acb33e46db9008e8815cf7b8a191022643042bfa04ed8c37
+  metadata.gz: db22bef034ecdcef77e77d15a524a3a924d42fec046b377ca3f666a1d7070dd9288c1e355cc540013fdf585d11f2711e1a4043e55bd84796fe97b0e2c7d129e3
+  data.tar.gz: 13ac8dd0fb46a1eb03594e8c7dce8be3ddf9bcd423fcf15faa7491c7cbedd395c03b66835fd5d082d7de65a5f3db02f727186f5eb10b1a08d0b4587dc7c1cafa

data/README.md

@@ -117,12 +117,26 @@ delayed_job logs to its own log. To see the output:
 
 ## Running tests
 
-Install PhantomJS if you don't have it already (check with `phantomjs -v`).
-Download from [here](http://phantomjs.org/download.html) of follow these instructions
+### Install chromedriver
 
-    wget -O /tmp/phantomjs.tar.bz2 http://airslie-public.s3.amazonaws.com/phantomjs-2.1.1-linux-x86_64.tar.bz2
-    tar -xjf /tmp/phantomjs.tar.bz2 -C /tmp
-    mv /tmp/phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/local/bin/phantomjs
+On a Mac:
+
+```
+brew install chromedriver
+gem install chromedriver-helper
+chromedriver-update
+```
+
+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
 
 ### RSpec unit and integration tests
 

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

@@ -43,6 +43,10 @@ html {
         min-height: 100%;
         padding-bottom: 2rem;
         overflow-y: auto;
+
+        @media print {
+          overflow-y: visible;
+        }
       }
 
       .layout-wrapper {

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

@@ -1,3 +1,14 @@
+html,
+body {
+  font-size: 10px;
+  font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
+}
+
+.page-break {
+  display:block;
+  clear:both;
+  page-break-after:always;
+}
 
 .letter-wrapper {
   &.draft, &.pendingreview {
@@ -6,3 +17,4 @@
     background-position: center center;
   }
 }
+

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

@@ -166,6 +166,10 @@ h1 {
           &.col-width-notes {
             min-width: 10rem;
           }
+
+          &.col-width-user {
+            min-width: 5rem;
+          }
         }
       }
     }

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

@@ -0,0 +1,210 @@
+
+.noprint {
+  display: none !important;
+  min-width: 0em !important;
+}
+
+.print-only {
+  display: block;
+}
+
+a,
+a:visited {
+  color: #000;
+  text-decoration: none;
+}
+
+.pdf {
+  // Header with Main title to the left and a muted subtitle to the right
+  .header {
+    h1, h2 {
+      margin-bottom: 7px;
+      margin-top: 0px;
+      line-height: 2rem;
+    }
+    h1 {
+      float: left;
+      font-size: 2rem;
+    }
+
+    h2 {
+      float: right;
+      font-size: 1.7rem;
+      line-height: 1.7rem;
+      font-weight: normal;
+      margin-top: 4px;
+    }
+
+    .muted {
+      color: #555;
+    }
+  }
+
+  table {
+    width: 100%;
+    border-collapse: collapse;
+
+    // Could make this the default pdf table style but separate class for now
+    &.spacy {
+      td,
+      th {
+        padding: 4px 0;
+      }
+    }
+
+    &.nested-table-in-order-to-prevent-orphaned-rows {
+      page-break-inside: avoid !important;
+      border-top: solid 1px #000;
+    }
+
+    tr {
+      page-break-inside: avoid;
+    }
+
+    th {
+      text-align: left;
+      padding: 4px 0;
+    }
+
+    td {
+      border-bottom: solid 1px #ddd;
+    }
+
+    td,
+    th {
+      page-break-inside: avoid;
+
+      p {
+        padding: 0;
+        margin: 0;
+      }
+    }
+  }
+
+  // This section displays a summary of applied filters as a table
+  .filter-summary {
+    clear: both;
+    margin-bottom: 8px;
+
+    table {
+      width: auto;
+    }
+
+    th, td {
+      border: none;
+    }
+
+    th {
+      padding-left: 8px;
+      padding-right: 3px;
+    }
+
+    th:first-child {
+      text-decoration: underline;
+      padding-left: 0px;
+    }
+  }
+
+  // Table helper classes copied form the main application
+  tr th,
+  tr td {
+    &.col-width-date {
+      width: 7.8em;
+
+      &.wide {
+        width: 9rem;
+      }
+    }
+
+    &.col-width-time {
+      width: 3rem;
+      min-width: 2.7rem;
+    }
+
+    &.col-width-date-time {
+      width: 9.5rem;
+      min-width: 9.3rem;
+    }
+
+    &.col-width-reference-without-prefix {
+      width: 7rem;
+      min-width: 5.5rem;
+      white-space: nowrap;
+    }
+
+    &.col-width-reference-no {
+      width: 8rem;
+      min-width: 8rem;
+      white-space: nowrap;
+    }
+
+    &.col-width-nhs-no {
+      width: 7rem;
+      min-width: 7rem;
+      white-space: nowrap;
+    }
+
+    &.col-width-bp {
+      width: 4.5rem;
+      min-width: 3.8rem;
+    }
+
+    &.col-width-toggle {
+      width: 9.7rem;
+      min-width: 9.7rem;
+    }
+
+    &.col-width-tiny {
+      width: 3rem;
+    }
+
+    &.col-width-tinyish {
+      width: 5rem;
+      min-width: 4.5rem;
+    }
+
+    &.col-width-small {
+      width: 7rem;
+      min-width: 5.1rem;
+    }
+
+    &.col-width-medium {
+      width: 12rem;
+      min-width: 10rem;
+    }
+
+    &.col-width-medium-ish {
+      width: 14rem;
+      min-width: 12rem;
+    }
+
+    &.col-width-large {
+      width: 20rem;
+      min-width: 15rem;
+    }
+
+    &.column-6-width {
+      width: 6%;
+    }
+
+    &.col-width-6 {
+      width: 6rem;
+    }
+
+    &.col-width-9 {
+      width: 9rem;
+    }
+
+    &.col-width-11 {
+      width: 11rem;
+    }
+
+    &.col-width-13 {
+      width: 13rem;
+    }
+
+    &.at-least {
+      width: auto;
+    }
+  }
+}

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

@@ -7,17 +7,35 @@ module Renalware
   module Admissions
     class ConsultsController < BaseController
       include Renalware::Concerns::Pageable
+      include Renalware::Concerns::PdfRenderable
 
       # rubocop:disable Metrics/AbcSize
       def index
         session[:consults_results] = nil if params.key?(:reset)
         query = ConsultQuery.new(params[:q])
-        consults = query.call.page(page).per(per_page)
-        authorize consults
-        render locals: {
-          consults:  CollectionPresenter.new(consults, ConsultPresenter),
-          query: query.search
-        }
+
+        respond_to do |format|
+          format.pdf do
+            consults = query.call
+            authorize consults
+            options = default_pdf_options.merge!(
+              pdf: "Admission Consults #{I18n.l(Time.zone.today)}",
+              locals: {
+                consults: CollectionPresenter.new(consults, ConsultPresenter),
+                query: query.search
+              }
+            )
+            render options
+          end
+          format.html do
+            consults = query.call.page(page).per(per_page)
+            authorize consults
+            render locals: {
+              consults: CollectionPresenter.new(consults, ConsultPresenter),
+              query: query.search
+            }
+          end
+        end
       end
       # rubocop:enable Metrics/AbcSize
 

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

@@ -10,19 +10,23 @@ module Renalware
       included do
         protected
 
+        # rubocop:disable Metrics/MethodLength
         def default_pdf_options
           {
             page_size: "A4",
             layout: "renalware/layouts/pdf",
             disposition: "inline",
+            margin: { top: 10, bottom: 10, left: 10, right: 10 },
             footer: {
               font_size: 8,
-              right: "Page [page] of [topage]"
+              right: "Page [page] of [topage]",
+              left: I18n.l(Time.zone.now)
             },
-            show_as_html: Rails.env.development? && params.key?(:debug),
+            show_as_html: render_pdf_as_html?,
             encoding: "UTF-8"
           }
         end
+        # rubocop:enable Metrics/MethodLength
 
         # Render a Liquid template loaded from the database.
         # The template may have variable place holders w.g. {{ patient.name }} and these
@@ -37,6 +41,11 @@ module Renalware
 
         private
 
+        def render_pdf_as_html?
+          Renalware.config.render_pdf_as_html_for_debugging ||
+            (Rails.env.development? || Rails.env.test?) && params.key?(:debug)
+        end
+
         # By default if no variables supplied, we insert the patient drop to allow basic patient
         # data to be accessed in the template with eg {{ patient.name }}
         # Note the has key must be a string and not a symbol.

data/app/controllers/renalware/renal/aki_alerts_controller.rb

@@ -6,17 +6,17 @@ module Renalware
   module Renal
     class AKIAlertsController < BaseController
       include Renalware::Concerns::Pageable
+      include Renalware::Concerns::PdfRenderable
 
       def index
         query = search_form.query
-        alerts = query.call.page(page).per(per_page)
+        alerts = query.call
         authorize alerts
-        render locals: {
-          alerts: alerts,
-          form: search_form,
-          search: query.search,
-          path_params: path_params
-        }
+
+        respond_to do |format|
+          format.pdf { render_index_pdf(query, alerts) }
+          format.html { render_index_html(query, alerts) }
+        end
       end
 
       def edit
@@ -35,6 +35,28 @@ module Renalware
 
       private
 
+      def render_index_pdf(query, alerts)
+        options = default_pdf_options.merge!(
+          pdf: "AKI Alerts #{I18n.l(Time.zone.today)}",
+          locals: {
+            alerts: alerts,
+            form: search_form,
+            search: query.search,
+            path_params: path_params
+          }
+        )
+        render options
+      end
+
+      def render_index_html(query, alerts)
+        render locals: {
+          alerts: alerts.page(page).per(per_page),
+          form: search_form,
+          search: query.search,
+          path_params: path_params
+        }
+      end
+
       def search_form
         @search_form ||= begin
           options = params.key?(:q) ? search_params : {}

data/app/controllers/renalware/transplants/registration_statuses_controller.rb

@@ -67,7 +67,7 @@ module Renalware
       def status_params
         params
           .require(:transplants_registration_status)
-          .permit(:started_on, :description_id)
+          .permit(:started_on, :description_id, :notes)
           .merge(by: current_user)
       end
     end