renalware-core 2.0.0.pre.rc9 → 2.0.0.pre.rc10

data/config/locales/renalware/messaging/internal/messages.en.yml

@@ -31,5 +31,3 @@ en:
             recipient: Recipient
           sent_table:
             <<: *receipts_table
-
-

data/config/locales/renalware/patient.yml

@@ -16,12 +16,10 @@ en:
         renalreg_recorded_by: Renal Reg decision recorded by
         rpv_recorded_by: RPV decision recorded by
         language: Main Language
-
     attributes:
       renalware/patient_document/history:
         alcohol:
         smoking:
-
   enumerize:
     renalware/patient:
       allergy_status:

data/config/locales/renalware/patients/side_menu.en.yml

@@ -17,6 +17,7 @@ en:
           access_profiles: Access Summary (%{count})
           prescriptions: Prescriptions (%{count})
           pathology: Pathology (%{count})
+          virology: Virology
           problems: Problems (%{count})
           modalities: Modalities (%{count})
           esrf: ESRF/Comorbidities
@@ -34,4 +35,3 @@ en:
           heading: Transplants
           donor_summary: Donor Summary
           recipient_summary: Recipient Summary
-

data/config/locales/renalware/pd/assessments.en.yml

@@ -52,7 +52,6 @@ en:
         bowel_disease: Bowel Disease?
         bowel_disease_notes: Bowel Disease Notes
         added_comments: Added Comments
-
   enumerize:
     renalware/pd/assessment/document:
       system_choice:

data/config/locales/renalware/pd/bag_types.yml

@@ -8,7 +8,6 @@ en:
           title: PD Bag Types
         edit:
           title: Edit
-
   enumerize:
     renalware/pd/bag_type:
       glucose_strength:
@@ -16,7 +15,6 @@ en:
         low: Low
         medium: Medium
         high: High
-
   activerecord:
     attributes:
       renalware/pd/bag_type:

data/config/locales/renalware/pd/regime.en.yml

@@ -8,7 +8,6 @@ en:
                 blank: "required if you have added an 'Additional manual exchange' bag"
               last_fill_volume:
                 blank: "required if you have added a 'Last fill' bag"
-
     attributes:
       renalware/pd/regime:
         glucose_volume_low_strength: Low strength
@@ -73,7 +72,6 @@ en:
           role: Type
           days_quantity: No. per week
           days: Days
-
   enumerize:
     renalware/pd/regime_bag:
       role:

data/config/locales/renalware/pd/training_sessions.en.yml

@@ -27,7 +27,6 @@ en:
         training_duration: Duration (days)
         outcome: Outcome
         training_comments: Training Comments
-
   enumerize:
     renalware/pd/training_session/document:
       outcome:

data/config/locales/renalware/renal/profile.en.yml

@@ -26,7 +26,6 @@ en:
         ischaemic_neuropathic_ulcers: Ischaemic/Neuropathic ulcers
         non_coronary_intervention: Angioplasty, vascular graft, aneurysm, stent (non-coronary)
         dementia: Dementia
-
   simple_form:
     hints:
       renal_profile:

data/config/locales/renalware/renal/registry.en.yml

@@ -8,5 +8,3 @@ en:
           comorbidities_at_esrf: Comorbidities
           first_seen_on: Date first seen
           cause_of_death: Cause of death
-
-

data/config/locales/renalware/research/study_participant.en.yml

@@ -8,4 +8,3 @@ en:
         renalware/research/study_participant:
           participant_id:
             taken: is already in this study
-

data/config/locales/renalware/snippets/snippets.en.yml

@@ -1,7 +1,6 @@
 en:
   snippets:
     insert: Insert snippet
-
   activerecord:
     attributes:
       renalware/snippets/snippet:

data/config/locales/renalware/transplants/donation.yml

@@ -1,5 +1,3 @@
-# https://github.com/plataformatec/simple_form#i18n
-
 en:
   activerecord:
     attributes:
@@ -12,7 +10,6 @@ en:
         mismatch_grade: Mismatch Grade
         paired_pooled_donation: Paired Pooled Donation
         notes: Notes
-
   enumerize:
     renalware/transplants/donation:
       relationship_with_recipient:

data/config/locales/renalware/transplants/donor_followup.yml

@@ -1,5 +1,3 @@
-# https://github.com/plataformatec/simple_form#i18n
-
 en:
   activerecord:
     attributes:
@@ -11,5 +9,3 @@ en:
         ukt_centre_code: Followup Centre Code
         dead_on: Date of Death
         notes: Notes
-
-

data/config/locales/renalware/transplants/donor_operation.yml

@@ -1,5 +1,3 @@
-# https://github.com/plataformatec/simple_form#i18n
-
 en:
   activerecord:
     attributes:
@@ -26,7 +24,6 @@ en:
         donor_returned_to_previous_general_activity_level: Donor returned to previous levels of general activity
         nb_months_to_return_to_previous_general_activity_level: Time after donation when previous levels attained
         subsequent_operation_indicator: Requirement for re-operation
-
   enumerize:
     renalware/transplants/donor_operation:
       operating_surgeon:
@@ -45,7 +42,6 @@ en:
         laparoscropic_intra: Laparoscopic operation - intraperitoneal
         laparoscropic_extra: Laparoscopic operation - extraperitoneal
         other: Other (please specify)
-
   simple_form:
     hints:
       transplants_donor_operation:

data/config/locales/renalware/transplants/donor_workup.yml

@@ -1,5 +1,3 @@
-# https://github.com/plataformatec/simple_form#i18n
-
 en:
   activemodel:
     attributes:
@@ -56,7 +54,6 @@ en:
         oral_gtt: Oral GTT
         protein_creatinine_ratio: Protein Creatinine Ratio
         sitting_blood_pressure: Sitting Blood Pressure
-
     errors:
       models:
         renalware/transplants/donor_workup_document/scores:
@@ -87,7 +84,6 @@ en:
         pooled_paired: "Pooled/paired donor"
         altruistic_non_directed: "Altruistic non-directed donor"
         other_living_non_related: "Other living non-related donor - please specify"
-
   simple_form:
     hints:
       transplants_donor_workup:

data/config/locales/renalware/transplants/recipient_followup.yml

@@ -1,5 +1,3 @@
-# https://github.com/plataformatec/simple_form#i18n
-
 en:
   activerecord:
     attributes:

data/config/locales/renalware/transplants/recipient_operation.yml

@@ -1,5 +1,3 @@
-# https://github.com/plataformatec/simple_form#i18n
-
 en:
   activerecord:
     attributes:
@@ -59,7 +57,6 @@ en:
         failure_description: Failure Description
         stent_removed_on: Stent Removal Date
         transplant_failed: Transplant failed?
-
   enumerize:
     renalware/transplants/recipient_operation:
       operation_type:
@@ -159,7 +156,6 @@ en:
         trauma_rta_pushbike: "Trauma RTA - pushbike"
         trauma_rta_unknown: "Trauma RTA - unknown type"
         unknown: "Unknown"
-
   simple_form:
     hints:
       transplants_recipient_operation:

data/config/locales/renalware/transplants/recipient_workup.yml

@@ -1,5 +1,3 @@
-# https://github.com/plataformatec/simple_form#i18n
-
 en:
   activemodel:
     attributes:
@@ -67,14 +65,12 @@ en:
         full: Full
         partial: Partial
         refused: Refused transplant
-
   simple_form:
     hints:
       transplants_recipient_workup:
         document:
           consent:
             full_name: Your name or the person who consented
-
   renalware:
     transplants:
       recipient_workups:

data/config/locales/renalware/transplants/registration.yml

@@ -1,5 +1,3 @@
-# https://github.com/plataformatec/simple_form#i18n
-
 en:
   activerecord:
     attributes:
@@ -36,7 +34,6 @@ en:
         rejection_risk: Rejection Risk
         to_be_listed_for_other_organs: "In addition to this registration, is the patient to be listed for other organ(s)?"
         transplant_type: Transplant Type
-
   enumerize:
     renalware/transplants/registration_document/organs:
       transplant_type:
@@ -45,7 +42,6 @@ en:
         pancreas: Pancreas only
         kidney_liver: Kidney and liver
         liver: Liver only
-
   simple_form:
     hints:
       transplants_registration:

data/config/locales/renalware/virology/virology.en.yml

@@ -0,0 +1,18 @@
+en:
+  renalware:
+    virology:
+      vaccinations:
+        list:
+          title: Vaccinations
+          add: Add
+      dashboards:
+        actions:
+          add_vaccination: Vaccination
+  enumerize:
+    renalware/virology/vaccination/document:
+      type:
+        hbv1: HBV Vaccination 1
+        hbv2: HBV Vaccination 2
+        hbv3: HBV Vaccination 3
+        hbv4: HBV Vaccination 4
+        hbv_booster: HBV Booster

data/config/routes.rb

@@ -415,6 +415,14 @@ Renalware::Engine.routes.draw do
       resources :required_observations, only: :index
     end
 
+    namespace :virology do
+      resource :dashboard, only: :show, path: "/dashboard"
+
+      resources :vaccinations,
+              only: [:new, :create, :edit, :update],
+              defaults: { slug: :vaccinations }
+    end
+
     # Problems
     resources :problems, controller: "problems/problems" do
       post :sort, on: :collection

data/db/migrate/20180122173922_create_virology_profiles.rb

@@ -0,0 +1,6 @@
+class CreateVirologyProfiles < ActiveRecord::Migration[5.1]
+  def change
+    create_table :virology_profiles do |t|
+    end
+  end
+end

data/db/migrate/20180213171805_add_display_order_cols_to_observation_descriptions.rb

@@ -0,0 +1,12 @@
+class AddDisplayOrderColsToObservationDescriptions < ActiveRecord::Migration[5.1]
+  def change
+    add_column :pathology_observation_descriptions,
+               :display_order,
+               :integer,
+               index: :unique
+    add_column :pathology_observation_descriptions,
+               :display_order_letters,
+               :integer,
+               index: :unique
+  end
+end

data/db/seeds/default/events/event_types.csv

@@ -5,3 +5,4 @@
 "Plasma Exchange",,
 "PD Line Change",,"pd_line_changes"
 "Investigation","Renalware::Events::Investigation","investigations"
+"Vaccination","Renalware::Virology::Vaccination","vaccinations"

data/db/seeds/default/pathology/measurement_units.csv

@@ -1,38 +1,45 @@
-"name","description"
-"%",""
-"10⁶L","10 to the 6 Litres"
-"10⁹L","10 to the 9 Litres"
-"10¹²L","10 to the 12 Litres"
-"fL",""
-"g/24h",""
-"g/dL",""
-"g/L",""
-"g/L",""
-"IU/L",""
-"mEq/24h",""
-"mEq/L",""
-"mg/24h",""
-"mg/d",""
-"mg/dL",""
-"million/mm³","million/cubic millimetres"
-"min",""
-"mIU/L",""
-"mm Hg",""
-"mm³","cubic millimetres"
-"mm/h",""
-"mmol/d",""
-"mmol/kg",""
-"mmol/L",""
-"mOsm/kg",""
-"mU/mL",""
-"ng/dL",""
-"ng/L",""
-"ng/mL",""
-"nmol/L",""
-"pg/mL",""
-"sec",""
-"U/L",""
-"µm3",""
-"μg/dL",""
-"μg/L",""
-"μmol/L",""
+"id","name","description"
+"1","%",""
+"2","10⁶L","10 to the 6 Litres"
+"3","10⁹L","10 to the 9 Litres"
+"4","10¹²L","10 to the 12 Litres"
+"5","fL",""
+"6","g/24h",""
+"7","g/dL",""
+"8","g/L",""
+"9","IU/L",""
+"10","mEq/24h",""
+"11","mEq/L",""
+"12","mg/24h",""
+"13","mg/d",""
+"14","mg/dL",""
+"15","million/mm³","million/cubic millimetres"
+"16","min",""
+"17","mIU/L",""
+"18","mm Hg",""
+"19","mm³","cubic millimetres"
+"20","mm/h",""
+"21","mmol/d",""
+"22","mmol/kg",""
+"23","mmol/L",""
+"24","mOsm/kg",""
+"25","mU/mL",""
+"26","ng/dL",""
+"27","ng/L",""
+"28","ng/mL",""
+"29","nmol/L",""
+"30","pg/mL",""
+"31","sec",""
+"32","U/L",""
+"33","µm3",""
+"34","μg/dL",""
+"35","μg/L",""
+"36","μmol/L",""
+"37","mg/mmol",""
+"38","mmol/mol",""
+"39","pmol/L",""
+"40","ratio",""
+"41","ml/min",""
+"42","pmol/h/mgHb",""
+"43","mg/L",""
+"44","μg/g",""

data/db/seeds/default/pathology/measurement_units.rb

@@ -5,6 +5,7 @@ module Renalware
 
     CSV.foreach(file_path, headers: true) do |row|
       Pathology::MeasurementUnit.find_or_create_by!(
+        id: row["id"],
         name: row["name"],
         description: row["description"]
       )

data/lib/renalware/configuration.rb

@@ -48,6 +48,20 @@ module Renalware
       ENV["FALLBACK_EMAIL_ADDRESS_FOR_TEST_MESSAGES"]
     end
     config_accessor(:ukrdc_sending_facility_name) { ENV["UKRDC_SENDING_FACILITY_NAME"] }
+
+    # A host app can override this to add/remove/re-order the clinical summary display
+    # Note these have to be strings - they mapped to constants in ClinicalSummaryPresenter.
+    config_accessor(:page_layouts) {
+      {
+        clinical_summary: %w(
+          Renalware::Problems::SummaryPart
+          Renalware::Medications::SummaryPart
+          Renalware::Letters::SummaryPart
+          Renalware::Events::SummaryPart
+          Renalware::Admissions::SummaryPart
+        )
+      }
+    }
   end
 
   def self.config

data/lib/renalware/engine.rb

@@ -65,10 +65,6 @@ module Renalware
     config.autoload_paths += Dir["#{config.root}/lib/**/"]
     config.autoload_paths += %W(#{config.root}/app/validators/concerns)
 
-    config.to_prepare do
-      Devise::SessionsController.layout "layouts/application"
-    end
-
     config.generators do |g|
       g.test_framework :rspec
       g.fixture_replacement :factory_girl, dir: "../../spec/factories"