renalware-core 2.0.21 → 2.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb52057efa06f6dce32bab7e11ecef1b2d0657efd313d4877700c1c28d1e99fc
-  data.tar.gz: 1056cb320a5f6bbf1219c309d2d7346e24cb660526de58f104bccea93b8b894c
+  metadata.gz: 5c9df5d0937aca9913d07516b1d59836215499b54f8160d4a9fa5d6d811a5eb8
+  data.tar.gz: 4afe4555a5821f3c8464d95137fe5a28b8341f1db3e996083216c73b4780f85a
 SHA512:
-  metadata.gz: a2d221d00a911a99274cf8741dd7ac549b065d70d484021fc02c76ab050395dbceaec1df8dab4fd9a9bc9092d68a43013e4632377527a1ec50b7172ac1df7c0c
-  data.tar.gz: 0d66eb47e8baba59a335ad9f70b87c8875e43cf274e30aedaba726baab1f2dd7485eea9a85a661383d76f89f404c17ccd8562ee8c7d5f1fc5eaf86abf32a4750
+  metadata.gz: e8f02ea880a57bc537775cc5addd1bea2d6fcf5bf3beae5c647d2cb36a88c6dc0007bed2d76215651d24a29e9cc9e30550fd77785ff3e9bfafbcd8cfdd0d1800
+  data.tar.gz: 9d7ba211614d195aff1d88d4faf32a6a83669c130fae96ecbedc69d5ec1be197cbf24749a6b05e3a148534e83fd1694e96a10d7ba246eb6a51699aadf21f78bd

data/app/controllers/renalware/clinical/profiles_controller.rb

@@ -32,8 +32,12 @@ module Renalware
 
       def update_patient
         document = patient.document
-        document.diabetes = profile_params[:diabetes].symbolize_keys
-        document.history = profile_params[:history].symbolize_keys
+        %i(diabetes history).each do |document_attribute|
+          document.send(
+            :"#{document_attribute}=",
+            profile_params[document_attribute].symbolize_keys
+          )
+        end
         patient.by = current_user
         patient.save!
       end
@@ -41,7 +45,9 @@ module Renalware
       def profile_params
         params
           .require(:clinical_profile)
-          .permit(diabetes: %i(diagnosis diagnosed_on), history: %i(alcohol smoking))
+          .permit(
+            diabetes: %i(diagnosis diagnosed_on),
+            history: %i(alcohol smoking))
           .to_h
       end
     end

data/app/controllers/renalware/system/user_feedback_controller.rb

@@ -27,10 +27,9 @@ module Renalware
         search = UserFeedback
           .includes(:author)
           .order(created_at: :desc)
-          .page(page)
-          .per(per_page)
           .search(search_params)
-        feedback_msgs = search.result
+
+        feedback_msgs = search.result.page(page).per(per_page)
         authorize feedback_msgs
         render locals: { feedback_msgs: feedback_msgs, search: search }
       end

data/app/controllers/renalware/virology/base_controller.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/renal"
+
+module Renalware
+  module Virology
+    class BaseController < Renalware::BaseController
+      protected
+
+      # rubocop:disable Naming/MemoizedInstanceVariableName
+      def patient
+        @virology_patient ||= Renalware::Virology.cast_patient(super)
+      end
+      # rubocop:enable Naming/MemoizedInstanceVariableName
+    end
+  end
+end

data/app/controllers/renalware/virology/profiles_controller.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/virology"
+
+module Renalware
+  module Virology
+    class ProfilesController < Virology::BaseController
+      def edit
+        profile = find_profile
+        authorize profile
+        render_edit(profile: profile)
+      end
+
+      def update
+        profile = find_profile
+        authorize profile
+        if update_profile(profile)
+          redirect_to patient_virology_dashboard_path(patient)
+        else
+          render_edit(profile: profile)
+        end
+      end
+
+      private
+
+      def find_profile
+        patient.profile || patient.build_profile
+      end
+
+      def render_edit(profile:)
+        render :edit, locals: { patient: patient, profile: profile }
+      end
+
+      def update_profile(profile)
+        document_params = profile_params[:document]
+        document = profile.document
+        document.hiv = YearDatedDiagnosis.new(document_params[:hiv])
+        document.hepatitis_b = YearDatedDiagnosis.new(document_params[:hepatitis_b])
+        document.hepatitis_c = YearDatedDiagnosis.new(document_params[:hepatitis_c])
+        profile.save_by(current_user)
+      end
+
+      def profile_params
+        params
+          .require(:virology_profile)
+          .permit(attributes)
+          .merge(document: document_attributes)
+      end
+
+      def attributes
+        [
+          document: []
+        ]
+      end
+
+      def document_attributes
+        params.require(:virology_profile).fetch(:document, nil).try(:permit!)
+      end
+    end
+  end
+end

data/app/documents/renalware/dated_boolean_diagnosis.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Renalware
+  class DatedBooleanDiagnosis < NestedAttribute
+    attribute :diagnosis, Boolean
+    attribute :diagnosed_on, Date
+
+    validates :diagnosed_on, timeliness: { type: :date, allow_blank: true }
+
+    def to_s
+      return "" if diagnosis.to_s.blank?
+      datestamp = diagnosed_on.present? ? "(#{I18n.l(diagnosed_on)})" : nil
+      [(diagnosis ? "Yes" : "No"), datestamp].compact.join(" ")
+    end
+  end
+end

data/app/documents/renalware/patient_document.rb

@@ -8,14 +8,7 @@ module Renalware
     attribute :interpreter_notes, String
     attribute :admin_notes, String
     attribute :special_needs_notes, String
-
-    class Diabetes < NestedAttribute
-      attribute :diagnosis, Boolean
-      attribute :diagnosed_on, Date
-
-      validates :diagnosed_on, timeliness: { type: :date, allow_blank: true }
-    end
-    attribute :diabetes, Diabetes
+    attribute :diabetes, DatedBooleanDiagnosis
 
     class Referral < Document::Embedded
       attribute :referring_physician_name, String

data/app/documents/renalware/virology/profile_document.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "document/embedded"
+require "document/enum"
+
+module Renalware
+  module Virology
+    class ProfileDocument < Document::Embedded
+      attribute :hiv, YearDatedDiagnosis
+      attribute :hepatitis_b, YearDatedDiagnosis
+      attribute :hepatitis_c, YearDatedDiagnosis
+    end
+  end
+end

data/app/documents/renalware/year_dated_diagnosis.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require "document/enum"
+
+module Renalware
+  class YearDatedDiagnosis < YearDatedConfirmation
+  end
+end

data/app/jobs/renalware/hd/generate_monthly_statistics_for_patient_job.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "month_period"
+
 module Renalware
   module HD
     class GenerateMonthlyStatisticsForPatientJob < ApplicationJob
@@ -7,7 +9,7 @@ module Renalware
 
       # :reek:UtilityFunction
       def perform(patient:, month:, year:)
-        period = MonthPeriod.new(month: month, year: year)
+        period = Renalware::MonthPeriod.new(month: month, year: year)
         GenerateMonthlyStatisticsForPatient.new(patient: patient, period: period).call
       end
     end

data/app/jobs/renalware/hd/generate_monthly_statistics_job.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "month_period"
+
 # This job when executed will store a snapshot of last month's HD session statistics
 # for each HD patient.
 module Renalware
@@ -25,7 +27,7 @@ module Renalware
       end
 
       def period
-        @period ||= MonthPeriod.new(month: month, year: year)
+        @period ||= Renalware::MonthPeriod.new(month: month, year: year)
       end
 
       def month

data/app/models/renalware/pathology/observation_requests_attributes_builder.rb

@@ -11,6 +11,7 @@ module Renalware
     # - This class could be removed and a Builder class used to create the database models
     # directly - this would remove the extra level of indirection that this class introduces.
     class ObservationRequestsAttributesBuilder
+      DEFAULT_REQUESTOR_NAME = "UNKNOWN"
       delegate :patient_identification, :observation_requests, to: :message_payload
       delegate :internal_id, to: :patient_identification
       alias_attribute :requests, :observation_requests
@@ -59,7 +60,7 @@ module Renalware
           hash = {
             observation_request: {
               description_id: request_description.id,
-              requestor_name: request.ordering_provider_name,
+              requestor_name: request.ordering_provider_name || DEFAULT_REQUESTOR_NAME,
               requestor_order_number: request.placer_order_number,
               requested_at: parse_time(request.date_time),
               observations_attributes: build_observations_params(request)
@@ -109,7 +110,9 @@ module Renalware
         Patient.find_by!(local_patient_id: local_patient_id)
       end
 
+      # Default to using today's date and time if no date_time passed in the message
       def parse_time(string)
+        return Time.zone.now.to_s if string.blank?
         Time.zone.parse(string).to_s
       end
     end

data/app/models/renalware/patient.rb

@@ -85,6 +85,11 @@ module Renalware
               length: { minimum: 10, maximum: 10 },
               uniqueness: { case_sensitive: false },
               allow_blank: true
+    validates :local_patient_id, uniqueness: { case_sensitive: false }, allow_blank: true
+    validates :local_patient_id_2, uniqueness: { case_sensitive: false }, allow_blank: true
+    validates :local_patient_id_3, uniqueness: { case_sensitive: false }, allow_blank: true
+    validates :local_patient_id_4, uniqueness: { case_sensitive: false }, allow_blank: true
+    validates :local_patient_id_5, uniqueness: { case_sensitive: false }, allow_blank: true
     validates :family_name, presence: true
     validates :given_name, presence: true
     validates :born_on, presence: true

data/app/models/renalware/virology/patient.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/virology"
+
+module Renalware
+  module Virology
+    class Patient < ActiveType::Record[Renalware::Patient]
+      has_one :profile, dependent: :destroy
+    end
+  end
+end

data/app/models/renalware/virology/profile.rb

@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/virology"
+require "document/base"
 
 module Renalware
   module Virology
     class Profile < ApplicationRecord
+      include Accountable
+      include Document::Base
       belongs_to :patient, touch: true
+      has_document class_name: "Renalware::Virology::ProfileDocument"
     end
   end
 end

data/app/models/renalware/virology/version.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/virology"
+
+module Renalware
+  module Virology
+    class Version < PaperTrail::Version
+      self.table_name = :virology_versions
+    end
+  end
+end

data/app/policies/renalware/virology/profile_policy.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/virology"
+
+module Renalware
+  module Virology
+    class ProfilePolicy < BasePolicy
+    end
+  end
+end

data/app/presenters/renalware/clinical/profile_presenter.rb

@@ -6,8 +6,7 @@ module Renalware
   module Clinical
     class ProfilePresenter
       attr_reader :patient, :params
-      delegate :allergies, to: :patient
-      delegate :diagnosis, :diagnosed_on, to: :diabetes, prefix: true
+      delegate :allergies, :document, to: :patient
 
       def initialize(patient:, params:)
         @params = params
@@ -30,11 +29,13 @@ module Renalware
       end
 
       def history
-        patient.document.history || NullObject.instance
+        document.history || NullObject.instance
       end
 
-      def diabetes
-        patient.document.diabetes || NullObject.instance
+      %i(diabetes).each do |document_attribute|
+        define_method(document_attribute) do
+          document.send(document_attribute) || NullObject.instance
+        end
       end
 
       def dry_weights

data/app/views/renalware/clinical/profiles/edit.html.slim

@@ -13,10 +13,8 @@
         article
           header
             h2 Diabetes
-
-          = f.simple_fields_for :diabetes, patient.document.diabetes do |fd|
-            = fd.input :diagnosis, as: :inline_radio_buttons
-            = fd.input :diagnosed_on, as: :date_picker
+          .hint If YES, enter year of diagnosis
+          = render_input f, :diabetes
 
         article
           header

data/app/views/renalware/clinical/profiles/show.html.slim

@@ -5,15 +5,20 @@
   .grid
     .row
       .columns.medium-6
+
         article
           header
             h2 Diabetes
 
           dl.dl-horizontal
-            dt Diagnosis
-            dd= yes_no(profile.diabetes_diagnosis) unless profile.diabetes_diagnosis.nil?
-            dt Diagnosed on
-            dd= l(profile.diabetes_diagnosed_on)
+            - %i(diabetes).each do |document_attribute|
+              dt= profile.document.class.human_attribute_name(document_attribute)
+              dd= profile.send(document_attribute).to_s
+
+      .columns.medium-6
+          = render "renalware/virology/profiles/summary",
+                   patient: patient,
+                   positive_results_only: true
 
       .columns.medium-6
         article

data/app/views/renalware/hd/current_profile/_summary.html.slim

@@ -1,4 +1,4 @@
-article
+article.hd-profile-summary
   header
     h2.noprint= t(".title")
     ul

data/app/views/renalware/hd/dashboards/show.html.slim

@@ -21,8 +21,13 @@
                  patient: dashboard.patient,
                  access: dashboard.access
 
+    .medium-6.large-4.xlarge-3.columns
+        = render "renalware/virology/profiles/summary",
+                 patient: dashboard.patient,
+                 positive_results_only: true
+
     - unless dashboard.preference_set.new_record?
-      .medium-6.large-4.xlarge-6.columns
+      .medium-6.large-4.xlarge-3.columns
         = render "renalware/hd/preference_sets/summary",
                  patient: dashboard.patient,
                  preference_set: dashboard.preference_set

data/app/views/renalware/hd/mdm/_top.html.slim

@@ -3,5 +3,9 @@
 .columns.small-12.medium-6.large-3
   - if mdm.access.present?
     = render "renalware/hd/accesses/summary", access: mdm.access, patient: mdm.patient
+.columns.medium-12.large-6
+  = render "renalware/virology/profiles/summary",
+           patient: mdm.patient,
+           positive_results_only: true
 .columns.medium-12.large-6
   = render "prescriptions", mdm: mdm, with_esa: true

data/app/views/renalware/hd/preference_sets/_summary.html.slim

@@ -1,4 +1,4 @@
-article
+article.hd-preference-sets
   header
     h2= t(".title")
     ul

data/app/views/renalware/hd/protocols/_virology.html.slim

@@ -0,0 +1,7 @@
+- document = Renalware::Virology.cast_patient(protocol.patient).profile&.document || Renalware::NullObject.instance
+table(style="text-align: left;")
+  - %i(hiv hepatitis_b hepatitis_c).each do |attr|
+    - if document.public_send(attr).status&.yes?
+      tr
+        th= attr_name(document, attr)
+        td= document.public_send(attr).to_s

data/app/views/renalware/hd/protocols/show.pdf.slim

@@ -15,13 +15,18 @@
             - if clinical_patient.allergy_status_updated_at
               span.allergy_status_updated_at
                 = "#{l(clinical_patient.allergy_status_updated_at&.to_date)}"
+
           th.protocol-prescriptions Prescriptions on HD
           th.protocol-recent-pathology Recent Pathology
       tbody
         tr
-          td= render "profile", profile: protocol.profile
-          td= render "allergies", patient: protocol.patient
-          td= render "prescriptions", prescriptions: protocol.prescriptions
+          td
+            = render "profile", profile: protocol.profile
+          td
+            = render "allergies", patient: protocol.patient
+            = render "virology", protocol: protocol
+          td
+            = render "prescriptions", prescriptions: protocol.prescriptions
           td
             = render "recent_pathology", recent_pathology: protocol.recent_pathology
             = render "latest_dry_weight", latest_dry_weight: protocol.latest_dry_weight

data/app/views/renalware/letters/letters/_letter.html.slim

@@ -1,32 +1,32 @@
 - columns = local_assigns[:columns] || []
-
-tr(class=letter.state.dasherize)
-  td
-    = link_to "Toggle", "#quick-preview-#{letter.id}", data: { behaviour: "toggler" }
-    = pipe_separator
-    = link_to letter.view_label, patient_letters_letter_path(letter.patient, letter)
-    - if policy(letter).update?
-      = pipe_separator
-      = link_to "Edit", edit_patient_letters_letter_path(letter.patient, letter)
-    - if policy(letter).destroy?
+- cache([letter, columns.join("-")]) do
+  tr(class=letter.state.dasherize)
+    td
+      = link_to "Toggle", "#quick-preview-#{letter.id}", data: { behaviour: "toggler" }
       = pipe_separator
-      = link_to "Delete",
-                patient_letters_letter_path(letter.patient, letter),
-                method: :delete,
-                data: { confirm: I18n.t("prompts.confirm_delete") }
+      = link_to letter.view_label, patient_letters_letter_path(letter.patient, letter)
+      - if policy(letter).update?
+        = pipe_separator
+        = link_to "Edit", edit_patient_letters_letter_path(letter.patient, letter)
+      - if policy(letter).destroy?
+        = pipe_separator
+        = link_to "Delete",
+                  patient_letters_letter_path(letter.patient, letter),
+                  method: :delete,
+                  data: { confirm: I18n.t("prompts.confirm_delete") }
 
-  td.state
-    span= letter.state_description
-  td= l(letter.issued_on)
-  - if columns.include?(:author)
-    td.col-width-medium-with-ellipsis= letter.author
-  - if columns.include?(:patient)
-    td.col-width-medium-with-ellipsis= default_patient_link(letter.patient)
-  td.recipient= letter.main_recipient.address
-  td.col-width-medium-with-ellipsis= letter.description
+    td.state
+      span= letter.state_description
+    td= l(letter.issued_on)
+    - if columns.include?(:author)
+      td.col-width-medium-with-ellipsis= letter.author
+    - if columns.include?(:patient)
+      td.col-width-medium-with-ellipsis= default_patient_link(letter.patient)
+    td.recipient= letter.main_recipient.address
+    td.col-width-medium-with-ellipsis= letter.description
 
-= content_tag(:tr, id: "quick-preview-#{letter.id}", style: "display: none")
-  td
-  td(colspan=8)
-    .quick-preview
-      = simple_format letter.body
+  = content_tag(:tr, id: "quick-preview-#{letter.id}", style: "display: none")
+    td
+    td(colspan=8)
+      .quick-preview
+        = simple_format letter.body

data/app/views/renalware/letters/letters/_table.html.slim

@@ -16,5 +16,4 @@ table.auto-layout.letters.has-togglable-rows
   tbody
     = render partial: "renalware/letters/letters/letter",
              collection: letters,
-             cached: true,
              locals: { columns: columns }

data/app/views/renalware/patients/patients/new.html.slim

@@ -1,5 +1,20 @@
 = within_admin_layout(title: "New", breadcrumbs: breadcrumb_for("Patients", patients_path)) do
+
+  .panel.warn
+    h2 Before adding a patient, please check they are not already in Renalware
+    span
+      | Use the search at the top left of this page to identify a patient
+      |  using their name or hospital/NHS number.
+      br
+      | If you find a match remember to check
+      |  their name, date of birth and hospital numbers from the different hospitals.
+      br
+      | Please
+      b  DO NOT ADD A PATIENT 
+      |  if you think they already exist on the database - check first and add them later if necessary
+
   .row
+
     = render "renalware/shared/errors", model: patient
 
     = simple_form_for patient,

data/app/views/renalware/shared/documents/_dated_boolean_diagnosis_input.html.slim

@@ -0,0 +1,9 @@
+- renderable = f.object.public_send(attribute)
+= f.simple_fields_for attribute, renderable do |fd|
+  .row(class=attribute)
+    .columns.small-12.medium-3.large-3
+      = fd.label attribute, f.object.class.human_attribute_name(attribute)
+    .columns.small-4.medium-4.large-3
+      = fd.input :diagnosis, as: :inline_radio_buttons, wrapper: :bare
+    .columns.small-7.medium-5.large-4.end
+      = fd.input :diagnosed_on, as: :date_picker, label: "Diagnosed", input_html: { class: "tiny-input" }

data/app/views/renalware/shared/documents/_year_dated_diagnosis_input.html.slim

@@ -0,0 +1,21 @@
+- renderable = f.object.public_send(attribute)
+
+    td= fd.label :status, f.object.class.human_attribute_name(attribute)
+    td= fd.input :status, as: :inline_radio_buttons,
+        label: false, wrapper: "vertical_form"
+    td= fd.input :confirmed_on_year, label: false, wrapper: "vertical_form",
+          collection: Renalware::YearDatedConfirmation.valid_years.reverse,
+          input_html: { class: "tiny-input" }
+
+
+= f.simple_fields_for attribute, renderable do |fd|
+  .row(class=attribute)
+    .columns.small-12.medium-3.large-3
+      = fd.label attribute, f.object.class.human_attribute_name(attribute)
+    .columns.small-4.medium-4.large-3
+      = fd.input :status, as: :inline_radio_buttons, wrapper: :bare
+    .columns.small-6.medium-5.large-4.end
+      = fd.input :confirmed_on_year,
+                 label: "Diagnosed",
+                 collection: Renalware::YearDatedConfirmation.valid_years.reverse,
+                 input_html: { class: "tiny-input" }

data/app/views/renalware/virology/dashboards/_actions.html.slim

@@ -1,3 +1,4 @@
+= link_to "Edit Profile", edit_patient_virology_profile_path(patient), class: "button secondary"
 a.button.dropdown(href="#"
                   data-dropdown="virology-options"
                   aria-controls="virology-options"

data/app/views/renalware/virology/dashboards/show.html.slim

@@ -2,5 +2,5 @@
   = render "actions", patient: patient
 
 = within_patient_layout(title: "Virology") do
-
+  = render "renalware/virology/profiles/summary", patient: patient
   = render "renalware/virology/vaccinations/list", vaccinations: vaccinations, patient: patient

data/app/views/renalware/virology/profiles/_summary.html.slim

@@ -0,0 +1,16 @@
+- profile = Renalware::Virology.cast_patient(patient).profile
+- document = profile&.document || Renalware::NullObject.instance
+- positive_results_only = local_assigns.fetch(:positive_results_only, false)
+
+article
+  header
+    h2 Virology
+    ul
+      li= link_to "Edit", edit_patient_virology_profile_path(patient), class: "button"
+
+  dl.dl-horizontal.medium
+    - %i(hiv hepatitis_b hepatitis_c).each do |attr_name|
+      - status = document.public_send(attr_name).status
+      - next if positive_results_only && !status&.yes?
+      dt= attr_name(document, attr_name)
+      dd= document.public_send(attr_name).to_s

data/app/views/renalware/virology/profiles/edit.html.slim

@@ -0,0 +1,18 @@
+= within_patient_layout(title: "Edit Profile",
+      breadcrumbs: breadcrumb_for("Virology", patient_virology_dashboard_path(patient))) do
+
+  = simple_form_for(profile,
+                    url: patient_virology_profile_path(patient, profile),
+                    method: :patch,
+                    html: { autocomplete: "off" },
+                    wrapper: :horizontal_form) do |f|
+
+    = f.simple_fields_for :document, profile.document do |fd|
+      .hint If YES, enter year of diagnosis
+      = render_input fd, :hiv
+      = render_input fd, :hepatitis_b
+      = render_input fd, :hepatitis_c
+
+    = f.submit "Save", class: "button"
+    span= " or "
+    = link_to "cancel", patient_virology_dashboard_path(patient)

data/config/initializers/inflections.rb

@@ -29,6 +29,7 @@ ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.acronym "GP"
   inflect.acronym "HD"
   inflect.acronym "HDF"
+  inflect.acronym "HIV"
   inflect.acronym "HL7"
   inflect.acronym "MDM"
   inflect.acronym "NHS"

data/config/locales/renalware/patient.yml

@@ -16,7 +16,10 @@ en:
         renalreg_recorded_by: Renal Reg decision recorded by
         rpv_recorded_by: RPV decision recorded by
         language: Main Language
+  activemodel:
     attributes:
+      renalware/patient_document:
+        diabetes: Diabetes
       renalware/patient_document/history:
         alcohol:
         smoking:

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

@@ -8,6 +8,12 @@ en:
       dashboards:
         actions:
           add_vaccination: Vaccination
+  activemodel:
+    attributes:
+      renalware/virology/profile_document:
+        hiv: HIV
+        hepatitis_b: Hepatitis B
+        hepatitis_c: Hepatitis C
   enumerize:
     renalware/virology/vaccination/document:
       type:

data/config/routes.rb

@@ -437,6 +437,7 @@ Renalware::Engine.routes.draw do
 
     namespace :virology do
       resource :dashboard, only: :show, path: "/dashboard"
+      resource :profile, except: :destroy
 
       resources :vaccinations,
               only: [:new, :create, :edit, :update],

data/db/migrate/20180502093256_add_document_to_virology_profiles.rb

@@ -0,0 +1,29 @@
+# rubocop:disable Metrics/MethodLength
+class AddDocumentToVirologyProfiles < ActiveRecord::Migration[5.1]
+  def change
+    add_column :virology_profiles,
+               :document,
+               :jsonb,
+               default: {},
+               null: false
+
+    add_reference :virology_profiles,
+                  :updated_by,
+                  foreign_key:
+                  { to_table: :users },
+                  index: true,
+                  null: true
+
+    add_reference :virology_profiles,
+                  :created_by,
+                  foreign_key:
+                  { to_table: :users },
+                  index: true,
+                  null: true
+
+    add_column :virology_profiles, :updated_at, :datetime
+    add_column :virology_profiles, :created_at, :datetime
+
+    add_index :virology_profiles, :document, using: :gin
+  end
+end

data/db/migrate/20180502110638_create_virology_versions.rb

@@ -0,0 +1,10 @@
+class CreateVirologyVersions < ActiveRecord::Migration[5.1]
+  def change
+    create_table :virology_versions do |t|
+      t.string   :item_type, null: false
+      t.integer  :item_id,   null: false
+      t.datetime :created_at
+    end
+    add_index :virology_versions, [:item_type, :item_id]
+  end
+end

data/lib/renalware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renalware
-  VERSION = "2.0.21"
+  VERSION = "2.0.22"
 end

data/spec/factories/virology/patients.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :virology_patient, class: "Renalware::Virology::Patient", parent: :patient
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.21
+  version: 2.0.22
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-27 00:00:00.000000000 Z
+date: 2018-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.2.5
+        version: 8.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.2.5
+        version: 8.4.1
 - !ruby/object:Gem::Dependency
   name: chosen-rails
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: dumb_delegator
   requirement: !ruby/object:Gem::Requirement
@@ -352,14 +352,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.7
+        version: 0.16.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.7
+        version: 0.16.2
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -548,14 +548,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -590,14 +590,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -1186,13 +1186,16 @@ files:
 - app/controllers/renalware/transplants/registration_statuses_controller.rb
 - app/controllers/renalware/transplants/registrations_controller.rb
 - app/controllers/renalware/transplants/wait_lists_controller.rb
+- app/controllers/renalware/virology/base_controller.rb
 - app/controllers/renalware/virology/dashboards_controller.rb
+- app/controllers/renalware/virology/profiles_controller.rb
 - app/controllers/renalware/virology/vaccinations_controller.rb
 - app/documents/renalware/accesses/assessment_document.rb
 - app/documents/renalware/age.rb
 - app/documents/renalware/binary_marker.rb
 - app/documents/renalware/blood_group.rb
 - app/documents/renalware/blood_pressure.rb
+- app/documents/renalware/dated_boolean_diagnosis.rb
 - app/documents/renalware/dated_confirmation.rb
 - app/documents/renalware/dated_integer.rb
 - app/documents/renalware/dated_result.rb
@@ -1213,7 +1216,9 @@ files:
 - app/documents/renalware/transplants/recipient_operation_document.rb
 - app/documents/renalware/transplants/recipient_workup_document.rb
 - app/documents/renalware/transplants/registration_document.rb
+- app/documents/renalware/virology/profile_document.rb
 - app/documents/renalware/year_dated_confirmation.rb
+- app/documents/renalware/year_dated_diagnosis.rb
 - app/drops/renalware/patients/patient_drop.rb
 - app/drops/renalware/pd/exit_site_infection_drop.rb
 - app/drops/renalware/pd/patient_drop.rb
@@ -1732,8 +1737,10 @@ files:
 - app/models/renalware/user.rb
 - app/models/renalware/version.rb
 - app/models/renalware/virology.rb
+- app/models/renalware/virology/patient.rb
 - app/models/renalware/virology/profile.rb
 - app/models/renalware/virology/vaccination.rb
+- app/models/renalware/virology/version.rb
 - app/models/renalware/zip_archive.rb
 - app/policies/application_policy.rb
 - app/policies/renalware/admin/cache_policy.rb
@@ -1794,6 +1801,7 @@ files:
 - app/policies/renalware/transplants/registration_policy.rb
 - app/policies/renalware/user_policy.rb
 - app/policies/renalware/virology/dasboard_policy.rb
+- app/policies/renalware/virology/profile_policy.rb
 - app/policies/renalware/virology/vaccination_policy.rb
 - app/policies/renalware/yaml_permission_configuration.rb
 - app/presenters/date_presenter.rb
@@ -2167,6 +2175,7 @@ files:
 - app/views/renalware/hd/protocols/_prescriptions.html.slim
 - app/views/renalware/hd/protocols/_profile.html.slim
 - app/views/renalware/hd/protocols/_recent_pathology.html.slim
+- app/views/renalware/hd/protocols/_virology.html.slim
 - app/views/renalware/hd/protocols/show.pdf.slim
 - app/views/renalware/hd/sessions/_empty_row.html.slim
 - app/views/renalware/hd/sessions/_form.html.slim
@@ -2587,6 +2596,8 @@ files:
 - app/views/renalware/shared/documents/_blood_group_input.html.slim
 - app/views/renalware/shared/documents/_blood_pressure.html.slim
 - app/views/renalware/shared/documents/_blood_pressure_input.html.slim
+- app/views/renalware/shared/documents/_dated_boolean_diagnosis.html.slim
+- app/views/renalware/shared/documents/_dated_boolean_diagnosis_input.html.slim
 - app/views/renalware/shared/documents/_dated_confirmation.html.slim
 - app/views/renalware/shared/documents/_dated_confirmation_input.html.slim
 - app/views/renalware/shared/documents/_dated_integer.html.slim
@@ -2605,6 +2616,7 @@ files:
 - app/views/renalware/shared/documents/_smoking_status_input.html.slim
 - app/views/renalware/shared/documents/_year_dated_confirmation.html.slim
 - app/views/renalware/shared/documents/_year_dated_confirmation_input.html.slim
+- app/views/renalware/shared/documents/_year_dated_diagnosis_input.html.slim
 - app/views/renalware/snippets/snippet_invocations/create.js.erb
 - app/views/renalware/snippets/snippets/_form.html.slim
 - app/views/renalware/snippets/snippets/_list.html.slim
@@ -2694,6 +2706,8 @@ files:
 - app/views/renalware/transplants/wait_lists/show.html.slim
 - app/views/renalware/virology/dashboards/_actions.html.slim
 - app/views/renalware/virology/dashboards/show.html.slim
+- app/views/renalware/virology/profiles/_summary.html.slim
+- app/views/renalware/virology/profiles/edit.html.slim
 - app/views/renalware/virology/vaccinations/_cell.html.slim
 - app/views/renalware/virology/vaccinations/_inputs.html.slim
 - app/views/renalware/virology/vaccinations/_list.html.slim
@@ -3216,6 +3230,8 @@ files:
 - db/migrate/20180419141524_add_cols_to_hd_patient_statistics.rb
 - db/migrate/20180422090043_update_hd_overall_audit_to_version_6.rb
 - db/migrate/20180427133558_add_code_to_hospitals_wards.rb
+- db/migrate/20180502093256_add_document_to_virology_profiles.rb
+- db/migrate/20180502110638_create_virology_versions.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb
@@ -3518,6 +3534,7 @@ files:
 - spec/factories/transplants/registration_status_descriptions.rb
 - spec/factories/transplants/registration_statuses.rb
 - spec/factories/transplants/registrations.rb
+- spec/factories/virology/patients.rb
 - spec/factories/virology/vaccinations.rb
 - spec/support/capybara.rb
 - spec/support/capybara_helper.rb