renalware-core 2.0.0.pre.beta4 → 2.0.0.pre.beta5

data/app/policies/renalware/messaging/receipt_policy.rb

@@ -0,0 +1,19 @@
+require_dependency "renalware/messaging"
+
+module Renalware
+  module Messaging
+    class ReceiptPolicy < BasePolicy
+      def mark_as_read?
+        update?
+      end
+
+      def unread?
+        index?
+      end
+
+      def read?
+        index?
+      end
+    end
+  end
+end

data/app/policies/renalware/modalities/description_policy.rb

@@ -0,0 +1,22 @@
+require_dependency "renalware/messaging"
+
+module Renalware
+  module Modalities
+    class DescriptionPolicy < BasePolicy
+      # For safety we currently disallow the deletion of any ModalityDescription
+      def destroy?
+        false
+      end
+
+      # Its only possible to edit a ModalityDescription (e.g. to change its name) when it has no
+      # (STI) type - ie its not a system-required ModalityDescription.
+      def edit?
+        record.type.nil?
+      end
+
+      def update?
+        edit?
+      end
+    end
+  end
+end

data/app/policies/renalware/patients/alert_policy.rb

@@ -0,0 +1,8 @@
+require_dependency "renalware/patients"
+
+module Renalware
+  module Patients
+    class AlertPolicy < BasePolicy
+    end
+  end
+end

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

@@ -40,7 +40,12 @@ module Renalware
       end
 
       def body_compositions
-        @body_compositions ||= BodyComposition.for_patient(patient).ordered
+        @body_compositions ||= begin
+          BodyComposition
+            .for_patient(patient)
+            .includes([:modality_description, :assessor])
+            .ordered
+        end
       end
     end
   end

data/app/presenters/renalware/dashboard/dashboard_presenter.rb

@@ -6,9 +6,6 @@ module Renalware
     class DashboardPresenter
       def initialize(user)
         @user = user
-        @bookmarker = Patients.cast_user(user)
-        @typists = Letters.cast_typist(user)
-        @author = Letters.cast_author(user)
       end
 
       attr_reader :user
@@ -18,14 +15,27 @@ module Renalware
       end
 
       def bookmarks
-        @bookmarks ||= @bookmarker
-                         .bookmarks
-                         .ordered
-                         .includes(patient: [current_modality: :description])
+        @bookmarks ||= begin
+          Patients.cast_user(user)
+                  .bookmarks
+                  .ordered
+                  .includes(patient: [current_modality: :description])
+        end
       end
 
       def letters_in_progress
-        @letters_in_progress ||= present_letters(@author.letters.in_progress.reverse)
+        @letters_in_progress ||= begin
+          present_letters(
+            Letters.cast_author(user).letters.in_progress.reverse
+          )
+        end
+      end
+
+      def unread_messages_receipts
+        @unread_messages_receipts ||= begin
+          receipts = Messaging.cast_recipient(user).receipts.unread
+          CollectionPresenter.new(receipts, Messaging::ReceiptPresenter)
+        end
       end
 
       private

data/app/presenters/renalware/events/events_presenter.rb

@@ -0,0 +1,37 @@
+require_dependency "renalware/events"
+
+module Renalware
+  module Events
+    class EventsPresenter < SimpleDelegator
+      attr_reader :patient
+
+      def initialize(patient, events)
+        @patient = patient
+        super(events)
+      end
+
+      def users_for_filtering
+        User.where(id: ids_of_users_having_created_events_for_this_patient)
+            .distinct
+            .order(family_name: :asc)
+      end
+
+      def event_types_for_filtering
+        Events::Type
+          .where(id: all_event_type_ids_in_use_for_this_patient)
+          .distinct
+          .order(name: :asc)
+      end
+
+      private
+
+      def ids_of_users_having_created_events_for_this_patient
+        Event.for_patient(patient).pluck(:created_by_id)
+      end
+
+      def all_event_type_ids_in_use_for_this_patient
+        Event.for_patient(patient).pluck(:event_type_id)
+      end
+    end
+  end
+end

data/app/presenters/renalware/hd/station_presenter.rb

@@ -0,0 +1,10 @@
+module Renalware
+  module HD
+    class StationPresenter < SimpleDelegator
+      def name
+        super.blank? ? "Unnamed Station" : super
+      end
+    end
+  end
+end
+

data/app/presenters/renalware/messaging/internal_message_presenter.rb

@@ -0,0 +1,19 @@
+require_dependency "renalware/messaging"
+
+module Renalware
+  module Messaging
+    class InternalMessagePresenter < SimpleDelegator
+      def age_in_days
+        (Time.zone.now.to_date - sent_at.to_date).to_i
+      end
+
+      def html_identifier
+        "message-#{id}"
+      end
+
+      def html_preview_identifier
+        "message-preview-#{id}"
+      end
+    end
+  end
+end

data/app/presenters/renalware/messaging/receipt_presenter.rb

@@ -0,0 +1,11 @@
+require_dependency "renalware/messaging"
+
+module Renalware
+  module Messaging
+    class ReceiptPresenter < SimpleDelegator
+      def message
+        @message ||= Messaging::InternalMessagePresenter.new(super)
+      end
+    end
+  end
+end

data/app/presenters/renalware/pd/dashboard_presenter.rb

@@ -1,3 +1,6 @@
+require_dependency "renalware/pd"
+require_dependency "renalware/events"
+
 module Renalware
   module PD
     class DashboardPresenter
@@ -43,6 +46,10 @@ module Renalware
       def training_sessions
         @training_sessions ||= TrainingSession.for_patient(patient).ordered
       end
+
+      def latest_pd_line_change_events
+        @latest_pd_line_change_events ||= Events::LineChangeEventQuery.new(patient).call(limit: 1)
+      end
     end
   end
 end

data/app/presenters/renalware/pd/mdm_presenter.rb

@@ -4,6 +4,10 @@ module Renalware
       def current_regime
         @current_regime ||= patient.pd_regimes&.current
       end
+
+      def latest_pd_line_change_events
+        @latest_pd_line_change_events ||= Events::LineChangeEventQuery.new(patient).call(limit: 1)
+      end
     end
   end
 end

data/app/views/renalware/admin/users/edit.html.slim

@@ -1,41 +1,41 @@
-.row
-  = render "header"
+= within_admin_layout(title: "Edit",
+                      breadcrumbs: breadcrumb_for("Users", admin_users_path)) do
 
-.row
-  .columns.small-12
-    h2= @user
+  h2= @user
 
-    = simple_form_for @user,
-                      html: { autocomplete: "off" },
-                      url: admin_user_path(@user) do |f|
-      = f.input :approved, as: :hidden, input_html: { value: true }
+  = simple_form_for @user,
+                    html: { autocomplete: "off" },
+                    url: admin_user_path(@user) do |f|
+    = f.input :approved, as: :hidden, input_html: { value: true }
 
-      - if @user.errors.any?
-        ul.error-messages
-          - @user.errors.full_messages.each do |msg|
-            li= msg
+    - if @user.errors.any?
+      ul.error-messages
+        - @user.errors.full_messages.each do |msg|
+          li= msg
 
-      - if @user.expired?
-        .row
-          = check_box_tag "user[unexpire]", true, false, class: "inline"
-          = label_tag :user_unexpire, "Reactivate account"
+    - if @user.expired?
+      .row
+        = check_box_tag "user[unexpire]", true, false, class: "inline"
+        = label_tag :user_unexpire, "Reactivate account"
 
-      - Renalware::Role.all.each_with_index do |role, index|
-        - element_id = "user_role_ids_#{index}"
-        = check_box_tag "user[role_ids][]",
-                        role.id,
-                        @user.has_role?(role.name),
-                        disabled: role.hidden,
-                        id: element_id,
-                        class: "inline"
-        = label_tag element_id, role.name.humanize
+    br
+    - Renalware::Role.all.each_with_index do |role, index|
+      - element_id = "user_role_ids_#{index}"
+      = check_box_tag "user[role_ids][]",
+                      role.id,
+                      @user.has_role?(role.name),
+                      disabled: role.hidden,
+                      id: element_id,
+                      class: "inline"
+      = label_tag element_id, role.name.humanize
+    br
+    br
+    = f.input :telephone,
+              input_html: { class: "input small" },
+              wrapper: :horizontal_small
 
-      .row
-        .large-2.columns
-          = f.input :telephone, input_html: { class: "input small" }
 
-      .row
-        - msg = @user.approved? ? "Update" : "Approve"
-        = f.submit msg, class: "button"
-        span= " or "
-        = link_to "cancel", admin_users_path
+    - msg = @user.approved? ? "Update" : "Approve"
+    = f.submit msg, class: "button"
+    span= " or "
+    = link_to "cancel", admin_users_path

data/app/views/renalware/admin/users/index.html.slim

@@ -1,7 +1,13 @@
-.row
-  = render "header"
+= within_admin_layout(title: "Users") do
+
+  dl.sub-nav
+    dd(class=("active" if params[:q].nil?))
+      = link_to "All", admin_users_path(q: nil)
+    dd(class=("active" if params.fetch(:q, {})[:unapproved]))
+      = link_to "Unapproved", admin_unapproved_users_path
+    dd(class=("active" if params.fetch(:q, {})[:inactive]))
+      = link_to "Inactive", admin_inactive_users_path
 
-.row
   table
     thead
       th.col-width-tiny

data/app/views/renalware/clinical/body_compositions/_form.html.slim

@@ -29,7 +29,7 @@
             wrapper: :horizontal_small
   = f.input :quality_of_reading,
             wrapper: :horizontal_small
-  = f.text_area :notes, { rows: 5 }
+  = f.input :notes, as: :text, input_html: { rows: 5 }
 
 
 .row

data/app/views/renalware/clinical/body_compositions/_list.html.slim

@@ -2,7 +2,7 @@ article.body_compositions
   header
     h2= t(".title")
     = link_to t(".add"),
-              new_patient_clinical_body_composition_path(@patient),
+              new_patient_clinical_body_composition_path(patient),
               class: "button right"
   table
     thead

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

@@ -1,8 +1,8 @@
 = within_patient_layout(title: "Body Composition Measurement") do
 
   .document
-    = simple_form_for @body_composition,
-        url: patient_clinical_body_composition_path(@patient, @body_composition),
+    = simple_form_for body_composition,
+        url: patient_clinical_body_composition_path(patient, body_composition),
         html: { autocomplete: "off" },
         wrapper: "horizontal_form" do |f|
       = render "form", f: f, patient: patient

data/app/views/renalware/clinics/clinic_visits/_form.html.slim

@@ -25,11 +25,11 @@
         = f.input :weight, wrapper: :horizontal_small
         = f.input :bp,
                   label: "Blood Pressure",
-                  placeholder: "eg. 110/70",
+                  placeholder: "e.g. 110/70",
                   wrapper: :horizontal_small
         = f.input :standing_bp,
                   label: "Standing BP",
-                  placeholder: "eg. 110/70",
+                  placeholder: "e.g. 110/70",
                   wrapper: :horizontal_small
         = f.input :pulse, wrapper: :horizontal_small
         = f.input :temperature, wrapper: :horizontal_small

data/app/views/renalware/dashboard/bookmarks/_bookmark.html.slim

@@ -1,6 +1,5 @@
 tr class=("urgent" if bookmark.urgent?)
-  td= link_to "View", patient_clinical_summary_path(bookmark.patient)
-  td= bookmark.patient
+  td= link_to bookmark.patient.to_s(:long), patient_clinical_summary_path(bookmark.patient)
   td= bookmark.patient.hospital_identifier
   td= I18n.l bookmark.patient.born_on
   td= bookmark.patient.age
@@ -8,6 +7,6 @@ tr class=("urgent" if bookmark.urgent?)
   td= bookmark.patient.current_modality
   td= bookmark.notes
   td= I18n.l bookmark.created_at
-  td= render "renalware/patients/bookmarks/delete",
-             bookmark: bookmark,
-             link_text: "Remove"
+  td.nowrap= render "renalware/patients/bookmarks/delete",
+                    bookmark: bookmark,
+                    link_text: "Remove"

data/app/views/renalware/dashboard/bookmarks/_table.html.slim

@@ -1,8 +1,7 @@
 table.auto-layout
   thead
     tr
-      th.col-width-tiny
-      th.col-width-medium= t(".patient_name")
+      th.col-width-large= t(".patient_name")
       th.col-width-reference-no= t(".hospital_number")
       th.col-width-date= t(".born_on")
       th.col-width-tiny= t(".age")

data/app/views/renalware/dashboard/dashboards/_content.html.slim

@@ -17,7 +17,13 @@
 
   section.messages
     h2 Messages
-    p.empty-section= t(".messages.none")
+    - if dashboard.unread_messages_receipts.any?
+      = render "renalware/messaging/shared/key"
+      .unread-messages
+        = render "renalware/messaging/receipts/table",
+                 receipts: dashboard.unread_messages_receipts
+    - else
+      p.empty-section= t(".messages.none")
 
   section.electonic_ccs
     h2 Electronic CCs

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

@@ -10,7 +10,7 @@ tr(class=letter.state.dasherize)
     span= letter.state_description
   td= l letter.issued_on
   td= letter.author
-  td= link_to letter.patient, patient_path(letter.patient)
+  td= link_to letter.patient, patient_clinical_summary_path(letter.patient)
   td= letter.description
 = content_tag(:tr, id: "quick-preview-#{letter.id}", style: "display: none")
   td

data/app/views/renalware/deaths/edit.html.slim

@@ -1,38 +1,35 @@
-= within_patient_layout(title: "Demographics") do
+= within_patient_layout(title: "Cause of Death",
+    breadcrumbs: breadcrumb_for("Clinical Profile", patient_clinical_profile_path(@patient))) do
 
-  .row
-    .large-12.columns
-      = render "renalware/shared/errors", model: @patient
+  = simple_form_for @patient,
+      url: patient_death_path(@patient),
+      html: { autocomplete: "off" },
+      wrapper: "horizontal_form" do |f|
 
-      = simple_form_for @patient,
-          url: patient_death_path(@patient),
-          html: { autocomplete: "off" },
-          wrapper: "horizontal_form" do |f|
+    = f.input :died_on,
+              as: :date_picker,
+              label: "Date of Death",
+              wrapper: :horizontal_datepicker
 
-        .row
-          .large-12.columns
-            fieldset
-              legend Cause of Death
-              .large-9.columns
-                = f.input :died_on, as: :date_picker, label: "Date of Death"
-
-                = f.association :first_cause,
+    = f.association :first_cause,
                     label: "Cause of Death (1)",
                     label_method: :description,
                     value_method: :id,
-                    include_blank: "Select 1st cause of death"
+                    include_blank: "Select 1st cause of death",
+                    wrapper: :horizontal_medium
 
-                = f.association :second_cause,
+    = f.association :second_cause,
                     label: "Cause of Death (2)",
                     label_method: :description,
                     value_method: :id,
-                    include_blank: "Select 2nd cause of death"
+                    include_blank: "Select 2nd cause of death",
+                    wrapper: :horizontal_medium
 
-                = f.input :death_notes, label: "Notes",
-                    as: :text, input_html: { rows: 5 }
+    = f.input :death_notes,
+              label: "Notes",
+              as: :text, input_html: { rows: 5 },
+              wrapper: :horizontal_large
 
-        .row
-          .large-12.columns
-            = f.button :submit
-            span= " or "
-            = link_to "cancel", patient_clinical_profile_path(@patient)
+    = f.button :submit
+    span= " or "
+    = link_to "cancel", patient_clinical_profile_path(@patient)

data/app/views/renalware/deaths/index.html.slim

@@ -1,7 +1,6 @@
 = within_admin_layout(title: "Patients") do
   = render "renalware/patients/index_header"
 
-
   table#patients-deceased
     thead
       tr

data/app/views/renalware/devise/registrations/edit.html.slim

@@ -1,5 +1,5 @@
-= render layout: "renalware/dashboard/dashboards/layout",
-         locals: { user: resource, title: "Update Profile" } do
+= within_admin_layout(title: "Update Profile")
+
   .document
     h4 #{resource}'s Profile
 

data/app/views/renalware/devise/sessions/new.html.slim

@@ -17,7 +17,7 @@
                     html: { autocomplete: "off" }) do |f|
     = f.input :username, input_html: { autofocus: true }, required: false
     = f.input :password, input_html: { autocomplete: "off" }
-    = f.input :remember_me, as: :boolean if devise_mapping.rememberable?
+    = f.input(:remember_me, as: :boolean, boolean_style: :inline) if devise_mapping.rememberable?
 
     .actions
       = f.submit "Log in", class: "button save"

data/app/views/renalware/directory/people/_address_form.html.slim

@@ -1,14 +1,16 @@
 = f.simple_fields_for :address, wrapper: "horizontal_form" do |fa|
   = fa.input :name,
-              placeholder: "If different than above (optional)"
+              placeholder: "If different than above (optional)",
+              wrapper: :horizontal_medium
   = fa.input :organisation_name,
-              placeholder: "e.g. practice or hospital name (optional)"
-  = fa.input :street_1
-  = fa.input :street_2
-  = fa.input :street_3
-  = fa.input :town
-  = fa.input :county
-  = fa.input :postcode
-  = fa.input :country, as: :string
-  = fa.input :telephone
-  = fa.input :email
+              placeholder: "e.g. practice or hospital name (optional)",
+              wrapper: :horizontal_medium
+  = fa.input :street_1, wrapper: :horizontal_medium
+  = fa.input :street_2, wrapper: :horizontal_medium
+  = fa.input :street_3, wrapper: :horizontal_medium
+  = fa.input :town, wrapper: :horizontal_small
+  = fa.input :county, wrapper: :horizontal_small
+  = fa.input :postcode, wrapper: :horizontal_small
+  = fa.input :country, as: :string, wrapper: :horizontal_small
+  = fa.input :telephone, wrapper: :horizontal_small
+  = fa.input :email, wrapper: :horizontal_small

data/app/views/renalware/directory/people/_filters.html.slim

@@ -0,0 +1,9 @@
+.search-form.filters
+  = simple_form_for q, as: :q, url: directory_people_path, method: :get do |f|
+    .row
+      .small-8.medium-6.large-4.columns
+        = f.input :name_cont, label: "Name contains"
+      .small-4.end.columns.actions
+        = f.submit t("helpers.submit.filter"), class: "button"
+        span= " or "
+        = link_to t("helpers.reset"), directory_people_path

data/app/views/renalware/directory/people/_form.html.slim

@@ -1,17 +1,15 @@
-.form-content2
-  .large-8.columns
-    = simple_form_for @person,
-                      html: { autocomplete: "off" },
-                      wrapper: "horizontal_form" do |f|
-      = field_set_tag "Person" do
-        = f.input :title
-        = f.input :given_name
-        = f.input :family_name
+= simple_form_for person,
+                  html: { autocomplete: "off" },
+                  wrapper: "horizontal_form" do |f|
+  = field_set_tag "Person" do
+    = f.input :title, wrapper: :horizontal_tiny
+    = f.input :given_name, wrapper: :horizontal_medium
+    = f.input :family_name, wrapper: :horizontal_medium
 
-      = field_set_tag "Postal Address" do
-        = render "address_form", f: f
+  = field_set_tag "Postal Address" do
+    = render "address_form", f: f
 
-      = f.button :submit
-      span= " or "
-      = link_to "cancel", directory_people_path
+  = f.button :submit
+  span= " or "
+  = link_to "cancel", directory_people_path
 

data/app/views/renalware/directory/people/_person.html.slim

@@ -6,4 +6,4 @@ tr
   td= person.title
   td= link_to person.family_name, directory_person_path(person)
   td= link_to person.given_name, directory_person_path(person)
-  td= person.address
+  td.col-width-large-with-ellipsis= person.address

data/app/views/renalware/directory/people/_table.html.slim

@@ -0,0 +1,10 @@
+table.auto-layout.people
+  thead
+    tr
+      th.col-width-small
+      th.col-width-tiny Title
+      th.col-width-medium Family Name
+      th.col-width-medium Given Name
+      th Address
+  tbody
+    = render partial: "person", collection: people

data/app/views/renalware/directory/people/edit.html.slim

@@ -1,5 +1,5 @@
-.row
-  = render "header"
-  = render "renalware/shared/errors", model: @person
+= within_admin_layout(title: "Edit Person",
+                      breadcrumbs: breadcrumb_for("Directory", directory_people_path))
 
-= render "form"
+  = render "renalware/shared/errors", model: person
+  = render "form", person: person

data/app/views/renalware/directory/people/index.html.slim

@@ -1,31 +1,9 @@
-.row
-  = render "header"
+= content_for(:actions) do
+  = link_to "Add Person", new_directory_person_path, class: "button"
 
-.row
-  .search-form
-    fieldset
-      legend Filters
-      = simple_form_for @q, as: :q, url: directory_people_path, method: :get do |f|
-        .row
-          .large-8.columns
-            = f.input :name_cont, label: "Name contains"
-          .large-4.columns.actions
-            = f.submit t("helpers.submit.filter"), class: "button"
-            span= " or "
-            = link_to t("helpers.reset"), directory_people_path
+= within_admin_layout(title: "Directory")
+  = render "filters", q: q
 
-.row
-  = page_entries_info @people
-
-  table.auto-layout.people
-    thead
-      tr
-        th.col-width-small
-        th Title
-        th Family Name
-        th Given Name
-        th Address
-    tbody
-      = render partial: "person", collection: @people
-
-  = paginate @people
+  = page_entries_info people
+  = render "table", people: people
+  = paginate people