renalware-core 2.0.0.pre.rc13 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12743efe3022797cbd71c4fb23984b44a284402082931ea9bbe3ab5a1f79e213
-  data.tar.gz: d32c248cd4e9deeea71825ffa7b1861799ed7dfb898907f3829ddf9774b34e19
+  metadata.gz: 8437ff54e96c5fd1e3572a47a041a66a3509eb2af0fc6d03dd0aa317837520dd
+  data.tar.gz: 3246ccdebc350438ca7f44ca11dd77a50f135756e46cdbe0074ae426fb216fca
 SHA512:
-  metadata.gz: e7bfa6f1841c58d694eaf9c1d57b82c2b4d3f457e4e7459b77c78804512811fcee100547ea07ba655f03d2b00ae108d6c823aad37e2d35240b3b6d6a94bee74f
-  data.tar.gz: 96257b76518db3e49489cd6784faa93fb3357fb160a4f8b8da5925a583687a208029265293277465a1765849d4d65c19d3c186cc771365a0b6286e53b3e29b11
+  metadata.gz: 6d9a61f358ce7f94a30ea9f8b81112d545e95c12f6cebb88abda0188884b95eab2949a65c653bd8d5f03c1fe625a2cf656d8bd497b57cb872542acf88d05b921
+  data.tar.gz: 4bf9510629744b8727e7e3f6805a0364f27b23d243e460c3ffd3cfc9ffc2a808d1b43597e062ff0e34340202f6ca3b99d8c0516f90b36b064fe5e4a9e184bc1b

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

@@ -104,12 +104,12 @@ $table-border-colour: #CCC;
 $table-toggled-content-colour: #FEFFF1;
 $table-urgent-colour: $nhs-yellow;
 
-$footer-colour: #C0C0C0;
-$footer-bg-colour: #FAFAFA;
-
 $patient-menu-background-colour: #eeeeee;
 $menu-divider-colour: #E6E6E6;
 
+$footer-colour: $patient-header-muted-color;
+$footer-bg-colour:$patient-menu-background-colour;
+
 // Forms
 $form-hint-colour: #BBB;
 $disabled-colour: #CCC;

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

@@ -32,14 +32,31 @@ article.clinical-allergies {
   }
 }
 
+.lozenge {
+  padding: .2em .3rem 0 .3rem;
 
-.clinical-header {
+  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;
+      display: inline-block;
+      padding: 0;
+      margin: 0.2rem .6rem .2rem 0
+    }
+  }
+}
+
+.clinical-header,
+.research-study-participation-alerts {
   background-color: $table-border-colour;
-  padding: .2em .2em .2em .6em;
+  padding: 0em .2em .2em .6em;
 
   &.lozenge {
     background-color: $white;
-    padding: .2em .3rem;
+    padding: 0 .3rem .2em .3rem;
 
     ul {
       li {
@@ -59,7 +76,6 @@ article.clinical-allergies {
     }
   }
 
-
   ul {
     padding: 0;
     margin: 0;
@@ -104,3 +120,90 @@ article.clinical-allergies {
     }
   }
 }
+
+.research-study-participation-alerts {
+  .lozenge {
+    ul {
+      li {
+        background-color: $nhs-pink;
+        color: $white;
+      }
+    }
+  }
+}
+
+.patient-alerts {
+  &.lozenge {
+    ul {
+      margin: 0;
+
+      li {
+        background-color: $nhs-orange;
+        color: $white;
+        margin: 0 .3rem 0 0;
+        display: inline-block;
+        padding: 0 .4rem;
+        margin: 0.1rem 0.3rem 0.2rem 0;
+
+        &:hover {
+          background-color: darken($nhs-orange, 5);
+        }
+
+        &:hover,
+        span:hover {
+          color: white
+        }
+
+        &.urgent {
+          background-color: $nhs-red;
+
+          &:hover {
+            background-color: darken($nhs-red, 5);
+          }
+        }
+
+        &.research-study-participant {
+          background-color: $nhs-green;
+
+          &:hover {
+            background-color: darken($nhs-green, 5);
+          }
+
+          a {
+            color: $white;
+            border-bottom: 1px dotted $light-grey;
+          }
+        }
+
+        span {
+          padding: 0 .4rem;
+        }
+
+        .body {
+          padding-left: 0;
+        }
+
+        .date,
+        .author,
+        .actions {
+          font-style: italic;
+          border-left: 1px solid $winter-sky;
+          color: $light-grey;
+          white-space: nowrap;
+
+          .fa {
+            color: $light-grey;
+            &:hover {
+              color: $white;
+            }
+          }
+        }
+
+        .actions {
+          padding-right: .1rem;
+          padding-left: .6rem;
+        }
+      }
+    }
+  }
+}

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

@@ -92,16 +92,6 @@ ul.provider {
   display: inline-block;
 }
 
-.patient-content {
-  padding-bottom: 16rem;
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: $patient-side-nav-width;
-  overflow-y: auto;
-}
-
 .collapse-patient-menu .patient-content {
   left: 0;
 }
@@ -287,73 +277,6 @@ ul.provider {
   }
 }
 
-// Alerts
-
-.alerts {
-  table-layout: fixed;
-}
-
-.alerts--alert,
-.alerts--alert:nth-of-type(even) {
-  clear: both;
-  height: 2rem;
-  padding: 0.4em 0.2em 0.5em 0.6em;
-  background-color: $nhs-orange;
-  color: $white;
-
-  &:hover {
-    background-color: lighten($nhs-orange, 5);
-  }
-
-  td, td.actions a {
-    color: inherit;
-  }
-
-  td {
-    border: 0;
-  }
-
-  .icon {
-    width: 1.7rem;
-    padding-left: 0.4rem;
-  }
-
-  .notes {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-
-    &:before {
-      content: "Alert: ";
-    }
-  }
-
-  .author {
-    width: 15rem;
-    text-align: right;
-  }
-
-  .actions {
-    width: 3rem;
-    padding-right: 1rem;
-  }
-
-  &.urgent {
-    background-color: $nhs-red;
-
-    &:hover {
-      background-color: lighten($nhs-red, 5);
-    }
-  }
-
-  .icon {
-    @extend .fa;
-    @extend .fa-warning;
-    display: table-cell;
-  }
-}
-
-// End Alerts
 form {
   .blood-pressure {
     &.with-errors {

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

@@ -4,16 +4,76 @@ html {
   }
 }
 
+/* New flexbox layout */
+html, body {
+  height: 100%;
+}
+
+html {
+  body {
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+
+    > header {
+      flex: 0 0 auto;
+      background-color: #dcdcdc;
+    }
+
+    /* main is a wrapper about non-header content */
+    > main {
+      display: flex;
+      height: 100%;
+      min-height: 0;
+
+      > nav {
+        width: $patient-side-nav-width;
+        min-width: $patient-side-nav-width;
+      }
+
+      > .main-content {
+        position: relative; /* need this to position inner content */
+        width: 100%;
+      }
+
+      > nav,
+      > .main-content {
+        flex: 1 1 auto;
+        height: 100%;
+        min-height: 100%;
+        padding-bottom: 2rem;
+        overflow-y: auto;
+      }
+
+      .layout-wrapper {
+        padding-bottom: 3rem;
+      }
+    }
+
+    > footer {
+      flex: 0 0 auto;
+    }
+  }
+
+  /* When patient menu hidden/shown */
+  body.collapse-patient-menu nav.patient-side-nav {
+    margin-left: -15rem;
+    left: 0;
+  }
+
+  .full-screenable {
+    transition: margin .2s ease 0s;
+  }
+}
+
+/* End new flexbox layout */
+
 footer {
   background-color: $footer-bg-colour;
-  border-top: 1px solid $smoke;
+  border-top: 1px solid $light-grey;
   color: $footer-colour;
-  font-size: 12px;
-  padding: .2rem 1rem;
-  position: fixed;
-  right: 0;
-  bottom: 0;
-  left: 0;
+  font-size: .8rem;
+  padding: 0 1rem;
   text-align: right;
 }
 

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

@@ -64,14 +64,9 @@ dd.patient-name {
 
 .patient-side-nav {
   background-color: $patient-menu-background-colour;
-  padding: 0.6rem 0;
-  padding-bottom: 11rem;
-  position: absolute;
+  padding: 0.6rem 0 2rem 0.6rem;
   width: $patient-side-nav-width;
-  overflow-y: auto;
-  top: 0;
-  bottom: 0;
-  left: 0;
+  min-width: $patient-side-nav-width;
 
   hr {
     margin: 0.3rem 0 0.5rem;

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

@@ -179,7 +179,7 @@ table {
 
     &.col-width-reference-no {
       width: 8rem;
-      min-width: 7.7rem;
+      min-width: 8rem;
       white-space: nowrap;
     }
 

data/app/controllers/renalware/base_controller.rb

@@ -7,6 +7,7 @@ module Renalware
 
     before_action :set_paper_trail_whodunnit
     after_action :verify_authorized
+    after_action :track_action, except: [:has_user_timed_out]
 
     rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
 
@@ -40,6 +41,10 @@ module Renalware
       collection.page(params[:page]).per(params[:per_page] || default_per_page)
     end
 
+    def track_action
+      ahoy.track "action", request.path_parameters
+    end
+
     private
 
     # TODO: remove load_patient before_action once refactored out of other controllers.

data/app/controllers/renalware/clinics/visits_controller.rb

@@ -3,7 +3,7 @@ module Renalware
   module Clinics
     class VisitsController < BaseController
       include Renalware::Concerns::Pageable
-      PER_PAGE = 100
+      PER_PAGE = 25
 
       def index
         visits_query = VisitQuery.new(query_params)

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

@@ -15,7 +15,8 @@ module Renalware
               font_size: 8,
               right: "Page [page] of [topage]"
             },
-            show_as_html: Rails.env.development? && params.key?(:debug)
+            show_as_html: Rails.env.development? && params.key?(:debug),
+            encoding: "UTF-8"
           }
         end
 

data/app/controllers/renalware/devise/sessions_controller.rb

@@ -12,6 +12,7 @@ module Renalware
     #   regardless of how long ago they signed out, because in this instance devise removes it's
     #   entries in the session cookie.
     def after_sign_in_path_for(resource)
+      track_signin
       max_duration_of_url_memory = Renalware.config.duration_of_last_url_memory_after_session_expiry
       max_duration_has_passed = last_sign_in_at <= max_duration_of_url_memory.ago
       max_duration_has_passed ? dashboard_path : super
@@ -26,5 +27,9 @@ module Renalware
     def epoch_start
       Date.new(0)
     end
+
+    def track_signin
+      ahoy.track "signin"
+    end
   end
 end

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

@@ -0,0 +1,13 @@
+require_dependency "renalware/admin"
+
+module Renalware
+  module Letters
+    class PdfLetterCacheController < BaseController
+      def destroy
+        authorize [:renalware, :admin, :cache], :destroy?
+        Renalware::Letters::PdfLetterCache.clear
+        redirect_to admin_cache_path, notice: "Cache successfully cleared"
+      end
+    end
+  end
+end

data/app/controllers/renalware/pd/regimes_controller.rb

@@ -78,7 +78,7 @@ module Renalware
           :start_date, :end_date, :treatment, :assistance_type, :type,
           :add_hd, :tidal_full_drain_every_three_cycles,
           :tidal_indicator, :tidal_percentage, :no_cycles_per_apd,
-          :apd_machine_pac, :therapy_time, :fill_volume, :delivery_interval,
+          :apd_machine_pac, :dwell_time, :therapy_time, :fill_volume, :delivery_interval,
           :system_id, :last_fill_volume, :additional_manual_exchange_volume,
           bags_attributes: [
             :id, :regime_id, :bag_type_id, :volume, :role, :capd_overnight_bag, :per_week,