renalware-core 2.0.0.pre.beta7 → 2.0.0.pre.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45b6a3aae38e2bb5cf1f105577622755367bdabb
-  data.tar.gz: cf3152a078fcca9432a71205f8c6272499b42d8c
+  metadata.gz: 48da8a752afcae1698bfbac69a302d09fdbdc138
+  data.tar.gz: 75555d147b8c89f45db9520c53f3f7396f4aa4ae
 SHA512:
-  metadata.gz: 6bb61647bfbb4cf91c7e45138c165dc7a8d38c0205c2d4541dee5f32e8dc45663b9a8ac16e25e11ef73e33d2743674a1797f3914ddcf3e6bd1bed342de6151cd
-  data.tar.gz: f8a21c784e7394d2ae5fb9bbfa215bbe4a0d5e09a135b9012a522b258cf8418c0bc182a8c00a419fa27cae01f178f68d9d1865d0fc89edc860629d849e0650f8
+  metadata.gz: 4ae47acd62d54ce91497f923e8b47a05da642adff28b677c9ed9227e512038ed2d6c7f08df8c0a20b55b12f0b758cce0b9d827f64190f8bccb6a1936b5940c76
+  data.tar.gz: 14e910d6d6c74efa0a60417b6ec21053d0a81d52dacb0ce441078feba353fc2137c01f681777871526469317e856b57bc1460cfe631dd58d38b8585320b6854b

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

@@ -0,0 +1,3 @@
+$(function() {
+  $(".searchable_select").select2();
+});

data/app/assets/javascripts/renalware/select2-ajax-search.js

@@ -0,0 +1,86 @@
+// Generic select2 ajax autocomplete search using Select2
+// Example usage (slim):
+//   select.select2-ajax-search(
+//     data: {
+//       "ajax--url" => search_patients_path(format: :json),
+//       "default-value" => {id: 23, text: "CROSBY, Bing (1234567913)",
+//       "placeholder" => "Start entering the last name (min. 3 characters)"
+//     }
+//   )
+//
+//
+// For default value to be loaded into the select2 correctly,
+// the select  must have a data-value attribute which is a hash in the format
+// that would also be returned from the api eg
+//   = f.input :x, data: {
+//      "default-value" => {id: 23, text: "WRIGHT, Katie (1234567913)",
+//      "ajax--url" => "/patients/search.json"
+//   }
+var Renalware = typeof Renalware === 'undefined' ? {} : Renalware;
+
+Renalware.AjaxSearch = (function() {
+
+  function processData(data) {
+    // Note that the json api already formats the data as id: and text: so there
+    // is nothing to do here, other than wrap it in a hash, but if that changes use something
+    // like this to map the json objects into the {id:, text:} objects select2 expects.
+    //   var mapdata = $.map(data, function (obj) {
+    //     obj.id = obj.id;
+    //     obj.text = obj.text;
+    //     return obj;
+    //   });
+    return { results: data };
+  }
+
+  var initAjaxSearch = function(){
+
+    $(".select2-ajax-search").each(function (index, element) {
+      var item = $(element);
+
+      // If there is a default item to display in the select2, wrap it in an array
+      // and we'll load it in the initial data
+      var defaultSelectedItem = [$(item).data("default-value")];
+
+      // A place holder is required if you want to use the X button and allowClear to clear
+      // the selection.
+      var placeholder = $(item).data("placeholder") || "Start typing (min. 3 characters)";
+
+      $(item).select2({
+        allowClear: true,
+        placeholder: placeholder,
+        ajax: {
+          dataType: 'json',
+          delay: 250,
+          processResults: processData,
+          cache: false
+        },
+        data: processData(defaultSelectedItem).results,
+        minimumInputLength: 3,
+        escapeMarkup: function (m) { return m; }
+      })
+    });
+
+    // When the select is cleared using the X link, it does not automatically remove any selected
+    // <options>s from the <select> (you can see this e.g. in Chrome tools). So we have to
+    // pragmatically do this - and using a timeout prevents clashing with the select2 clear
+    // mechanism.
+    $('.select2-ajax-search').on('select2:unselect', function (e) {
+      var _this = $(this);
+      var removeRedundantOptionFromSelect = function() {
+        $(_this).html('<option></option>').trigger('change');
+      }
+      setTimeout(removeRedundantOptionFromSelect, 200);
+    });
+  };
+
+  return {
+    init: function () {
+      initAjaxSearch()
+    }
+  };
+})();
+
+$(document).ready(Renalware.AjaxSearch.init);
+$(document).on('opened.fndtn.reveal', '[data-reveal]', function() {
+  Renalware.AjaxSearch.init();
+});

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

@@ -24,8 +24,19 @@ function initSortables() {
           url: $(this).data("rel"),
           dataType: 'json',
           data: $(this).sortable("serialize"),
-          success: function() {
+          success: function(sortedArrayOfModelIds) { // eg ["4", "3", "1", "2"]
             $(elem).effect("highlight", {}, 1000);
+            // If the the sorted element and its siblings have a child element with a
+            // .sortable-position-for-model-id-X class, update the content of each
+            // with the new position returned from the server.
+            // This lets us display the new sort order position eg for each row in a table
+            // without having to reload all the sortables.
+            var parent = $(elem).parent(".sortables")
+            for (var position = 0; position < sortedArrayOfModelIds.length; position++) {
+              modelId = sortedArrayOfModelIds[position];
+              var sortable = $(".sortable-position-for-model-id-" + modelId, parent);
+              $(sortable, parent).html(position + 1);
+            };
           }
         });
       }

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

@@ -47,6 +47,7 @@ $white: #FFF;
 $off-white: #EEE;
 $dark-grey: #222;
 $muted-dark-grey: #555;
+$winter-sky: #AAA;
 $light-grey: #DDD;
 $mid-grey: #999;
 $very-light-grey: #f5f5f5;
@@ -66,13 +67,18 @@ $patient-header-bg-color: $nhs-blue;
 $bookmark-urgent-colour: #FFFFC8;
 
 // Letter states
-
 $letter-state-unknown: $mid-grey;
 $letter-state-draft: $nhs-aqua-blue;
 $letter-state-pending-review: $nhs-orange;
 $letter-state-approved: $nhs-green;
 $letter-state-completed: $nhs-dark-green;
 
+// Admission Request priority but can be used elsewhere
+$priority-urgent: $nhs-dark-red;
+$priority-high: $nhs-red;
+$priority-medium: $nhs-warm-yellow;
+$priority-low: $nhs-green;
+
 // Modals
 $max-modal-height: 600px;
 

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

@@ -0,0 +1,39 @@
+#admissions-request-modal {
+  .admissions-request-patient {
+    margin-bottom: 1rem;
+  }
+}
+
+.admissions_requests {
+
+   td.priority {
+    span {
+      @include badge;
+    }
+  }
+
+  tr.priority-urgent {
+    td.priority span {
+      background-color: $priority-urgent;
+    }
+  }
+
+
+  tr.priority-high {
+    td.priority span {
+      background-color: $priority-high;
+    }
+  }
+
+  tr.priority-medium {
+    td.priority span {
+      background-color: $priority-medium;
+    }
+  }
+
+  tr.priority-low {
+    td.priority span {
+      background-color: $priority-low;
+    }
+  }
+}

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

@@ -1,4 +1,16 @@
 
+.electronic-ccs {
+  ul.actions {
+    list-style: none;
+    text-align: right;
+
+    .button {
+      padding: 0.4rem .6rem;
+      margin: 0.3rem 0 0.2rem 0;
+    }
+  }
+}
+
 .letter-preview-admin {
   margin-top: -0.3em;
   padding-top: 10px;

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

@@ -32,10 +32,6 @@
       font-weight: bold;
       margin: 0 0 0.5rem;
     }
-
-    .body {
-
-    }
   }
 
   h2 {

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

@@ -0,0 +1,12 @@
+@keyframes highlight {
+  0% {
+    background: $nhs-yellow
+  }
+  100% {
+    background: none;
+  }
+}
+
+.post-action-highlight {
+  animation: highlight 1.5s;
+}

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

@@ -1,3 +1,47 @@
+.modal {
+  .modal__header {
+    border-bottom: solid 1px $winter-sky;
+    margin-bottom: 10px;
+
+    h1, h2 {
+      margin: 0 0 0.5rem 0;
+      font-size: 1.3rem;
+      color: $dark-grey;
+    }
+
+    .reveal-modal-close {
+      position: absolute;
+      top: 0.3rem;
+      right: 0.8rem;
+      font-size: 1.5rem;
+      color: $winter-sky;
+      padding: 0.2rem;
+      font-weight: normal;
+
+      i {
+        padding-right: 5px;
+      }
+    }
+  }
+
+  .modal__body {
+    /* remove excessive l and r padding in modals */
+    .row {
+      margin-left: 0;
+      margin-right: 0;
+      max-width: 100%;
+
+      .columns {
+        padding-left: 0;
+        padding-right: 0;
+      }
+    }
+  }
+
+  .modal__footer {
+  }
+}
+
 .modal-show {
   position: relative;
   background: $oil;

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

@@ -93,6 +93,10 @@ table {
 
     &:last-child {
       border-right: 0;
+
+      &.actions {
+        text-align: right;
+      }
     }
   }
 
@@ -112,6 +116,8 @@ table {
       min-width: 15rem;
       max-width: 20rem;
     }
+
+
   }
 
   tr th,

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

@@ -0,0 +1,100 @@
+require "renalware/admissions"
+
+module Renalware
+  module Admissions
+    class RequestsController < BaseController
+      include Renalware::Concerns::Pageable
+
+      def index
+        requests = Request.ordered.all.page(page).per(per_page)
+        authorize requests
+        render locals: { requests: requests }
+      end
+
+      def new
+        request = Request.new(patient: patient)
+        authorize request
+        render_new(request)
+      end
+
+      def create
+        request = Request.new(request_params)
+        authorize request
+        unless request.save_by(current_user)
+          return render_new(request)
+        end
+        flash.now[:notice] = success_msg_for("admission request")
+      end
+
+      def edit
+        request = find_request
+        authorize request
+        render_edit(request)
+      end
+
+      def update
+        request = find_request
+        authorize request
+        request.by = current_user
+
+        if request.update(request_params)
+          flash.now[:notice] = success_msg_for("admission request")
+          render locals: { request: request }
+        else
+          render_edit(request)
+        end
+      end
+
+      def destroy
+        request = find_request
+        authorize request
+        request.destroy!
+        flash.now[:notice] = success_msg_for("admission request")
+        render locals: { request_id: request_id }
+      end
+
+      def sort
+        authorize Request, :sort?
+        ids = params["admissions_request"]
+        Request.sort(ids)
+        render json: ids
+      end
+
+      private
+
+      def patient
+        Patient.find(params[:patient_id])
+      end
+
+      def render_new(request)
+        render :new, locals: {
+          request: request,
+          reasons: RequestReason.ordered.pluck(:description, :id),
+          hospital_units: Hospitals::Unit.ordered.pluck(:name, :id)
+        }, layout: false
+      end
+
+      def render_edit(request)
+        render :edit, locals: {
+          request: request,
+          reasons: RequestReason.ordered.pluck(:description, :id),
+          hospital_units: Hospitals::Unit.ordered.pluck(:name, :id)
+        }, layout: false
+      end
+
+      def find_request
+        Request.find(request_id)
+      end
+
+      def request_id
+        params[:id]
+      end
+
+      def request_params
+        params
+          .require(:admissions_request)
+          .permit(:patient_id, :reason_id, :notes, :hospital_unit_id, :priority)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,6 @@
+class Renalware::Devise::PasswordsController < ::Devise::PasswordsController
+  helper Renalware::ApplicationHelper
+  include Renalware::Concerns::DeviseControllerMethods
+
+  layout "renalware/layouts/application"
+end

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

@@ -0,0 +1,81 @@
+require_dependency "renalware/letters"
+require "collection_presenter"
+
+module Renalware
+  module Letters
+    class ElectronicReceiptsController < BaseController
+      include Renalware::Concerns::Pageable
+
+      # PATCH
+      def mark_as_read
+        authorize receipt
+        receipt.update(read_at: Time.zone.now)
+        render locals: {
+          receipt: ElectronicReceiptPresenter.new(receipt),
+          layout: false
+        }
+      end
+
+      # GET all unread electronic CCs
+      def unread
+        render_receipts(received_receipts.unread)
+      end
+
+      # GET all read electronic CCs
+      def read
+        render_receipts(received_receipts.read)
+      end
+
+      # GET all electronic CCs sent by the current user
+      def sent
+        render_receipts(sent_receipts)
+      end
+
+      private
+
+      def render_receipts(receipts)
+        patient_filter = Patients::SearchFilter.new(search_term, request)
+        receipts = receipts.joins(letter: [:patient])
+        receipts = patient_filter.call(receipts).ordered.page(page).per(per_page)
+        authorize receipts
+
+        render locals: {
+          receipts: present_receipts(receipts),
+          search_form: patient_filter.search_form
+        }
+      end
+
+      def build_search_form_object
+        Patients::SearchForm.new(
+          term: search_term,
+          url: request.path
+        )
+      end
+
+      # def filter_receipts(receipts, search_form)
+      #   matching_patients = Patients::SearchQuery.new(term: search_form.term).call
+      #   receipts.joins(letter: [:patient]).merge(matching_patients)
+      # end
+
+      def search_term
+        params.fetch(:patient_search, {}).fetch(:term, nil)
+      end
+
+      def receipt
+        ElectronicReceipt.find_by!(letter_id: params[:letter_id], id: params[:id])
+      end
+
+      def received_receipts
+        ElectronicReceipt.where(recipient_id: current_user.id)
+      end
+
+      def sent_receipts
+        ElectronicReceipt.sent_by(current_user.id)
+      end
+
+      def present_receipts(receipts)
+        CollectionPresenter.new(receipts, ElectronicReceiptPresenter)
+      end
+    end
+  end
+end