renalware-core 2.0.0.pre.rc11 → 2.0.0.pre.rc13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57dc3391a5faf70954e6f6ce4e04ccfa81b4089bcccd51c9b1e8f826554325e8
-  data.tar.gz: 153f6ce8fd7006f45d9d1a2349c0d365edcfb0effe190457c808420c921fd93f
+  metadata.gz: 12743efe3022797cbd71c4fb23984b44a284402082931ea9bbe3ab5a1f79e213
+  data.tar.gz: d32c248cd4e9deeea71825ffa7b1861799ed7dfb898907f3829ddf9774b34e19
 SHA512:
-  metadata.gz: 0473fadd4cee90562f9bb1cf86a77510fd7642fb3a25be9aff729d9b3e02ed76064eb0ee213852879c0cfabb00a819b7f6a3f3931ea26fbc26539a056a2063ec
-  data.tar.gz: 8807fe96b88c7930d1b931fb81c4571394538d7759b27c94695157b2956033063da7a9176976e977c48632ba47391a2d32f43fcf44f85c2e52b5b01e56f2775b
+  metadata.gz: e7bfa6f1841c58d694eaf9c1d57b82c2b4d3f457e4e7459b77c78804512811fcee100547ea07ba655f03d2b00ae108d6c823aad37e2d35240b3b6d6a94bee74f
+  data.tar.gz: 96257b76518db3e49489cd6784faa93fb3357fb160a4f8b8da5925a583687a208029265293277465a1765849d4d65c19d3c186cc771365a0b6286e53b3e29b11

data/README.md

@@ -214,4 +214,3 @@ docker build -t renalware .
 docker-compose run web rake db:create
 docker-compose run web rake app:db:create
 ```
-

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

@@ -15,6 +15,15 @@ Renalware.Letters = (function() {
     $("#letter-form").change(hideOrShowContactSelector);
   }
 
+  var bindOnLetterAboutToPrint = function() {
+    $(document).on("click", "table.letters .printing-pdf", function(e) {
+      var modal = $("#letter-print-modal");
+      url = $(this).data("modal-url");
+      modal.load(url).foundation('reveal', 'open');
+      true;
+    });
+  }
+
   var bindOnSalutationChange = function() {
 
     $("#letter-form").on("click", ".has_salutation", function(e) {
@@ -92,6 +101,7 @@ Renalware.Letters = (function() {
       initNewContactAsMainRecipient();
       initNewContactAsCC();
       initInsertEventNotesIntoTextEditor();
+      bindOnLetterAboutToPrint();
     }
   };
 })();

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

@@ -38,8 +38,6 @@ table.contacts tbody td{
   }
 
   td {
-    vertical-align: top;
-
     &.recipient {
       max-width: 200px;
       overflow: hidden;

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

@@ -19,20 +19,41 @@ table#observations {
     background-color: $white;
   }
 
-  td {
+  td, th {
     border: 1px solid #ddd;
     font-size: 0.8rem;
   }
 
   &.transposed {
-    tr { display: block; float: left; }
-    th, td { display: block; }
+    tr {
+      display: block; float: left;
+    }
+    th, td {
+      display: block;
+    }
   }
 }
 
 .current-observations {
   float: left;
   margin-right: 1em;
+
+  tbody {
+    td, th {
+      font-size: .9rem;
+    }
+
+    th {
+      &:first-child {
+        width: 4rem;
+      }
+    }
+    td {
+      &:last-child {
+        width: 8rem;
+      }
+    }
+  }
 }
 
 #observation-requests {

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

@@ -110,8 +110,7 @@ ul.provider {
   transition: left .2s ease 0s;
 }
 
-.patient-container .page-heading h1 {
-  font-weight: bold;
+.page-heading h1 {
   margin: 0;
   padding: 0;
 }

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

@@ -1,19 +1,4 @@
 html {
-  overflow: auto;
-
-  body {
-    overflow: hidden;
-
-    main {
-      .main-content {
-        width: 100%;
-        height: 100%;
-        overflow-y: auto;
-        position: absolute;
-        padding-bottom: 20rem;
-      }
-    }
-  }
   body.overflow {
     overflow: auto;
   }
@@ -90,6 +75,9 @@ section.display {
 }
 
 .non-patient-page {
+  padding-top: 1rem;
+  padding-bottom: 3rem;
+
   .page-heading {
     margin-bottom: 0.5rem;
   }

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

@@ -0,0 +1,43 @@
+// CSS used only in the patient layout
+html {
+  body {
+    display: flex;
+    flex-direction: column;
+
+    > header {
+      flex: 0 0 auto;
+    }
+
+    main {
+      flex: 1 1 auto;
+      display: flex;
+      height: 100%;
+      min-height: 0;
+      width: 100%;
+      position: relative;
+
+      .patient-side-nav {
+        overflow-y: auto;
+        min-height: 100%;
+        height: 100%;
+        padding-bottom: 0;
+      }
+
+      .patient-content {
+      }
+
+      .layout-wrapper {
+        padding-bottom: 3rem;
+      }
+    }
+
+    &.collapse-patient-menu .patient-side-nav {
+      margin-left: -15rem;
+      left: 0;
+    }
+
+    .full-screenable {
+      transition: margin .2s ease 0s;
+    }
+  }
+}

data/app/controllers/renalware/api/ukrdc/patients_controller.rb

@@ -19,7 +19,7 @@ module Renalware
         def patient_presenter
           patient = Renalware::Patient.find_by!(secure_id: params[:id])
           authorize patient
-          Renalware::UKRDC::PatientPresenter.new(patient)
+          Renalware::UKRDC::PatientPresenter.new(patient, changes_since: params[:changes_since])
         end
       end
     end

data/app/controllers/renalware/api/v1/medications/prescriptions_controller.rb

@@ -0,0 +1,38 @@
+require_dependency "renalware/patients"
+require_dependency "renalware/api"
+
+module Renalware
+  module API
+    module V1
+      module Medications
+        class PrescriptionsController < TokenAuthenticatedApiController
+          def index
+            render locals: {
+              patient: patient,
+              prescriptions: current_prescriptions_presenter
+            }
+          end
+
+          private
+
+          def current_prescriptions_presenter
+            CollectionPresenter.new(
+              current_prescriptions,
+              Renalware::Medications::PrescriptionPresenter
+            )
+          end
+
+          def current_prescriptions
+            Renalware::Medications::PrescriptionsQuery.new(
+              relation: patient.prescriptions.current
+            ).call
+          end
+
+          def patient
+            Patient.find_by!(secure_id: params[:patient_id])
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/renalware/drugs/drugs_controller.rb

@@ -53,10 +53,8 @@ module Renalware
       def update
         @drug = Drug.find(params[:id])
         authorize @drug
-
         if @drug.update(drug_params)
-          redirect_to drugs_drugs_path,
-            notice: t(".success", model_name: "drug")
+          redirect_to drugs_drugs_path, notice: t(".success", model_name: "drug")
         else
           flash.now[:error] = t(".failed", model_name: "drug")
           render :edit
@@ -65,9 +63,7 @@ module Renalware
 
       def destroy
         authorize Drug.destroy(params[:id])
-
-        redirect_to drugs_drugs_path,
-          notice: t(".success", model_name: "drug")
+        redirect_to drugs_drugs_path, notice: t(".success", model_name: "drug")
       end
 
       private

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

@@ -5,12 +5,30 @@ module Renalware
     class CompletedLettersController < Letters::BaseController
       before_action :load_patient
 
-      def create
-        letter = @patient.letters.approved.find(params[:letter_id])
+      # HTML GET for insertion into modal dialog
+      def new
+        render layout: false, locals: {
+          letter: letter
+        }
+      end
 
+      def create
         CompleteLetter.build(letter).call(by: current_user)
 
-        redirect_to patient_letters_letter_path(@patient, letter), notice: t(".success")
+        respond_to do |format|
+          format.html do
+            redirect_to patient_letters_letter_path(@patient, letter), notice: t(".success")
+          end
+          format.js do
+            render locals: { letter: letter }
+          end
+        end
+      end
+
+      private
+
+      def letter
+        @letter ||= @patient.letters.approved.find(params[:letter_id])
       end
     end
   end

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

@@ -9,12 +9,20 @@ module Renalware
         query = LetterQuery.new(q: params[:q])
         letters = find_and_authorize_letters(query)
 
-        render locals: {
+        locals = {
           letters: letters,
           authors: User.author.ordered,
           typists: User.ordered,
           q: query.search
         }
+        respond_to do |format|
+          format.html do
+            render locals: locals
+          end
+          format.js do
+            render locals: locals, layout: false
+          end
+        end
       end
 
       private

data/app/controllers/renalware/pathology/historical_observation_results_controller.rb

@@ -9,7 +9,7 @@ module Renalware
       def index
         observations_table = CreateObservationsGroupedByDateTable.new(
           patient: patient,
-          observation_descriptions: RelevantObservationDescription.all,
+          observation_descriptions: ObservationDescription.in_display_order,
           page: page || 1,
           per_page: 25
         ).call

data/app/controllers/renalware/pathology/recent_observation_results_controller.rb

@@ -9,7 +9,7 @@ module Renalware
       def index
         observations_table = CreateObservationsGroupedByDateTable.new(
           patient: patient,
-          observation_descriptions: RelevantObservationDescription.all,
+          observation_descriptions: ObservationDescription.in_display_order,
           page: page || 1,
           per_page: per_page || 100
         ).call

data/app/helpers/renalware/letters_helper.rb

@@ -40,5 +40,12 @@ module Renalware
         [label, state]
       end
     end
+
+    def state_options_for_receptionists
+      Letters::Letter.states.map do |state|
+        label = I18n.t(state.to_sym, scope: "enums.letter.for_receptionists.state")
+        [label, state]
+      end
+    end
   end
 end

data/app/models/concerns/renalware/patient_pathology_scopes.rb

@@ -22,7 +22,7 @@ module Renalware
     #   = sort_link(<url>, :cre_observed_at, "CRE date")
     #
     def self.extended(base)
-      %i(hgb ure cre).each do |code|
+      %i(hgb ure cre urr phos pth).each do |code|
         base.ransacker(code) { pathology_result_sort_predicate(code) }
         base.ransacker(:"#{code}_date") { pathology_date_sort_predicate(code) }
       end

data/app/models/concerns/renalware/patients_ransack_helper.rb

@@ -18,8 +18,9 @@ module Renalware
 
       private
 
-      def remove_spaces_if_nhs_number!(query)
-        query.gsub!(/\s+/, "") if nhs_number?(query)
+      def remove_spaces_if_nhs_number(query)
+        return query.gsub(/\s+/, "") if nhs_number?(query)
+        query
       end
 
       # Returns true if the argument with spaces removed is a 10 digit number
@@ -29,15 +30,16 @@ module Renalware
         index.present?
       end
 
-      def sanitize_query!(query)
-        query.strip!
-        query.tr!(",", " ")
-        query.gsub!("  ", " ")
+      def sanitize_query(query)
+        query
+          .strip
+          .tr(",", " ")
+          .gsub("  ", " ")
       end
 
       def sql_and_params(query)
-        sanitize_query!(query)
-        remove_spaces_if_nhs_number!(query)
+        query = sanitize_query(query)
+        query = remove_spaces_if_nhs_number(query)
 
         if query.include?(" ")
           [full_name_sql, full_name_params(query)]

data/app/models/concerns/renalware/personable.rb

@@ -7,7 +7,7 @@ module Renalware
         validates :family_name, presence: true
         validates :given_name,
                   presence: {
-                    unless: -> {
+                    unless: lambda {
                       defined?(skip_given_name_validation?) && skip_given_name_validation?
                     }
                   }

data/app/models/renalware/admissions/admission.rb

@@ -21,7 +21,7 @@ module Renalware
       validates :reason_for_admission, presence: true
       validates :admission_type, presence: true
 
-      belongs_to :patient
+      belongs_to :patient, touch: true
       belongs_to :hospital_ward, class_name: "Hospitals::Ward"
       belongs_to :summarised_by, class_name: "User"
       belongs_to :modality_at_admission, class_name: "Modalities::Modality"

data/app/models/renalware/admissions/consult.rb

@@ -14,7 +14,7 @@ module Renalware
         if: ->(consult){ consult.consult_site_id.blank? && consult.hospital_ward_id.blank? }
       }
 
-      belongs_to :patient
+      belongs_to :patient, touch: true
       belongs_to :consult_site, class_name: "Admissions::ConsultSite"
       belongs_to :hospital_ward, class_name: "Hospitals::Ward"
       belongs_to :seen_by, class_name: "User"

data/app/models/renalware/admissions/request.rb

@@ -8,7 +8,7 @@ module Renalware
 
       acts_as_paranoid
 
-      belongs_to :patient
+      belongs_to :patient, touch: true
       belongs_to :reason, class_name: "RequestReason"
 
       validates :patient_id, presence: true, uniqueness: true

data/app/models/renalware/clinical/body_composition.rb

@@ -7,7 +7,7 @@ module Renalware
       include PatientScope
       include Accountable
 
-      belongs_to :patient, class_name: "Renalware::Clinical::Patient"
+      belongs_to :patient, class_name: "Renalware::Clinical::Patient", touch: true
       belongs_to :assessor, class_name: "User", foreign_key: "assessor_id"
       belongs_to :modality_description, class_name: "Modalities::Description"