renalware-core 2.0.62 → 2.0.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64ca193c21a9cd60df8f1db1616a04549ffd2e7dccc0a05fbcbf15844a35e37c
-  data.tar.gz: d392a058b9cb8d77312e6afd10f6093d1503022a33a31ad76d88c2bbf2b6a421
+  metadata.gz: f61f781fe0dc02b33492af2c0007e8533192f9479042bb6966884a9e09cf78ee
+  data.tar.gz: 496511b58dc7bd6e5229b0e5c8979d85b5df30300a3760ac086ced22043a6062
 SHA512:
-  metadata.gz: c9c119fad8b500a3aaacccb6efccfcb4b4c83e1d77d0271519c961ac4b4a70be0406bada8fb5b6e32041fa41cd1ce2df38c002b9d4c658bcac0e606019470b04
-  data.tar.gz: f90aacae8a824dd90e10732712fa644f356766bf36ef527e9f0ba46d24c810b7ce26ce446c73e6866947fde9d53e6e51da45aac6160cb2baf777997441b7c0ac
+  metadata.gz: b7195cf7fbde424de5e8a79c973c8216dff8582ffcf9c72fe08ba483ad92bfb6a493d0f504ba400c6bca8e5079124dd1681f20f2b97522ffa182d71b06318751
+  data.tar.gz: 11de42735fbd3daad0adde101af9f08ce730061e123f445f60918f53e5bc592a26dcd8d707d063c39df177df58cb5af844c79e15d57eb1ffc3ca3779ccf5f021

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

@@ -1,10 +1,21 @@
-table.stripeless {
-  // .session_import_success {
-  //   background-color: lightgreen !important;
-  // }
-
-  .session_import_error {
-    background-color: #ffe5e5 !important;
+.hd_transmission_logs {
+  tr {
+    &.session_import_success {
+      td.result {
+        background: lighten($nhs-light-green, 50);
+      }
+    }
+    &.file {
+      td {
+        background: $off-white;
+        border-bottom: solid 2px $charcoal;
+      }
+    }
+    &.session_import_error {
+      td.result {
+        background-color:lighten($nhs-pink, 50);
+      }
+    }
   }
 }
 

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

@@ -24,7 +24,7 @@ module Renalware
         log = TransmissionLog.find(params[:id])
         authorize log
         respond_to do |format|
-          format.xml { render xml: log.payload }
+          format.xml { render xml: log.payload, template: nil }
         end
       end
     end

data/app/validators/renalware/patients/weight_validator.rb

@@ -7,7 +7,7 @@ module Renalware
       include NumericScaleValidations
       MIN_VALUE = 5.0
       MAX_VALUE = 300.0
-      MAX_DECIMAL_PLACES = 1
+      MAX_DECIMAL_PLACES = 2
 
       def validate_each(record, attribute, value)
         return if value.blank?

data/app/views/renalware/hd/transmission_logs/index.html.slim

@@ -11,7 +11,7 @@
           th.col-width-medium Patient
           th.col-width-small Ext Session Id
           th.col-width-small Session Id
-          th.col-width-tiny Result
+          th.col-width-large Result
           th Errors
       tbody
         - logs.each do |log|
@@ -19,24 +19,37 @@
             klass = if log.parent_id.present?
                       log.session_id.present? ? "session_import_success" : "session_import_error"
                     else
-                      ""
+                      "file"
                     end
           tr(class=klass)
             td= l(log.created_at)
             td= log.direction
             td= log.format
-            td= link_to "...",
+            td
+              - if log.payload.present?
+                = link_to "...",
                         hd_transmission_log_path(log, format: :xml),
                         class: "button small_ellipsis_button",
                         target: "_blank"
             td
-              span(title=log.filepath)= log.filepath && Pathname(log.filepath).basename
+              span(title=log.filepath)
+                - filename = log.filepath && Pathname(log.filepath).basename
+                - if filename.present?
+                  i.fas.fa-file
+                  |  
+                  = filename
             td= log.patient && link_to(log.patient, patient_hd_sessions_path(log.patient))
-            td= log.external_session_id
-            th
+            td
+              - if log.parent_id.present?
+                = log.external_session_id
+              - else
+                i.fas.fa-arrow
+            td
               - if log.patient && log.session
                 = link_to log.session_id, patient_hd_session_path(log.patient, log.session)
-            td= log.result
-            td= log.error_messages.compact.uniq.join("<br>").html_safe
+            td.result
+              = log.result
+            td.result
+              = log.error_messages.compact.uniq.join("<br>").html_safe
 
     = paginate logs

data/config/locales/renalware/clinical/dry_weight.en.yml

@@ -10,7 +10,7 @@ en:
           attributes:
             weight:
               out_of_range: Must be between 5.0 and 300.0 kg
-              invalid_number: Please enter a number with up to 1 decimal place, for example 100 or 100.1
+              invalid_number: Please enter a number with up to 2 decimal places, for example 100 or 100.11
   renalware:
     clinical:
       dry_weights:

data/config/locales/renalware/hd/session.en.yml

@@ -80,7 +80,7 @@ en:
               out_of_range: Please enter a pulse between 20 and 200
             weight:
               out_of_range: Please enter a weight between 5.0 and 300.0 kg
-              invalid_number: Please enter a number with up to 1 decimal place, for example 100 or 100.1
+              invalid_number: Please enter a number with up to 2 decimal place, for example 100 or 100.11
             temperature:
               out_of_range: Please enter a temperature between 28.0 and 45.0°C
               invalid_number: Please enter a number with up to 1 decimal place, for example 37 or 37.1

data/lib/renalware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renalware
-  VERSION = "2.0.62"
+  VERSION = "2.0.63"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.62
+  version: 2.0.63
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-20 00:00:00.000000000 Z
+date: 2018-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type