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

data/spec/factories/patients/primary_care_physicians.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   sequence :gp_code do |n|
     "GP123#{n}"
   end
@@ -12,7 +12,7 @@ FactoryGirl.define do
     practitioner_type "GP"
 
     # ensures addressable_type and addressable_id work is assigned, using
-    # FactoryGirl's simple assoc method does not work
+    # FactoryBot's simple assoc method does not work
     #
     before(:create) do |primary_care_physician|
       primary_care_physician.build_address(attributes_for(:address))

data/spec/factories/patients/religions.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :patients_religion, class: "Renalware::Patients::Religion" do
     name "Christian"
   end

data/spec/factories/patients/users.rb

@@ -1,3 +1,3 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :patients_user, class: "Renalware::Patients::User", parent: :user
 end

data/spec/factories/pd/assessments.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :pd_assessment, class: "Renalware::PD::Assessment" do
     accountable
     patient

data/spec/factories/pd/bag_types.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :bag_type, class: "Renalware::PD::BagType" do
     manufacturer "Star Brand, Lucky Brand"
     description "Green–2.34"

data/spec/factories/pd/episode_types.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :episode_type, class: "Renalware::PD::EpisodeType" do
     term "De novo"
     definition "First infection."

data/spec/factories/pd/exit_site_infections.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :exit_site_infection, class: "Renalware::PD::ExitSiteInfection" do
     patient
     diagnosis_date "01/04/2015"

data/spec/factories/pd/fluid_descriptions.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :fluid_description, class: "Renalware::PD::FluidDescription" do
     description "Clear"
   end

data/spec/factories/pd/infection_organisms.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :infection_organism, class: "Renalware::PD::InfectionOrganism" do
     organism_code
     sensitivity "Sensitive to MRSA."

data/spec/factories/pd/modality_descriptions.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :pd_modality_description, class: "Renalware::PD::ModalityDescription" do
     name "PD"
   end

data/spec/factories/pd/organism_codes.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :organism_code, class: "Renalware::PD::OrganismCode" do
     code "7"
     name "Staphylococcus aureus"

data/spec/factories/pd/patients.rb

@@ -1,3 +1,3 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :pd_patient, class: "Renalware::PD::Patient", parent: :patient
 end

data/spec/factories/pd/pd_regimes.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :pd_regime, class: "Renalware::PD::Regime" do
     patient
   end

data/spec/factories/pd/peritonitis_episode_type_descriptions.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   sequence(:term) { |n| "term-#{n}" }
   factory :peritonitis_episode_type_description,
           class: "Renalware::PD::PeritonitisEpisodeTypeDescription" do

data/spec/factories/pd/peritonitis_episodes.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :peritonitis_episode, class: "Renalware::PD::PeritonitisEpisode" do
     patient
     diagnosis_date "30/01/2015"

data/spec/factories/pd/pet_adequacies.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
 
   factory :pet_adequacy_result, class: "Renalware::PD::PETAdequacyResult" do
 

data/spec/factories/pd/regime_bags.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :pd_regime_bag, class: "Renalware::PD::RegimeBag" do
     bag_type
     volume 200

data/spec/factories/pd/systems.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :apd_system, class: "Renalware::PD::System" do
     name Faker::Company.name
     pd_type "APD"

data/spec/factories/pd/training_sessions.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :pd_training_session, class: "Renalware::PD::TrainingSession" do
     accountable
     patient

data/spec/factories/pd/training_sites.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :pd_training_site, class: "Renalware::PD::TrainingSite" do
     code "HOME"
     name "Home"

data/spec/factories/pd/training_types.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :pd_training_type, class: "Renalware::PD::TrainingType" do
     name "APD Baxter"
   end

data/spec/factories/problems/problems.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :problem, class: "Renalware::Problems::Problem" do
     accountable
     description "further description of the patient problem"

data/spec/factories/renal/aki_alert_actions.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :aki_alert_action, class: "Renalware::Renal::AKIAlertAction" do
     name "IP Review"
   end

data/spec/factories/renal/aki_alerts.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :aki_alert, class: "Renalware::Renal::AKIAlert" do
     accountable
     notes "Some notes"

data/spec/factories/renal/patients.rb

@@ -1,3 +1,3 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :renal_patient, class: "Renalware::Renal::Patient", parent: :patient
 end

data/spec/factories/renal/prd_description.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :prd_description, class: "Renalware::Renal::PRDDescription" do
     code "1074"
     term "Denys-Drash syndrome"

data/spec/factories/renal/profiles.rb

@@ -1,5 +1,21 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :renal_profile, class: "Renalware::Renal::Profile" do
     prd_description
+    first_seen_on "01-01-2017"
+    comorbidities_updated_on "01-01-2017"
+
+    document {
+      {
+        comorbidities: {
+          smoking: {
+            value: "non_smoker"
+          },
+          ischaemic_heart_dis: {
+            status: "yes",
+            confirmed_on_year: "2016"
+          }
+        }
+      }
+    }
   end
 end

data/spec/factories/reporting/audits.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :audit, class: "Renalware::Reporting::Audit" do
     name "Letters Authors"
     view_name "audit_letter_authors"

data/spec/factories/research/studies.rb

@@ -0,0 +1,11 @@
+FactoryBot.define do
+  factory :research_study, class: "Renalware::Research::Study" do
+    code { SecureRandom.hex(8) }
+    description { "Description for #{code}" }
+    leader { Faker::Name.name }
+    started_on 1.year.ago
+    terminated_on nil
+    deleted_at nil
+    accountable
+  end
+end

data/spec/factories/research/study_participants.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :research_study_participant, class: "Renalware::Research::StudyParticipant" do
+    association :study, factory: :research_study
+    association :patient, factory: :patient
+    joined_on Time.zone.today
+  end
+end

data/spec/factories/shared/accountable.rb

@@ -14,7 +14,7 @@
 # However if you don't call `create` with a `by` or `*_by` arguments, the default `association` we
 # define here in this global trait ensures only one user - accountable_actor is created and assigned
 # to both created_by and updated_by. Previously each had its own `user` association and two users
-# were created each time any model (that included Accountable) was created by FactoryGirl.
+# were created each time any model (that included Accountable) was created by FactoryBot.
 # If you need to use the same user for any other attribute in a factory, you can do for instance
 #
 #     factory :audit do
@@ -24,7 +24,7 @@
 #
 #  Which create one user and assign them to updated_by, createed_by and requested_by.
 #
-FactoryGirl.define do
+FactoryBot.define do
   trait :accountable do
     transient do
       accountable_actor { by || create(:user) }

data/spec/factories/snippets/snippets.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :snippet, class: "Renalware::Snippets::Snippet" do
     title { Faker::Lorem.sentence }
     body { Faker::Lorem.paragraph }

data/spec/factories/snippets/users.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :snippets_user, class: "Renalware::Snippets::User", parent: :user do
   end
 end

data/spec/factories/system/addresses.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :address, class: "Renalware::Address" do
     street_1 "123 Legoland"
     street_2 "Brewster Road"

data/spec/factories/system/countries.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :country, class: "Renalware::System::Country" do
     factory :united_kingdom do
       name "United Kingdom"

data/spec/factories/system/roles.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :role, class: "Renalware::Role" do
     initialize_with { Renalware::Role.find_or_create_by(name: name) }
 

data/spec/factories/system/templates.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :esi_printable_form_template, class: "Renalware::System::Template" do
     name "esi_printable_form"
     title "ESI Printable Form"

data/spec/factories/system/users.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   sequence :email do |n|
     "renalware.user-#{n}@nhs.net"
   end

data/spec/factories/transplants/donations.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :transplant_donation, class: Renalware::Transplants::Donation do
     patient
 

data/spec/factories/transplants/donor_stage.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :donor_stage, class: "Renalware::Transplants::DonorStage" do
     accountable
     patient

data/spec/factories/transplants/donor_stage_position.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :donor_stage_position, class: "Renalware::Transplants::DonorStagePosition" do
     name { Faker::Lorem.word }
   end

data/spec/factories/transplants/donor_stage_status.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :donor_stage_status, class: "Renalware::Transplants::DonorStageStatus" do
     name { Faker::Lorem.word }
   end

data/spec/factories/transplants/live_donor_modality_description.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :live_donor_modality_description,
           class: "Renalware::Transplants::DonorModalityDescription" do
     name "Live Donor"

data/spec/factories/transplants/modality_descriptions.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :transplant_donor_modality_description,
           class: "Renalware::Transplants::DonorModalityDescription" do
     name "Live Donor"

data/spec/factories/transplants/patients.rb

@@ -1,3 +1,3 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :transplant_patient, class: "Renalware::Transplants::Patient", parent: :patient
 end

data/spec/factories/transplants/recipient_followups.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :transplant_recipient_followup, class: Renalware::Transplants::RecipientFollowup do
   end
 end

data/spec/factories/transplants/recipient_operations.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :transplant_recipient_operation, class: Renalware::Transplants::RecipientOperation do
     patient { build(:transplant_patient) }
 

data/spec/factories/transplants/registration_status_descriptions.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :transplant_registration_status_description,
     class: Renalware::Transplants::RegistrationStatusDescription do
     code "active"

data/spec/factories/transplants/registration_statuses.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :transplant_registration_status, class: Renalware::Transplants::RegistrationStatus do
     accountable
     description { create(:transplant_registration_status_description) }

data/spec/factories/transplants/registrations.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :transplant_registration, class: Renalware::Transplants::Registration do
     patient { build(:transplant_patient) }
 

data/spec/support/{factory_girl.rb → factory_bot.rb}

@@ -1,5 +1,5 @@
 RSpec.configure do |config|
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
 end
 
 # Use this strategy to get Hash output from factories defined using class: OpenStruct.
@@ -17,7 +17,7 @@ end
 #
 class MarshalDumpStrategy
   def initialize
-    @strategy = FactoryGirl.strategy_by_name(:create).new
+    @strategy = FactoryBot.strategy_by_name(:create).new
   end
 
   delegate :association, to: :@strategy
@@ -26,4 +26,4 @@ class MarshalDumpStrategy
     @strategy.result(evaluation).marshal_dump
   end
 end
-FactoryGirl.register_strategy(:marshal_dump, MarshalDumpStrategy)
+FactoryBot.register_strategy(:marshal_dump, MarshalDumpStrategy)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta9
+  version: 2.0.0.pre.beta10
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -836,20 +836,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-mini-profiler
   requirement: !ruby/object:Gem::Requirement
@@ -977,7 +963,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -1064,30 +1050,30 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.51.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.51.0
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -1195,6 +1181,7 @@ files:
 - app/assets/javascripts/renalware/modality_codes.js
 - app/assets/javascripts/renalware/modality_reasons.js
 - app/assets/javascripts/renalware/navigation.js
+- app/assets/javascripts/renalware/patient_ajax_search.js
 - app/assets/javascripts/renalware/patient_menu.js
 - app/assets/javascripts/renalware/pd.js
 - app/assets/javascripts/renalware/pdf.js
@@ -1203,6 +1190,7 @@ files:
 - app/assets/javascripts/renalware/problems.js
 - app/assets/javascripts/renalware/renal.js
 - app/assets/javascripts/renalware/reporting.js.erb
+- app/assets/javascripts/renalware/research.js
 - app/assets/javascripts/renalware/searchables.js
 - app/assets/javascripts/renalware/select2-ajax-search.js
 - app/assets/javascripts/renalware/session_timeout_redirect.js.erb
@@ -1213,6 +1201,7 @@ files:
 - app/assets/stylesheets/renalware/base/_mixins.scss
 - app/assets/stylesheets/renalware/base/_variables.scss
 - app/assets/stylesheets/renalware/clipboard.scss
+- app/assets/stylesheets/renalware/hd_diary_pdf.scss
 - app/assets/stylesheets/renalware/lib/_clockpicker.css
 - app/assets/stylesheets/renalware/lib/_foundation_and_overrides.scss
 - app/assets/stylesheets/renalware/lib/_select2-foundation5-overrides.scss
@@ -1237,6 +1226,7 @@ files:
 - app/assets/stylesheets/renalware/modules/_reporting.scss
 - app/assets/stylesheets/renalware/modules/_snippets.scss
 - app/assets/stylesheets/renalware/modules/_transplants.scss
+- app/assets/stylesheets/renalware/partials/_animation.scss
 - app/assets/stylesheets/renalware/partials/_animations.scss
 - app/assets/stylesheets/renalware/partials/_autocomplete.scss
 - app/assets/stylesheets/renalware/partials/_button.scss
@@ -1278,6 +1268,7 @@ files:
 - app/controllers/renalware/accesses/procedures_controller.rb
 - app/controllers/renalware/accesses/profiles_controller.rb
 - app/controllers/renalware/admin/users_controller.rb
+- app/controllers/renalware/admissions/consults_controller.rb
 - app/controllers/renalware/admissions/requests_controller.rb
 - app/controllers/renalware/api/ukrdc/patients_controller.rb
 - app/controllers/renalware/base_controller.rb
@@ -1310,16 +1301,20 @@ files:
 - app/controllers/renalware/hd/current_profile_controller.rb
 - app/controllers/renalware/hd/dashboards_controller.rb
 - app/controllers/renalware/hd/dialysers_controller.rb
+- app/controllers/renalware/hd/diaries_controller.rb
+- app/controllers/renalware/hd/diary_slots_controller.rb
 - app/controllers/renalware/hd/historical_profiles_controller.rb
 - app/controllers/renalware/hd/mdm_controller.rb
 - app/controllers/renalware/hd/mdm_patients_controller.rb
 - app/controllers/renalware/hd/ongoing_sessions_controller.rb
+- app/controllers/renalware/hd/patients_controller.rb
 - app/controllers/renalware/hd/preference_sets_controller.rb
 - app/controllers/renalware/hd/protocols_controller.rb
 - app/controllers/renalware/hd/sessions_controller.rb
 - app/controllers/renalware/hd/stations_controller.rb
 - app/controllers/renalware/hd/unmet_preferences_controller.rb
 - app/controllers/renalware/hospitals/units_controller.rb
+- app/controllers/renalware/hospitals/wards_controller.rb
 - app/controllers/renalware/letters/approved_letters_controller.rb
 - app/controllers/renalware/letters/base_controller.rb
 - app/controllers/renalware/letters/completed_letters_controller.rb
@@ -1378,8 +1373,11 @@ files:
 - app/controllers/renalware/renal/base_controller.rb
 - app/controllers/renalware/renal/prd_descriptions_controller.rb
 - app/controllers/renalware/renal/profiles_controller.rb
+- app/controllers/renalware/renal/registry_preflight_checks_controller.rb
 - app/controllers/renalware/reporting/audit_refreshments_controller.rb
 - app/controllers/renalware/reporting/audits_controller.rb
+- app/controllers/renalware/research/studies_controller.rb
+- app/controllers/renalware/research/study_participants_controller.rb
 - app/controllers/renalware/session_timeout_controller.rb
 - app/controllers/renalware/snippets/snippet_clones_controller.rb
 - app/controllers/renalware/snippets/snippet_invocations_controller.rb
@@ -1481,6 +1479,7 @@ files:
 - app/inputs/hidden_array_input.rb
 - app/inputs/inline_radio_buttons_input.rb
 - app/inputs/multiple_select_input.rb
+- app/inputs/select_container_input.rb
 - app/inputs/simple_time_input.rb
 - app/inputs/user_picker_input.rb
 - app/jobs/application_job.rb
@@ -1497,7 +1496,6 @@ files:
 - app/models/concerns/renalware/broadcasting.rb
 - app/models/concerns/renalware/deviseable.rb
 - app/models/concerns/renalware/explicit_state_model.rb
-- app/models/concerns/renalware/hd/has_schedule.rb
 - app/models/concerns/renalware/hd/session_scopes.rb
 - app/models/concerns/renalware/modality_scopes.rb
 - app/models/concerns/renalware/ordered_scope.rb
@@ -1522,6 +1520,8 @@ files:
 - app/models/renalware/accesses/type.rb
 - app/models/renalware/accesses/version.rb
 - app/models/renalware/admissions.rb
+- app/models/renalware/admissions/consult.rb
+- app/models/renalware/admissions/consult_query.rb
 - app/models/renalware/admissions/request.rb
 - app/models/renalware/admissions/request_reason.rb
 - app/models/renalware/clinical.rb
@@ -1572,20 +1572,31 @@ files:
 - app/models/renalware/feeds/message_processor.rb
 - app/models/renalware/feeds/persist_message.rb
 - app/models/renalware/hd.rb
+- app/models/renalware/hd/archive_yesterdays_slots_job.rb
 - app/models/renalware/hd/cannulation_type.rb
+- app/models/renalware/hd/dialysate.rb
 - app/models/renalware/hd/dialyser.rb
+- app/models/renalware/hd/diary.rb
+- app/models/renalware/hd/diary_slot.rb
 - app/models/renalware/hd/diurnal_period_code.rb
+- app/models/renalware/hd/find_or_create_diary_by_week_query.rb
+- app/models/renalware/hd/find_or_create_master_diary.rb
 - app/models/renalware/hd/generate_monthly_statistics_for_patient.rb
+- app/models/renalware/hd/master_diary.rb
 - app/models/renalware/hd/mdm_patients_query.rb
 - app/models/renalware/hd/modality_description.rb
 - app/models/renalware/hd/patient.rb
 - app/models/renalware/hd/patient_listener.rb
 - app/models/renalware/hd/patient_statistics.rb
+- app/models/renalware/hd/patients_dialysing_by_day_and_period_query.rb
+- app/models/renalware/hd/patients_dialysing_by_day_query.rb
+- app/models/renalware/hd/patients_dialysing_by_schedule_query.rb
 - app/models/renalware/hd/patients_with_unmet_preferences_query.rb
 - app/models/renalware/hd/preference_set.rb
 - app/models/renalware/hd/prescription_administration.rb
 - app/models/renalware/hd/profile.rb
 - app/models/renalware/hd/revise_hd_profile.rb
+- app/models/renalware/hd/schedule_definition.rb
 - app/models/renalware/hd/session.rb
 - app/models/renalware/hd/session/closed.rb
 - app/models/renalware/hd/session/dna.rb
@@ -1601,8 +1612,10 @@ files:
 - app/models/renalware/hd/sessions/protocol_sessions_query.rb
 - app/models/renalware/hd/sessions/save_session.rb
 - app/models/renalware/hd/station.rb
+- app/models/renalware/hd/station_location.rb
 - app/models/renalware/hd/update_rolling_patient_statistics.rb
 - app/models/renalware/hd/version.rb
+- app/models/renalware/hd/weekly_diary.rb
 - app/models/renalware/hospitals.rb
 - app/models/renalware/hospitals/centre.rb
 - app/models/renalware/hospitals/unit.rb
@@ -1819,9 +1832,14 @@ files:
 - app/models/renalware/renal/prd_description.rb
 - app/models/renalware/renal/prd_descriptions/search_query.rb
 - app/models/renalware/renal/profile.rb
+- app/models/renalware/renal/registry/preflight_checks/deaths_query.rb
+- app/models/renalware/renal/registry/preflight_checks/patients_query.rb
 - app/models/renalware/reporting.rb
 - app/models/renalware/reporting/audit.rb
-- app/models/renalware/reporting/generate_audit_json.rb
+- app/models/renalware/reporting/fetch_audit_json.rb
+- app/models/renalware/research.rb
+- app/models/renalware/research/study.rb
+- app/models/renalware/research/study_participant.rb
 - app/models/renalware/role.rb
 - app/models/renalware/snippets.rb
 - app/models/renalware/snippets/duplicate_snippet_title_generator.rb
@@ -1862,6 +1880,7 @@ files:
 - app/models/renalware/user.rb
 - app/models/renalware/version.rb
 - app/policies/application_policy.rb
+- app/policies/renalware/admissions/consult_policy.rb
 - app/policies/renalware/admissions/request_policy.rb
 - app/policies/renalware/base_policy.rb
 - app/policies/renalware/clinical/allergy_policy.rb
@@ -1874,6 +1893,7 @@ files:
 - app/policies/renalware/events/simple_policy.rb
 - app/policies/renalware/events/swab_policy.rb
 - app/policies/renalware/hd/closed_session_policy.rb
+- app/policies/renalware/hd/diary_policy.rb
 - app/policies/renalware/hd/dna_session_policy.rb
 - app/policies/renalware/hd/open_session_policy.rb
 - app/policies/renalware/hd/session_policy.rb
@@ -1901,7 +1921,10 @@ files:
 - app/policies/renalware/pd/training_session_policy.rb
 - app/policies/renalware/problems/problem_policy.rb
 - app/policies/renalware/renal/aki_alert_policy.rb
+- app/policies/renalware/renal/registry_preflight_check_policy.rb
 - app/policies/renalware/reporting/audit_policy.rb
+- app/policies/renalware/research/study_participant_policy.rb
+- app/policies/renalware/research/study_policy.rb
 - app/policies/renalware/snippets/snippet_policy.rb
 - app/policies/renalware/transplants/donor_stage_policy.rb
 - app/policies/renalware/transplants/recipient_operation_policy.rb
@@ -1923,6 +1946,7 @@ files:
 - app/presenters/renalware/address_presenter/block.rb
 - app/presenters/renalware/address_presenter/short.rb
 - app/presenters/renalware/address_presenter/single_line.rb
+- app/presenters/renalware/admissions/consult_presenter.rb
 - app/presenters/renalware/clinical/body_composition_presenter.rb
 - app/presenters/renalware/clinical/dry_weight_presenter.rb
 - app/presenters/renalware/clinical/dry_weights_presenter.rb
@@ -1932,8 +1956,11 @@ files:
 - app/presenters/renalware/directory/person_auto_complete_presenter.rb
 - app/presenters/renalware/events/events_presenter.rb
 - app/presenters/renalware/hd/dashboard_presenter.rb
+- app/presenters/renalware/hd/diary_presenter.rb
+- app/presenters/renalware/hd/diary_slot_presenter.rb
 - app/presenters/renalware/hd/mdm_patient_presenter.rb
 - app/presenters/renalware/hd/mdm_presenter.rb
+- app/presenters/renalware/hd/null_slot.rb
 - app/presenters/renalware/hd/patient_presenter.rb
 - app/presenters/renalware/hd/profile_document_presenter.rb
 - app/presenters/renalware/hd/profile_presenter.rb
@@ -1990,6 +2017,7 @@ files:
 - app/presenters/renalware/transplants/mdm_presenter.rb
 - app/presenters/renalware/transplants/patient_presenter.rb
 - app/presenters/renalware/transplants/wait_list_registration_presenter.rb
+- app/presenters/renalware/ukrdc/pathology_observation_presenter.rb
 - app/presenters/renalware/ukrdc/patient_presenter.rb
 - app/presenters/string_presenter.rb
 - app/presenters/time_presenter.rb
@@ -2047,6 +2075,12 @@ files:
 - app/views/renalware/admin/user_mailer/unexpiry.text.erb
 - app/views/renalware/admin/users/edit.html.slim
 - app/views/renalware/admin/users/index.html.slim
+- app/views/renalware/admissions/consults/_filters.html.slim
+- app/views/renalware/admissions/consults/_form.html.slim
+- app/views/renalware/admissions/consults/_table.html.slim
+- app/views/renalware/admissions/consults/edit.html.slim
+- app/views/renalware/admissions/consults/index.html.slim
+- app/views/renalware/admissions/consults/new.html.slim
 - app/views/renalware/admissions/requests/_create_request_link.html.slim
 - app/views/renalware/admissions/requests/_form.html.slim
 - app/views/renalware/admissions/requests/_modal_dialog_placeholder.html.slim
@@ -2093,19 +2127,16 @@ files:
 - app/views/renalware/clinical/allergy_statuses/_form.html.slim
 - app/views/renalware/clinical/body_compositions/_form.html.slim
 - app/views/renalware/clinical/body_compositions/_list.html.slim
-- app/views/renalware/clinical/body_compositions/_navigation.html.slim
 - app/views/renalware/clinical/body_compositions/edit.html.slim
 - app/views/renalware/clinical/body_compositions/new.html.slim
 - app/views/renalware/clinical/body_compositions/show.html.slim
 - app/views/renalware/clinical/dry_weights/_dry_weight_nav.html.slim
 - app/views/renalware/clinical/dry_weights/_form.html.slim
 - app/views/renalware/clinical/dry_weights/_list.html.slim
-- app/views/renalware/clinical/dry_weights/_navigation.html.slim
 - app/views/renalware/clinical/dry_weights/_row.html.slim
 - app/views/renalware/clinical/dry_weights/edit.html.slim
 - app/views/renalware/clinical/dry_weights/index.html.slim
 - app/views/renalware/clinical/dry_weights/new.html.slim
-- app/views/renalware/clinical/profiles/_navigation.html.slim
 - app/views/renalware/clinical/profiles/edit.html.slim
 - app/views/renalware/clinical/profiles/show.html.slim
 - app/views/renalware/clinics/appointments/index.html.slim
@@ -2124,7 +2155,6 @@ files:
 - app/views/renalware/dashboard/bookmarks/_table.html.slim
 - app/views/renalware/dashboard/dashboards/_content.html.slim
 - app/views/renalware/dashboard/dashboards/_layout.html.slim
-- app/views/renalware/dashboard/dashboards/_navigation.html.slim
 - app/views/renalware/dashboard/dashboards/_side_nav.html.slim
 - app/views/renalware/dashboard/dashboards/show.html.slim
 - app/views/renalware/dashboard/letters/_letter.html.slim
@@ -2133,7 +2163,6 @@ files:
 - app/views/renalware/deaths/index.html.slim
 - app/views/renalware/devise/passwords/edit.html.erb
 - app/views/renalware/devise/passwords/new.html.erb
-- app/views/renalware/devise/registrations/_navigation.html.slim
 - app/views/renalware/devise/registrations/edit.html.slim
 - app/views/renalware/devise/registrations/new.html.slim
 - app/views/renalware/devise/sessions/new.html.slim
@@ -2198,6 +2227,22 @@ files:
 - app/views/renalware/hd/dialysers/edit.html.slim
 - app/views/renalware/hd/dialysers/index.html.slim
 - app/views/renalware/hd/dialysers/new.html.slim
+- app/views/renalware/hd/diaries/_page_actions.html.slim
+- app/views/renalware/hd/diaries/_table.html.slim
+- app/views/renalware/hd/diaries/_weekly_diary.html.slim
+- app/views/renalware/hd/diaries/edit.html.slim
+- app/views/renalware/hd/diaries/index.html.slim
+- app/views/renalware/hd/diaries/show.pdf.slim
+- app/views/renalware/hd/diary_slots/_form.html.slim
+- app/views/renalware/hd/diary_slots/_slot.html.slim
+- app/views/renalware/hd/diary_slots/_tab.html.slim
+- app/views/renalware/hd/diary_slots/create.js.erb
+- app/views/renalware/hd/diary_slots/destroy.js.erb
+- app/views/renalware/hd/diary_slots/edit.html.slim
+- app/views/renalware/hd/diary_slots/new.html.slim
+- app/views/renalware/hd/diary_slots/new.js.erb
+- app/views/renalware/hd/diary_slots/show.js.erb
+- app/views/renalware/hd/diary_slots/update.js.erb
 - app/views/renalware/hd/historical_profiles/_summary.html.slim
 - app/views/renalware/hd/historical_profiles/_table.html.slim
 - app/views/renalware/hd/historical_profiles/index.html.slim
@@ -2228,7 +2273,6 @@ files:
 - app/views/renalware/hd/sessions/_list.html.slim
 - app/views/renalware/hd/sessions/_prescription_administrations.html.slim
 - app/views/renalware/hd/sessions/_row.html.slim
-- app/views/renalware/hd/sessions/_sections_nav.html.slim
 - app/views/renalware/hd/sessions/_session_nav.html.slim
 - app/views/renalware/hd/sessions/_show.html.slim
 - app/views/renalware/hd/sessions/_table.html.slim
@@ -2297,7 +2341,6 @@ files:
 - app/views/renalware/letters/letters/_form.html.slim
 - app/views/renalware/letters/letters/_letter.html.slim
 - app/views/renalware/letters/letters/_main_recipient.html.slim
-- app/views/renalware/letters/letters/_navigation.html.slim
 - app/views/renalware/letters/letters/_patient_summary.html.slim
 - app/views/renalware/letters/letters/_preview.html.slim
 - app/views/renalware/letters/letters/_table.html.slim
@@ -2458,7 +2501,6 @@ files:
 - app/views/renalware/patients/patients/show/_referral.html.slim
 - app/views/renalware/patients/patients/show/_ukrdc_preferences.html.slim
 - app/views/renalware/patients/primary_care_physician/_form.html.slim
-- app/views/renalware/patients/primary_care_physician/_navigation.html.slim
 - app/views/renalware/patients/primary_care_physician/edit.html.slim
 - app/views/renalware/patients/primary_care_physician/edit.js.erb
 - app/views/renalware/patients/primary_care_physicians/_form.html.slim
@@ -2527,7 +2569,6 @@ files:
 - app/views/renalware/pd/peritonitis_episodes/_details.html.slim
 - app/views/renalware/pd/peritonitis_episodes/_fields.html.slim
 - app/views/renalware/pd/peritonitis_episodes/_form.html.slim
-- app/views/renalware/pd/peritonitis_episodes/_navigation.html.slim
 - app/views/renalware/pd/peritonitis_episodes/edit.html.slim
 - app/views/renalware/pd/peritonitis_episodes/edit.js.erb
 - app/views/renalware/pd/peritonitis_episodes/new.html.slim
@@ -2579,10 +2620,27 @@ files:
 - app/views/renalware/renal/profiles/_mini.html.slim
 - app/views/renalware/renal/profiles/edit.html.slim
 - app/views/renalware/renal/profiles/show.html.slim
+- app/views/renalware/renal/registry_preflight_checks/_navigation.html.slim
+- app/views/renalware/renal/registry_preflight_checks/_table.html.slim
+- app/views/renalware/renal/registry_preflight_checks/deaths.html.slim
+- app/views/renalware/renal/registry_preflight_checks/patients.html.slim
 - app/views/renalware/reporting/audit_refreshments/create.js.erb
 - app/views/renalware/reporting/audits/edit.html.slim
 - app/views/renalware/reporting/audits/index.html.slim
 - app/views/renalware/reporting/audits/show.html.slim
+- app/views/renalware/research/studies/_form.html.slim
+- app/views/renalware/research/studies/edit.html.slim
+- app/views/renalware/research/studies/index.html.slim
+- app/views/renalware/research/studies/new.html.slim
+- app/views/renalware/research/studies/show.html.slim
+- app/views/renalware/research/study_participants/_form.html.slim
+- app/views/renalware/research/study_participants/_table.html.slim
+- app/views/renalware/research/study_participants/create.js.erb
+- app/views/renalware/research/study_participants/edit.html.slim
+- app/views/renalware/research/study_participants/index.html.slim
+- app/views/renalware/research/study_participants/new.html.slim
+- app/views/renalware/research/study_participants/new.js.erb
+- app/views/renalware/research/study_participants/update.js.erb
 - app/views/renalware/shared/_attributes_group.html.slim
 - app/views/renalware/shared/_attributes_list.html.slim
 - app/views/renalware/shared/_error_messages.html.slim
@@ -2742,6 +2800,7 @@ files:
 - config/locales/renalware/accesses/procedure.yml
 - config/locales/renalware/accesses/profile.yml
 - config/locales/renalware/address.yml
+- config/locales/renalware/admissions/consults.en.yml
 - config/locales/renalware/admissions/requests.en.yml
 - config/locales/renalware/age.yml
 - config/locales/renalware/blood_group.en.yml
@@ -2759,6 +2818,7 @@ files:
 - config/locales/renalware/events/swab.en.yml
 - config/locales/renalware/hd/accesses.en.yml
 - config/locales/renalware/hd/dashboards.en.yml
+- config/locales/renalware/hd/diary_slots.en.yml
 - config/locales/renalware/hd/mdm.en.yml
 - config/locales/renalware/hd/mdm_patients.yml
 - config/locales/renalware/hd/preference_set.yml
@@ -2800,7 +2860,9 @@ files:
 - config/locales/renalware/problems/note.yml
 - config/locales/renalware/renal/aki_alerts.en.yml
 - config/locales/renalware/renal/profile.en.yml
+- config/locales/renalware/renal/registry.en.yml
 - config/locales/renalware/reporting/audit.en.yml
+- config/locales/renalware/research/study_participant.en.yml
 - config/locales/renalware/shared.yml
 - config/locales/renalware/snippets/snippets.en.yml
 - config/locales/renalware/transplants/donation.yml
@@ -3077,10 +3139,17 @@ files:
 - db/migrate/20170824113401_add_stations_to_hospital_units.rb
 - db/migrate/20170830085137_create_hd_unit_stations.rb
 - db/migrate/20170830171726_create_hd_diurnal_period_codes.rb
+- db/migrate/20170831082043_create_hd_diaries.rb
+- db/migrate/20170831084331_create_hd_diary_slots.rb
+- db/migrate/20170831142819_enable_crosstab_extension.rb
 - db/migrate/20170908155011_add_shortfall_column_to_hd_patient_statistics.rb
 - db/migrate/20170908160250_update_hd_overall_audit_to_version4.rb
 - db/migrate/20170911133224_add_type_to_messaging_messages.rb
 - db/migrate/20170912092135_create_letters_electronic_receipts.rb
+- db/migrate/20170915090544_create_hd_station_locations.rb
+- db/migrate/20170915115228_add_schedule_diurnal_period_id_to_hd_profiles.rb
+- db/migrate/20170916121019_remove_number_of_hd_stations_from_hospital_units.rb
+- db/migrate/20170917185426_add_indexes_to_diary_slots.rb
 - db/migrate/20170920113628_create_admissions_requests.rb
 - db/migrate/20170925161033_add_code_to_patient_langauges.rb
 - db/migrate/20170925182738_add_rr_code_to_medication_routes.rb
@@ -3090,11 +3159,22 @@ files:
 - db/migrate/20171003093347_create_hospital_wards.rb
 - db/migrate/20171003111228_create_aki_alert_actions.rb
 - db/migrate/20171003122425_create_renal_aki_alerts.rb
+- db/migrate/20171004092235_create_hd_dialysates.rb
+- db/migrate/20171004110909_add_dialysate_id_to_profile_and_session.rb
 - db/migrate/20171005081224_create_reporting_bone_audit.rb
 - db/migrate/20171005091202_reporting_audit_changes.rb
 - db/migrate/20171005130109_create_medication_current_prescriptions.rb
 - db/migrate/20171005144505_create_reporting_anaemia_audit.rb
 - db/migrate/20171009104106_add_legacy_patient_id_to_patients.rb
+- db/migrate/20171012110133_create_research_studies.rb
+- db/migrate/20171012143050_create_research_study_participants.rb
+- db/migrate/20171013145849_set_patients_secure_id.rb
+- db/migrate/20171016152223_add_index_to_diary_slots.rb
+- db/migrate/20171017132738_add_unique_indexes_to_local_patient_ids.rb
+- db/migrate/20171017171625_update_hd_overall_audit_view.rb
+- db/migrate/20171101121130_create_function_to_render_audit_view_as_json.rb
+- db/migrate/20171101162244_create_consults.rb
+- db/migrate/20171106100216_create_pd_audit_view.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb
@@ -3118,12 +3198,10 @@ files:
 - db/seeds/default/events/event_types.csv
 - db/seeds/default/events/event_types.rb
 - db/seeds/default/events/seeds.rb
+- db/seeds/default/hd/cannulation_types.csv
 - db/seeds/default/hd/cannulation_types.rb
+- db/seeds/default/hd/dialysers.csv
 - db/seeds/default/hd/dialysers.rb
-- db/seeds/default/hd/diurnal_period_codes.csv
-- db/seeds/default/hd/diurnal_period_codes.rb
-- db/seeds/default/hd/hd_cannulation_types.csv
-- db/seeds/default/hd/hd_dialysers.csv
 - db/seeds/default/hd/seeds.rb
 - db/seeds/default/housekeeping.rb
 - db/seeds/default/letters/letterheads.csv
@@ -3136,12 +3214,6 @@ files:
 - db/seeds/default/modalities/seeds.rb
 - db/seeds/default/pathology/measurement_units.csv
 - db/seeds/default/pathology/measurement_units.rb
-- db/seeds/default/pathology/pathology_labs.csv
-- db/seeds/default/pathology/pathology_labs.rb
-- db/seeds/default/pathology/pathology_observation_descriptions.csv
-- db/seeds/default/pathology/pathology_observation_descriptions.rb
-- db/seeds/default/pathology/pathology_request_descriptions.csv
-- db/seeds/default/pathology/pathology_request_descriptions.rb
 - db/seeds/default/pathology/seeds.rb
 - db/seeds/default/patients/patients_ethnicities.rb
 - db/seeds/default/patients/patients_languages.csv
@@ -3188,7 +3260,6 @@ files:
 - db/seeds/default/transplants/transplant_registration_statuses.rb
 - db/seeds/seeds_helper.rb
 - db/static.obsolete/medication_routes.yml
-- db/structure.sql
 - db/views/medication_current_prescriptions_v01.sql
 - db/views/pathology_current_key_observation_sets_v01.sql
 - db/views/pathology_current_key_observation_sets_v02.sql
@@ -3203,8 +3274,10 @@ files:
 - db/views/reporting_hd_overall_audit_v01.sql
 - db/views/reporting_hd_overall_audit_v02.sql
 - db/views/reporting_hd_overall_audit_v04.sql
+- db/views/reporting_hd_overall_audit_v05.sql
 - db/views/reporting_main_authors_audit_v01.sql
 - db/views/reporting_main_authors_audit_v02.sql
+- db/views/reporting_pd_audit_v01.sql
 - lib/age_calculator.rb
 - lib/array_stringifier.rb
 - lib/breadcrumb.rb
@@ -3223,6 +3296,7 @@ files:
 - lib/document/base.rb
 - lib/document/embedded.rb
 - lib/document/enum.rb
+- lib/dropdown_button_item.rb
 - lib/duration_calculator.rb
 - lib/git_commit_sha.rb
 - lib/hash_collection.rb
@@ -3239,6 +3313,7 @@ files:
 - lib/renalware/service_result.rb
 - lib/renalware/success.rb
 - lib/renalware/version.rb
+- lib/renalware/week_period.rb
 - lib/smart_delegator.rb
 - lib/sql/index_case_stmt.rb
 - lib/subscription_registry.rb
@@ -3257,6 +3332,7 @@ files:
 - spec/factories/accesses/profiles.rb
 - spec/factories/accesses/sites.rb
 - spec/factories/accesses/types.rb
+- spec/factories/admissions/consults.rb
 - spec/factories/admissions/request_reasons.rb
 - spec/factories/admissions/requests.rb
 - spec/factories/clinical/allergies.rb
@@ -3274,14 +3350,20 @@ files:
 - spec/factories/events/events.rb
 - spec/factories/events/events_types.rb
 - spec/factories/hd/cannulation_types.rb
+- spec/factories/hd/dialysates.rb
 - spec/factories/hd/dialysers.rb
+- spec/factories/hd/diaries.rb
+- spec/factories/hd/diurnal_period_codes.rb
 - spec/factories/hd/hd_session_document.rb
 - spec/factories/hd/modality_descriptions.rb
 - spec/factories/hd/patient_statistics.rb
 - spec/factories/hd/patients.rb
 - spec/factories/hd/preference_sets.rb
 - spec/factories/hd/profiles.rb
+- spec/factories/hd/schedule_definitions.rb
 - spec/factories/hd/sessions.rb
+- spec/factories/hd/slots.rb
+- spec/factories/hd/station_locations.rb
 - spec/factories/hd/stations.rb
 - spec/factories/hospitals/centres.rb
 - spec/factories/hospitals/units.rb
@@ -3355,6 +3437,8 @@ files:
 - spec/factories/renal/prd_description.rb
 - spec/factories/renal/profiles.rb
 - spec/factories/reporting/audits.rb
+- spec/factories/research/studies.rb
+- spec/factories/research/study_participants.rb
 - spec/factories/shared/accountable.rb
 - spec/factories/snippets/snippets.rb
 - spec/factories/snippets/users.rb
@@ -3380,7 +3464,7 @@ files:
 - spec/support/date_helpers.rb
 - spec/support/devise_spec_helper.rb
 - spec/support/drugs_spec_helper.rb
-- spec/support/factory_girl.rb
+- spec/support/factory_bot.rb
 - spec/support/json_helpers.rb
 - spec/support/letters_spec_helper.rb
 - spec/support/login_macros.rb
@@ -3397,11 +3481,6 @@ files:
 - spec/support/translations.rb
 - spec/support/travel.rb
 - spec/support/webmock.rb
-- vendor/assets/fonts/foundation-icons.eot
-- vendor/assets/fonts/foundation-icons.scss
-- vendor/assets/fonts/foundation-icons.svg
-- vendor/assets/fonts/foundation-icons.ttf
-- vendor/assets/fonts/foundation-icons.woff
 - vendor/assets/javascripts/renalware/iframeResizer.contentWindow.js
 - vendor/assets/javascripts/renalware/iframeResizer.js
 - vendor/assets/javascripts/renalware/jquery-readyselector.js