renalware-core 2.0.0.pre.beta9 → 2.0.0.pre.beta10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68224d6d74aa9596a06dcdf9d162cc14db3789d2
-  data.tar.gz: 4f9a68e60dbeb49050d5df09941a4b2837f4afda
+  metadata.gz: cf4b98d36f58e9d6071e47579e93f74fbbd1962a
+  data.tar.gz: 20ccf3340f010e6597b6e9aca874df12e11dbd69
 SHA512:
-  metadata.gz: 153b54410198ca57909984a6d8b084e9d6d87e6572624a9c2d513b584e9d28e836246a99c175a984c28af4c429a15247433fa862eac1751a8b1fce56336ef781
-  data.tar.gz: 60c84ffe3ce4f7e70bdc576660e21197410543123de89f0d939046efe0b016391e59ba1398a26b83b2908d578c70e6a3615d75ab4aeabffbfb6469a8422cf7f4
+  metadata.gz: d90ee43421f7c568b881fef3de10bdd3b8d43c7e065a09d839040362643cdd35622476cdda5ec4af6f8f1f915d51e0baa2bd77e9fa45786d7f6ff8841bfbb452
+  data.tar.gz: 7e4ab6d0cd7c007b266a0c4d1bae0eae2076b238a8bd8692f113abd66710157ee128013b7d373ae74b281d9f84e231185312ee48e890649720784ddbb964ed58

data/README.md

@@ -103,7 +103,8 @@ They all share the password `renalware`
 
 ## Running tests
 
-Install PhantomJS if you don't have it already (check with `phantomjs -v`):
+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
 
     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

data/app/assets/javascripts/renalware/application.js.erb

@@ -17,6 +17,7 @@
 //= require jquery-ui/core
 //= require jquery-ui/widgets/autocomplete
 //= require jquery-ui/widgets/sortable
+//= require jquery-ui/widgets/tabs
 //= require jquery-ui/effects/effect-highlight
 //= require dataTables/jquery.dataTables
 //= require dataTables/jquery.dataTables.foundation
@@ -54,3 +55,4 @@ window.console = window.console || { log: function() {} };
 <% if Rails.env.test? %>
   $.fx.off = true;
 <% end %>
+

data/app/assets/javascripts/renalware/dialogs.js.erb

@@ -19,10 +19,26 @@ $(document).on('opened.fndtn.reveal', '[data-reveal]', function () {
   $('.searchable_select', modal).select2();
   // If a modal is launched again, ensure the submit button is re-enabled.
   $.rails.enableFormElement($('input[data-disable-with]'));
+  // Refresh layout of foundation widgets
+  $(document).foundation('reflow');
+
+  var resizeSelect2DropDownsToFitModal = function(){
+    $('.select2', modal).css('width', "100%");
+    $('#tabs').on('tabsactivate', function(event, ui) {
+      $('.select2').css('width', "100%");
+    });
+  };
+
+  var layoutTabs = function() {
+    // Layout any JQueryUI tabs
+    $("#tabs").tabs();
+    resizeSelect2DropDownsToFitModal();
+  };
+
+  layoutTabs();
 });
 
 // If there was an error submitting a modal form, be sure to re-enable the submit button
 $(document).on('ajaxError', function(event, xhr, status, error) {
   $.rails.enableFormElement($('input[data-disable-with]'));
 });
-

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

@@ -0,0 +1,48 @@
+// Generic select2 ajax search for patients.
+// Example usage
+//   select#patient-ajax-search("data-ajax--url" => search_patients_path(format: :json))
+//
+
+var Renalware = typeof Renalware === 'undefined' ? {} : Renalware;
+
+Renalware.PatientSearch = (function() {
+
+  var initPatientSearch = function(){
+    var dropDown = $(".patient-ajax-search");
+
+    $(dropDown).select2({
+      language: {
+        inputTooShort: function(args) {
+          return $(dropDown).data("hint");
+        }
+      },
+      ajax: {
+        dataType: 'json',
+        delay: 250,
+        data: function (params) {
+          return {
+            term: params.term
+          };
+        },
+        processResults: function (data, params) {
+          return {
+            results: data
+          };
+        },
+        cache: true
+      },
+      minimumInputLength: 3
+    });
+  };
+
+  return {
+    init: function () {
+      initPatientSearch()
+    }
+  };
+})();
+
+$(document).ready(Renalware.PatientSearch.init);
+$(document).on('opened.fndtn.reveal', '[data-reveal]', function() {
+  Renalware.PatientSearch.init();
+});

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

@@ -0,0 +1,18 @@
+var Renalware = typeof Renalware === 'undefined' ? {} : Renalware;
+
+Renalware.Research = (function() {
+  var focusPatientInput = function() {
+    $('.patient-ajax-search').select2('open');
+    $('select2-patient-ajax-search-container .select2-search__field').focus();
+  };
+
+  return {
+    init: function () {
+      initDatepickersIn(".modal");
+      Renalware.PatientSearch.init();
+      focusPatientInput();
+    }
+  };
+})();
+
+$(document).on('opened.fndtn.reveal', '#study-participant-modal', Renalware.Research.init);

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

@@ -2,6 +2,7 @@
     *= require jquery-ui/core
     *= require jquery-ui/autocomplete
     *= require jquery-ui/sortable
+    *= require jquery-ui/tabs
     *= require_self
 */
 

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

@@ -52,6 +52,7 @@ $light-grey: #DDD;
 $mid-grey: #999;
 $very-light-grey: #f5f5f5;
 $error-background: $off-white;
+$almost-white: rgb(252, 252, 252);
 
 // Drug type colours
 $drug-type-default-colour: none;
@@ -73,6 +74,13 @@ $letter-state-pending-review: $nhs-orange;
 $letter-state-approved: $nhs-green;
 $letter-state-completed: $nhs-dark-green;
 
+// Renal reg missing data labels
+$renal-reg-missing-data-default: $dark-grey;
+$renal-reg-missing-data-comorbidities-at-esrf: $nhs-aqua-blue;
+$renal-reg-missing-data-prd: $nhs-orange;
+$renal-reg-missing-data-first-seen-on: $nhs-green;
+$renal-reg-missing-data-ethnicity: $nhs-dark-green;
+
 // Admission Request priority but can be used elsewhere
 $priority-urgent: $nhs-dark-red;
 $priority-high: $nhs-red;
@@ -108,6 +116,11 @@ $disabled-colour: #CCC;
 $patient-menu-icon-color: $gainsboro;
 $patient-menu-icon-hover-color: $white;
 
+// HD Diaries
+$hd-weekly-diary-colour: #ffedd4;
+$hd-weekly-diary-hover-colour: lighten($hd-weekly-diary-colour, 25);
+
+
 //
 // Lists
 //

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

@@ -0,0 +1,57 @@
+html,
+body {
+  font-size: 10px;
+  font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
+}
+
+h1 {
+  font-size: 2rem;
+}
+
+.page-break {
+  display:block;
+  clear:both;
+  page-break-after:always;
+}
+
+.noprint {
+  display: none !important;
+  min-width: 0em !important;
+}
+
+.hd-diary-pdf {
+  table {
+    width: 100%;
+    border-spacing: 0;
+    border-collapse:collapse;
+    margin-bottom: 5px;
+
+    tr {
+      page-break-inside: avoid;
+    }
+
+    th,
+    td {
+      border: solid 1px #666;
+    }
+
+    tbody {
+      th {
+        // Station heading
+        text-align: left;
+      }
+    }
+
+
+    thead {
+      background-color: #eee;
+      // No border on the diurnal period row eg AM, PM etc
+      tr:first-child {
+        th {
+          border: 0;
+          background-color: #fff;
+        }
+      }
+    }
+  }
+}

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

@@ -86,6 +86,24 @@ $column-gutter: rem-calc(20);
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
 // We use these to define default font stacks
+// Currently using the system font stack as used by wordpress/medium/github/ with the caveat that
+// the system mac font chars are too wide and we'd have to tweak the css a little, so for now have
+// promoted "Helvetica Neue" to the top of the list. Windows will still get "Segoe UI", which works
+// OK for character width.
+// iPads? Need to check.
+// 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;
+
 // $font-family-sans-serif: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
 // $font-family-serif: Georgia, Cambria, "Times New Roman", Times, serif;
 // $font-family-monospace: Consolas, "Liberation Mono", Courier, monospace;

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

@@ -37,3 +37,29 @@
     }
   }
 }
+
+.admissions-consults-table {
+  tbody tr td:last-child {
+    padding-top: 0.3rem;
+    padding-bottom: 0.3rem;
+    padding-right: 0;
+  }
+
+  td {
+    .button.dropdown {
+      padding: .2rem 2.3rem .2rem .4rem;
+      margin: 0;
+    }
+    .f-dropdown {
+      margin-left: -110px;
+
+      &.open::before,
+      &.open::after {
+        left: 160px;
+      }
+    }
+    .button-group {
+
+    }
+  }
+}

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

@@ -1,3 +1,206 @@
+
+.hd-unit-diaries {
+  .current-week {
+    background-color: $table-toggled-content-colour;
+  }
+}
+
+.which-diary {
+  color: $aluminum;
+  margin: 0 0 0.5rem;
+  padding: 0;
+
+  .master {
+  }
+
+  .weekly {
+  }
+}
+
+.diary__navigation {
+  a:first-child {
+    float: left;
+  }
+
+  a:last-child {
+    float: right;
+  }
+}
+
+.diary__key {
+  margin: auto;
+  width: 50%;
+  text-align: center;
+
+  .diary__key--master-diary {
+    background-color: $white;
+  }
+
+  .diary__key--weekly-diary {
+    background-color: $hd-weekly-diary-colour;
+  }
+
+  .title {
+    display: inline-block;
+    font-size: 1.1rem;
+    color: $dark-grey;
+  }
+
+  ul {
+    list-style: none;
+    display: inline-block;
+
+    li {
+      display: inline;
+      margin: 0 0.1rem;
+      padding: 0.2rem 0.5rem;
+      font-size: 0.9rem;
+      border: solid 1px $mid-grey;
+    }
+  }
+}
+
+.diary {
+
+  .diary__period {
+    margin-bottom: 1.5rem;
+  }
+
+  header {
+    text-align: center;
+    margin-bottom: 1rem;
+
+    h1, h2 {
+      font-size: 1.6rem;
+      font-weight: normal;
+      display: inline;
+      margin-right: 1rem;
+
+      &:last-child {
+        color: $dark-grey;
+      }
+    }
+  }
+
+  h2 {
+    color: $mid-grey;
+  }
+
+  h3 {
+    font-size: 1.5rem;
+    color: $dark-grey;
+  }
+
+  tr {
+    &:nth-of-type(even) {
+      background: $white;
+    }
+  }
+
+  thead {
+    border: 0;
+
+    tr,
+    tr:nth-of-type(even) {
+      background-color: $smoke;
+
+      th {
+        text-align: center;
+        border-color: $smoke;
+
+        h3 {
+          margin: 0;
+          padding: 0;
+        }
+      }
+    }
+  }
+
+  tbody {
+    th {
+      border-left: 5px solid $white;
+    }
+
+    tr:hover {
+      th {
+        border-left: 5px solid $dark-grey;
+      }
+    }
+  }
+
+
+  .diary__button {
+    white-space: nowrap;
+    margin: 0;
+    padding: 0.5rem;
+    background-color: transparent;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width: 100%;
+    text-align: center;
+    display: inline-block;
+    white-space: nowrap;
+    font-size: 0.9rem;
+  }
+
+  td {
+    padding: 0;
+    border: 1px solid $light-grey;
+    text-align: center;
+    background-color: $white;
+
+    // Creates a red triangle top left. Some work to do overlaying cell.
+    &.infected-patient {
+      div {
+        width: 0;
+        height: 0;
+        position: absolute;
+        border-style: solid;
+        border-width: 2rem 2rem 0 0;
+        border-color: $nhs-red transparent transparent transparent;
+      }
+    }
+
+    &:empty {
+      background-color: $light-grey;
+    }
+
+    &:hover {
+      border-color: $dark-grey;
+    }
+
+    &[data-weekly] {
+      background-color: $hd-weekly-diary-colour;
+
+      a {
+        color: $dark-grey;
+      }
+
+      .diary__button:hover {
+        background-color: $hd-weekly-diary-hover-colour;
+      }
+    }
+
+    &[data-master] {
+
+      &:hover {
+        background-color: $almost-white;
+      }
+
+      .diary__button:hover {
+        background-color: $almost-white;
+      }
+    }
+
+    &[data-master] {
+      background-color: $white;
+      a {
+       color: $dark-grey;
+      }
+    }
+  }
+}
+
 // Start CSS-only toggle of full HD Profile
 label#toggle-full-hd-profile {
   color: $link-colour;