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

data/app/views/renalware/letters/parts/_recent_pathology_results.html.slim

@@ -1,11 +1,14 @@
 .list.investigations
   h3 Recent Investigations
 
-  p
-    - recent_pathology_results.each do |pathology_result|
-      - description, observation, date = pathology_result
-      - if observation.result.present?
-        span #{date}: #{description} #{observation.result};
-      - else
-        span   #{description};
-      |  
+  - if recent_pathology_results.any?
+    p
+      - recent_pathology_results.each do |pathology_result|
+        - description, observation, date = pathology_result
+        - if observation.result.present?
+          span #{date}: #{description} #{observation.result};
+        - else
+          span   #{description};
+        |  
+  - else
+    p None

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

@@ -0,0 +1,23 @@
+table#patients.mdm-patients.columns
+  thead
+    tr
+      th.col-width-tiny
+      th.col-width-large= sort_link([:renalware, presenter.q], :family_name, t(".name"))
+      th.col-width-nhs-no= t(".nhs_no")
+      th.col-width-reference-no= t(".hosp_no")
+      th.col-width-tiny= t(".sex")
+      th.col-width-tiny= t(".age")
+      th.col-width-tiny= t(".modality")
+      th.col-width-tiny= t(".hgb")
+      th.col-width-date= t(".hgb_date")
+      th.col-width-tiny= t(".ure")
+      th.col-width-date= t(".ure_date")
+      th.col-width-tiny= t(".cre")
+      th.col-width-date
+        = sort_link([:renalware, presenter.q], :patient_current_key_observation_set_cre_date, t(".cre_date"))
+      th.col-width-tiny= t(".mdrd")
+      th.col-width-date= t(".esrf")
+
+  tbody
+    - presenter.patients.each do |patient|
+      = render "patient", patient: patient, view_proc: presenter.view_proc, q: presenter.q

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

@@ -1,32 +1,9 @@
-.row.collapse
-  h1.page-heading.columns= presenter.page_title
+= within_admin_layout(title: presenter.page_title)
 
-.row
-  .columns
-    = render_if_exists "filters", presenter: presenter
-.row
-  table#patients.mdm-patients.columns
-    thead
-      tr
-        th.col-width-tiny
-        th.col-width-large= sort_link([:renalware, presenter.q], :family_name, t(".name"))
-        th.col-width-nhs-no= t(".nhs_no")
-        th.col-width-reference-no= t(".hosp_no")
-        th.col-width-tiny= t(".sex")
-        th.col-width-tiny= t(".age")
-        th.col-width-tiny= t(".modality")
-        th.col-width-tiny= t(".hgb")
-        th.col-width-date= t(".hgb_date")
-        th.col-width-tiny= t(".ure")
-        th.col-width-date= t(".ure_date")
-        th.col-width-tiny= t(".cre")
-        th.col-width-date
-          = sort_link([:renalware, presenter.q], :patient_current_key_observation_set_cre_date, t(".cre_date"))
-        th.col-width-tiny= t(".mdrd")
-        th.col-width-date= t(".esrf")
+  .row
+    .columns
+      = render_if_exists "filters", presenter: presenter
 
-    tbody
-      - presenter.patients.each do |patient|
-        = render "patient", patient: patient, view_proc: presenter.view_proc, q: presenter.q
+  = render "table", presenter: presenter
 
   = paginate presenter.patients

data/app/views/renalware/medications/prescriptions/_current.html.slim

@@ -1,7 +1,7 @@
-h3 Current Prescriptions
+h3 Current Medications
 
 - if prescriptions.blank?
-  p.prescription None
+  p.prescription No medications listed
 - else
   ul
     - prescriptions.each do |prescription|

data/app/views/renalware/medications/prescriptions/_recently_stopped.html.slim

@@ -1,4 +1,4 @@
-h3 Recently Stopped Prescriptions
+h3 Recently Stopped Medications
 
 - if prescriptions.blank?
   p.prescription None

data/app/views/renalware/messaging/messages/_form.html.slim

@@ -0,0 +1,31 @@
+/ This is the send message modal dialog content
+= simple_form_for form,
+                html: { autocomplete: "off"},
+                remote: true,
+                url: messaging_messages_path(patient_id: patient) do |f|
+    h2= t(".title")
+    =f.input :replying_to_message_id, as: :hidden
+
+    / NB the inline styling here prevents an initial flash and re-jiggle of dropdown content which
+    / is subsequently hidden by select2 after 100 ms or so.
+    =f.input :recipient_ids,
+             label: t(".recipient_ids"),
+             collection: recipient_options,
+             as: :grouped_select,
+             group_method: :users,
+             group_label_method: :name,
+             label_method: :to_s,
+             value_method: :id,
+             input_html: { class: "searchable_select",
+                           id: "message_recipient_ids",
+                           multiple: "multiple",
+                           style: "visibility: hidden; height: 2.5rem" }
+    =f.input :subject
+    =f.input :urgent, as: :boolean, boolean_style: :inline
+    =f.input :body, as: :text, input_html: { rows: 7 }
+    =f.submit "Send", class: :button
+    span= " or "
+    =link_to t(".cancel"),
+             "#",
+             "aria-label" => "Close",
+             class: "reveal-modal-close"

data/app/views/renalware/messaging/messages/_message.html.slim

@@ -0,0 +1,19 @@
+tr(class="#{ "urgent" if message.urgent?}" id=message.html_identifier)
+  td=l(message.sent_at)
+  td= link_to(message.patient, patient_clinical_summary_path(message.patient))
+  td= message.patient.hospital_identifier
+  td= message.subject
+  td= message.recipients.map(&:to_s).join(",")
+  td
+    = link_to "View",
+              "##{message.html_preview_identifier}",
+              data: { behaviour: "toggler" },
+              class: :right
+= content_tag(:tr,
+              id: "#{message.html_preview_identifier}",
+              style: "display: none",
+              class: "#{ "urgent" if message.urgent?}")
+  td(colspan=6)
+    .message-preview
+      .subject= message.subject
+      .body= message.body

data/app/views/renalware/messaging/messages/_modal_dialog_placeholder.html.slim

@@ -0,0 +1,2 @@
+/ The modal dialog container for internal message sending
+#send-message-modal.reveal-modal.medium(data-reveal)

data/app/views/renalware/messaging/messages/_send_message_link.html.slim

@@ -0,0 +1,11 @@
+/ This partial is pulled in when the whole page renders, and creates the link and
+/ associated modal dialog wiring sending a message.
+- patient = Renalware::Messaging.cast_patient(patient)
+- url = new_messaging_message_path(patient_id: patient, format: :html)
+
+/ Link to launch the modal dialog
+=link_to(url,
+         id: "send-patient-message",
+         data: { "reveal-id" => "send-message-modal", "reveal-ajax" => "true" }) do
+  i.fa.fa-link-annotation.fa-envelope
+  = link_text

data/app/views/renalware/messaging/messages/_send_reply_link.html.slim

@@ -0,0 +1,12 @@
+/ This partial is pulled in when the whole page renders, and creates the link and
+/ associated modal dialog wiring sending a message.
+- patient = Renalware::Messaging.cast_patient(patient)
+- url = new_messaging_message_path(patient_id: patient,
+                                   replying_to_message_id: replying_to_message_id,
+                                   format: :html)
+/ Link to launch the modal dialog
+=link_to(url,
+         data: { "reveal-id" => "send-message-modal", "reveal-ajax" => "true" },
+         class: "button secondary") do
+  i.fa.fa-link-annotation.fa-reply
+  = link_text

data/app/views/renalware/messaging/messages/_table.html.slim

@@ -0,0 +1,13 @@
+table.messages.messages-sent.has_togglable_content
+  thead
+    tr
+      th.col-width-date-time= t(".sent_at")
+      th.col-width-large= t(".patient_name")
+      th.col-width-reference-no= t(".hosp_no")
+      th= t(".subject")
+      th= t(".recipients")
+      td
+  tbody
+    = render partial: "message", collection: messages
+= paginate messages
+= render "renalware/messaging/messages/modal_dialog_placeholder"

data/app/views/renalware/messaging/messages/create.js.erb

@@ -0,0 +1,13 @@
+<%# We render this view when the message has been successfully sent.
+// TODO: the flash here is not really working
+%>
+<%= refresh(".flash-message", partial: "renalware/shared/flash_messages", locals: local_assigns) %>
+$("#send-message-modal").foundation('reveal', 'close');
+<%#
+Remove the message that has now been marked as read from the table.
+We need to remove the real row and the (initially hidden) preview row also.
+%>
+<% if original_message.present? %>
+  $("#<%= original_message.html_identifier %>, #<%= original_message.html_preview_identifier %>")
+    .fadeOut(300, function(){ $(this).remove();});
+<% end %>

data/app/views/renalware/messaging/messages/new.html.slim

@@ -0,0 +1,5 @@
+/ Invoked by Foundation Reveal from a Send Message link in the patient LH nav
+/ which is marked up as using data-reveal-ajax=true and link to this action
+/ and a format of html (would otherwise default to js)
+/ We render the modal content html here and foundation will display the modal itself.
+= render "form", form: form, patient: patient, recipient_options: recipient_options

data/app/views/renalware/messaging/messages/new.js.erb

@@ -0,0 +1,7 @@
+// We render this view if there was a validation error submitting the foundation reveal modal.
+// Replace the original content so that error messages are displayed.
+var modal = $("#send-message-modal")
+$(modal).html("<%= j(render 'form', form: form, patient: patient, recipient_options: recipient_options) %>");
+// TODO: The re-initializing of select2 in a modal should be a global handler
+$('.searchable_select', modal).select2();
+Renalware.Messaging.init();

data/app/views/renalware/messaging/messages/sent.html.slim

@@ -0,0 +1,4 @@
+= within_admin_layout(title: "Messages") do
+  = render "renalware/messaging/shared/messages_type_tabs"
+  .sent-messages
+    = render "table", messages:  messages

data/app/views/renalware/messaging/receipts/_receipt.html.slim

@@ -0,0 +1,45 @@
+- message = receipt.message
+
+tr(class="#{ "urgent" if message.urgent?}" id=message.html_identifier)
+  td
+    = pluralize(message.age_in_days, "day")
+  / td.state.show-for-large-up
+  /   - if message.urgent?
+  /     span Urgent
+  td= message.author
+  td= l(message.sent_at)
+  td= link_to(message.patient, patient_clinical_summary_path(message.patient))
+  td= message.patient.hospital_identifier
+  td.col-width-large-with-ellipsis= message.subject
+  td
+    = link_to "View",
+              "##{message.html_preview_identifier}",
+              data: { behaviour: "toggler" },
+              class: :right
+= content_tag(:tr,
+              id: "#{message.html_preview_identifier}",
+              style: "display: none",
+              class: "#{ "urgent" if message.urgent?}")
+  td(colspan=5)
+    .message-preview
+      .subject= message.subject
+      .body= message.body
+  td.nowrap(colspan=2)
+    ul.actions
+      li= link_to "Keep as unread",
+                  "#message-preview-#{message.id}",
+                  data: { behaviour: "toggler" },
+                  class: "button secondary keep-as-unread"
+
+      li= render partial: "renalware/messaging/messages/send_reply_link",
+                 locals: { patient: message.patient,
+                           link_text: "Reply",
+                           replying_to_message_id: message.id }
+
+      li= link_to(mark_as_read_messaging_message_receipt_path(message, receipt),
+                  class: "button mark-as-read",
+                  method: :patch,
+                  remote: true) do
+        i.fa.fa-check
+        | Mark as read
+

data/app/views/renalware/messaging/receipts/_table.html.slim

@@ -0,0 +1,16 @@
+table.auto-layout.align-top.messages.has-togglable-rows
+  thead
+    tr
+      th.col-width-tinyish= t(".age")
+      /th.col-width-tiny.show-for-large-up
+      th.col-width-medium= t(".from")
+      th.col-width-date-time= t(".sent_at")
+      th.col-width-large= t(".patient_name")
+      th.col-width-reference-no= t(".hosp_no")
+      th= t(".subject")
+      td.col-width-small
+
+  tbody
+    = render partial: "renalware/messaging/receipts/receipt", collection: receipts
+
+= render "renalware/messaging/messages/modal_dialog_placeholder"

data/app/views/renalware/messaging/receipts/mark_as_read.js.erb

@@ -0,0 +1,6 @@
+<%#
+Remove the message that has now been marked as read from the table (provided we are viewing a table
+of unread messages). We need to remove the real row and the (initially hidden) preview row also.
+%>
+$("#<%= receipt.message.html_identifier %>, #<%= receipt.message.html_preview_identifier %>",
+  ".unread-messages").fadeOut(300, function(){ $(this).remove();});

data/app/views/renalware/messaging/receipts/read.html.slim

@@ -0,0 +1,5 @@
+= within_admin_layout(title: "Messages") do
+  = render "renalware/messaging/shared/messages_type_tabs"
+  .read-messages
+    = render "renalware/messaging/receipts/table", receipts: receipts
+  = paginate receipts

data/app/views/renalware/messaging/receipts/unread.html.slim

@@ -0,0 +1,5 @@
+= within_admin_layout(title: "Messages") do
+  = render "renalware/messaging/shared/messages_type_tabs"
+  .unread-messages
+    = render "renalware/messaging/receipts/table", receipts: receipts
+  = paginate receipts

data/app/views/renalware/messaging/shared/_key.html.slim

@@ -0,0 +1,3 @@
+.messages-key
+  span.urgent
+    | Urgent

data/app/views/renalware/messaging/shared/_messages_type_tabs.html.slim

@@ -0,0 +1,7 @@
+dl.sub-nav
+  dd
+    =link_to("Inbox", messaging_inbox_path)
+  dd
+    =link_to("Read", messaging_read_receipts_path)
+  dd
+    =link_to("Sent", messaging_sent_messages_path)

data/app/views/renalware/modalities/descriptions/_form.html.slim

@@ -1,12 +1,14 @@
-.row
-  = render "header"
-  = render "renalware/shared/errors", model: @modality_description
+/= render "header"
+= render "renalware/shared/errors", model: modality_description
 
-.row
-  .large-6.columns
-    = simple_form_for @modality_description, html: { autocomplete: "off" } do |f|
-      = f.input :name, label: "Name"
+= simple_form_for modality_description,
+                  url: url,
+                  as: :modalities_description,
+                  html: { autocomplete: "off" },
+                  wrapper: :horizontal_form do |f|
 
-      = f.button :submit
-      span= " or "
-      = link_to "Cancel", modalities_descriptions_path
+  = f.input :name, wrapper: :horizontal_medium
+
+  = f.button :submit
+  span= " or "
+  = link_to "Cancel", modalities_descriptions_path

data/app/views/renalware/modalities/descriptions/edit.html.slim

@@ -1 +1,6 @@
- = render "form"
+= within_admin_layout(title: "Edit",
+                      breadcrumbs: breadcrumb_for("Modalities", modalities_descriptions_path))
+
+  = render "form",
+           modality_description: modality_description,
+           url: modalities_description_path(modality_description)

data/app/views/renalware/modalities/descriptions/index.html.slim

@@ -1,20 +1,25 @@
-.row
-  = render "header"
+= content_for(:actions) do
+  = link_to t("new_record.link_title"),
+            new_modalities_description_path,
+            class: "button"
+
+= within_admin_layout(title: "Modalities") do
 
-.row
   table.modality-codes
     thead
       tr
         th.col-width-small
         th Name
     tbody
-      - @modalilty_descriptions.each do |m|
+      - modality_descriptions.each do |description|
         tr
           td
-            = link_to "Edit", edit_modalities_description_path(m.id)
-            = pipe_separator
-            = link_to "Delete",
-                      modalities_description_path(m.id),
-                      method: :delete,
-                      data: { confirm: "Are you sure you want to delete this modal?" }
-          td= m.name
+            - if policy(description).edit?
+              = link_to "Edit", edit_modalities_description_path(description.id)
+            - if policy(description).destroy?
+              = pipe_separator
+              = link_to "Delete",
+                        modalities_description_path(description.id),
+                        method: :delete,
+                        data: { confirm: "Are you sure you want to delete this modal?" }
+          td= description.name

data/app/views/renalware/modalities/descriptions/new.html.slim

@@ -1 +1,6 @@
- = render "form"
+= within_admin_layout(title: "New",
+                      breadcrumbs: breadcrumb_for("Modalities", modalities_descriptions_path))
+
+  = render "form",
+           modality_description: modality_description,
+           url: modalities_descriptions_path

data/app/views/renalware/navigation/_user.html.slim

@@ -8,3 +8,4 @@ li.has-dropdown
     li= link_to "Update Profile", edit_user_registration_path
     li= link_to "View Letters", author_letters_path(current_user.id)
     li= link_to "Manage Snippets", snippets_path
+    li= link_to "Messages", messaging_inbox_path

data/app/views/renalware/pathology/requests/requests/new.html.slim

@@ -7,7 +7,7 @@ html lang="en"
 
     = stylesheet_link_tag "renalware/application", media: :all
     = stylesheet_link_tag "renalware/print/pathology_request_forms", media: :all
-    = javascript_include_tag "renalware/vendor/modernizr"
+    = javascript_include_tag "renalware/modernizr"
 
     = csrf_meta_tag
 

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

@@ -7,7 +7,6 @@
 
 .patient-container
   .patient-content
-    /= render "renalware/renal/profiles/mini", patient: current_patient
     = render "renalware/patients/mini_profile", patient: current_patient
     .row
       .page-heading.columns.small-12

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

@@ -1,3 +1,4 @@
+/ TODO: Remove if unused
 = field_set_tag do
   legend #{title}
 

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

@@ -3,4 +3,4 @@ ul.side-nav
   = render "renalware/patients/side_menu/general", patient: patient
   = render "renalware/patients/side_menu/modalities", patient: patient
   = render "renalware/patients/side_menu/transplants", patient: patient
-  = render "renalware/patients/side_menu/options", patient: patient
+  = render "renalware/patients/side_menu/actions", patient: patient

data/app/views/renalware/patients/alerts/_alert.html.slim

@@ -0,0 +1,12 @@
+tr.alerts--alert(class=("urgent" if alert.urgent ) id="alert-#{alert.id}")
+  td.icon
+  td.notes
+    span(title=alert.notes)= alert.notes
+  td.author= alert.created_by.username
+  td.col-width-date= l(alert.created_at.to_date)
+  td.actions
+    = link_to(patient_alert_path(alert.patient, alert),
+              remote: true,
+              method: :delete,
+              data: { confirm: "Are you sure you want to remove this alert?" }) do
+      i.fa.fa-trash-o

data/app/views/renalware/patients/alerts/_create_alert_link.html.slim

@@ -0,0 +1,8 @@
+/ This partial is pulled in when the whole page renders, and creates the link and
+/ associated modal dialog wiring sending a message.
+- url = new_patient_alert_path(patient_id: patient, format: :html)
+
+/ Link to launch the modal dialog
+=link_to(url, data: { "reveal-id" => "create-alert-modal", "reveal-ajax" => "true" }) do
+  i.fa.fa-link-annotation.fa-exclamation-circle
+  = link_text

data/app/views/renalware/patients/alerts/_form.html.slim

@@ -0,0 +1,14 @@
+/ This is the create alert modal dialog content
+= simple_form_for alert,
+                  html: { autocomplete: "off"},
+                  remote: true,
+                  url: patient_alerts_path(patient_id: patient) do |f|
+    h2= t(".title")
+    =f.input :urgent, as: :boolean, boolean_style: :inline
+    =f.input :notes
+    =f.submit "Create alert", class: :button
+    span= " or "
+    =link_to t(".cancel"),
+             "#",
+             "aria-label" => "Close",
+             class: "reveal-modal-close"

data/app/views/renalware/patients/alerts/_list.html.slim

@@ -0,0 +1,4 @@
+table.alerts
+  tbody
+    - patient.alerts.each do |alert|
+      = render(alert)

data/app/views/renalware/patients/alerts/_modal_dialog_placeholder.html.slim

@@ -0,0 +1,2 @@
+/ The modal dialog container for internal message sending
+#create-alert-modal.reveal-modal.medium(data-reveal)

data/app/views/renalware/patients/alerts/create.js.erb

@@ -0,0 +1,3 @@
+<%= refresh(".flash-message", partial: "renalware/shared/flash_messages", locals: local_assigns) %>
+$(".alerts").append("<%= j(render alert, format: :html) %>");
+$("#create-alert-modal").foundation('reveal', 'close');

data/app/views/renalware/patients/alerts/destroy.js.erb

@@ -0,0 +1,2 @@
+// Remove the deleted alert
+$("#alert-<%= alert.id %>", ".alerts").fadeOut(300, function(){ $(this).remove();})

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

@@ -0,0 +1,5 @@
+/ Invoked by Foundation Reveal from a Create Alert link in the patient LH nav
+/ which is marked up as using data-reveal-ajax=true and link to this action
+/ and a format of html (would otherwise default to js)
+/ We render the modal content html here and foundation will display the modal itself.
+= render "form", patient: patient, alert: alert

data/app/views/renalware/patients/alerts/new.js.erb

@@ -0,0 +1,4 @@
+// We render this view if there was a validation error submitting the foundation reveal modal.
+// Replace the original content so that error messages are displayed.
+var modal = $("#create-alert-modal")
+$(modal).html("<%= j(render 'form', patient: patient, alert: alert) %>");

data/app/views/renalware/patients/bookmarks/_delete.html.slim

@@ -1,4 +1,5 @@
-=link_to(link_text,
-         bookmark_path(bookmark),
+=link_to(bookmark_path(bookmark),
          method: :delete,
-         data: { confirm: t(".confirm") })
+         data: { confirm: t(".confirm") }) do
+  i.fa.fa-link-annotation.fa-bookmark
+  = link_text

data/app/views/renalware/patients/bookmarks/_new.html.slim

@@ -1,5 +1,7 @@
 / Link to launch the modal dialog
-= link_to(link_text, "#", data: { "reveal-id" => "add-patient-bookmark-modal" })
+= link_to("#", data: { "reveal-id" => "add-patient-bookmark-modal" }) do
+  i.fa.fa-link-annotation.fa-bookmark-o
+  = link_text
 
 / The modal dialog
 #add-patient-bookmark-modal.reveal-modal.medium(data-reveal)
@@ -7,7 +9,7 @@
                    html: { autocomplete: "off" },
                    url: patient_bookmarks_path(patient_id: patient) do |f|
     h2= t(".title")
-    =f.input :urgent, as: :boolean
+    =f.input :urgent, as: :boolean, boolean_style: :inline
     =f.input :notes, as: :text, input_html: { autofocus: :autofocus }
     =f.submit t(".save"), class: :button
     span= " or "

data/app/views/renalware/{clinical_summaries → patients/clinical_summaries}/show.html.slim

@@ -1,4 +1,4 @@
-= within_patient_layout do
+= within_patient_layout(title: "Clinical Summary") do
   .row
     .columns.large-6
       #current-problems

data/app/views/renalware/patients/{_table.html.slim → patients/_table.html.slim}

@@ -12,6 +12,6 @@ table#patients
       th.col-width-small Modality
 
   tbody
-    = render patients
+    = render partial: "patient", collection: patients
 
 = paginate patients

data/app/views/renalware/patients/{edit.html.slim → patients/edit.html.slim}

@@ -5,7 +5,7 @@
                       wrapper: "horizontal_form",
                       html: { autocomplete: "off" } do |f|
 
-      = render "renalware/patients/form", f: f, patient: patient
+      = render "form", f: f, patient: patient
 
       .columns.large-12
         = submit_tag "Update", class: "button"

data/app/views/renalware/patients/{new.html.slim → patients/new.html.slim}

@@ -7,7 +7,7 @@
                       html: { autocomplete: "off" },
                       wrapper: "horizontal_form" do |f|
 
-      = render "renalware/patients/form", f: f, patient: patient
+      = render "form", f: f, patient: patient
 
       = submit_tag "Save", class: "button"
       span= " or "