renalware-core 2.0.0.pre.rc13 → 2.0.0

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

@@ -0,0 +1,7 @@
+.alert-box.warning
+  | NOTICE: This system contains patient clinical records. All information is highly
+  |  confidential and must be treated as such. All data must be used with the Data
+  |  Protection Act and related legislation and in compliance with security policies
+  |  governing use of this system. Unauthorised, illegal or improper use may result
+  |  in disciplinary action and civil or criminal prosecution. By continuing to access
+  |  this system you agree that such access and use is subject to the foregoing.

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

@@ -1,25 +1,19 @@
-.row.small-8.large-12
-  h3 Log in to Renalware
+ .main-content
+  .row.small-8.large-12
+    h3 Log in to Renalware
 
-  .alert-box.warning
-    | NOTICE: This system contains patient clinical records. All information is highly 
-    | confidential and must be treated as such. All data must be used with the Data 
-    | Protection Act and related legislation and in compliance with security policies 
-    | governing use of this system. Unauthorised, illegal or improper use may result 
-    | in disciplinary action and civil or criminal prosecution. By continuing to access 
-    | this system you agree that such access and use is subject to the foregoing.
+    = render "warning"
 
-.row.small-6.large-3
+  .row.small-6.large-3
+    = simple_form_for(resource,
+                      as: resource_name,
+                      url: session_path(resource_name),
+                      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, boolean_style: :inline) if devise_mapping.rememberable?
 
-  = simple_form_for(resource,
-                    as: resource_name,
-                    url: session_path(resource_name),
-                    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, boolean_style: :inline) if devise_mapping.rememberable?
+      .actions
+        = f.submit "Log in", class: "button save"
 
-    .actions
-      = f.submit "Log in", class: "button save"
-
-  = render "devise/shared/links"
+    = render "devise/shared/links"

data/app/views/renalware/events/events/_summary_part.html.slim

@@ -1,4 +1,4 @@
-- cache(summary_part) do
+- cache_if(summary_part.cache?, summary_part) do
   #events.summary-part--events
     article
       header

data/app/views/renalware/events/events/cell/_investigation.html.slim

@@ -1,7 +1,5 @@
 - document = event.document
 
-| Type:
-| 
 = document.type&.text || t("unspecified")
 |   
 | Result:

data/app/views/renalware/events/events/toggled_cell/_biopsy.html.slim

@@ -6,4 +6,4 @@ dl.dl-horizontal
   dt= attr_name(document, :result2, suffix: ":")
   dd= document.result2&.text || t("unspecified")
   dt= attr_name(event, :notes, suffix: ":")
-  dd= event.notes
+  dd= event.notes&.html_safe

data/app/views/renalware/events/events/toggled_cell/_investigation.html.slim

@@ -8,4 +8,4 @@ dl.dl-horizontal
   dt= attr_name(document, :result, suffix: ":")
   dd= document.result || t("unspecified")
   dt= attr_name(event, :notes, suffix: ":")
-  dd= event.notes || t("unspecified")
+  dd= event.notes&.html_safe || t("unspecified")

data/app/views/renalware/events/events/toggled_cell/_simple.html.slim

@@ -2,4 +2,4 @@ dl.dl-horizontal
   dt= attr_name(event, :description, suffix: ":")
   dd= event.description
   dt= attr_name(event, :notes, suffix: ":")
-  dd= event.notes
+  dd= event.notes&.html_safe

data/app/views/renalware/events/events/toggled_cell/_swab.html.slim

@@ -3,4 +3,4 @@ dl.dl-horizontal
   dt= attr_name(document, :location, suffix: ":")
   dd= document.location.present? ? document.location : t("unspecified")
   dt= attr_name(event, :notes, suffix: ":")
-  dd= event.notes
+  dd= event.notes&.html_safe

data/app/views/renalware/hd/cannulation_types/_form.html.slim

@@ -1,12 +1,9 @@
-.row
-  = render "header"
-  = render "renalware/shared/errors", model: cannulation_type
+= render "renalware/shared/errors", model: cannulation_type
 
-.row
-  .large-6.columns
-    = simple_form_for cannulation_type, html: { autocomplete: "off" } do |f|
-      = f.input :name, autofocus: true
+.large-6.columns
+  = simple_form_for cannulation_type, html: { autocomplete: "off" } do |f|
+    = f.input :name, autofocus: true
 
-      = f.button :submit
-      span= " or "
-      = link_to "cancel", hd_cannulation_types_path
+    = f.button :submit
+    span= " or "
+    = link_to "cancel", hd_cannulation_types_path

data/app/views/renalware/hd/cannulation_types/edit.html.slim

@@ -1 +1,2 @@
-= render "form", cannulation_type: cannulation_type
+= within_admin_layout(title: "Edit HD Cannulation Type") do
+  = render "form", cannulation_type: cannulation_type

data/app/views/renalware/hd/cannulation_types/index.html.slim

@@ -1,7 +1,8 @@
-.row
-  = render "header"
+= within_admin_layout(title: "HD Cannulation Types") do
+  dl.sub-nav
+    dd= link_to "List", hd_cannulation_types_path
+    dd= link_to "Add type", new_hd_cannulation_type_path
 
-.row
   table.auto-layout
     thead
       tr

data/app/views/renalware/hd/cannulation_types/new.html.slim

@@ -1 +1,2 @@
-= render "form", cannulation_type: cannulation_type
+= within_admin_layout(title: "New Cannulation Type") do
+  = render "form", cannulation_type: cannulation_type

data/app/views/renalware/hd/dialysers/_form.html.slim

@@ -1,13 +1,10 @@
-.row
-  = render "header"
-  = render "renalware/shared/errors", model: dialyser
+/= render "header"
+= render "renalware/shared/errors", model: dialyser
 
-.row
-  .large-6.columns
-    = simple_form_for dialyser, html: { autocomplete: "off" } do |f|
-      = f.input :group, autofocus: true
-      = f.input :name
+= simple_form_for dialyser, html: { autocomplete: "off" } do |f|
+  = f.input :group, autofocus: true, wrapper: :horizontal_small
+  = f.input :name, wrapper: :horizontal_small
 
-      = f.button :submit
-      span= " or "
-      = link_to "cancel", hd_dialysers_path
+  = f.button :submit
+  span= " or "
+  = link_to "cancel", hd_dialysers_path

data/app/views/renalware/hd/dialysers/edit.html.slim

@@ -1 +1,2 @@
-= render "form", dialyser: dialyser
+= within_admin_layout(title: "Edit HD Dialyser") do
+  = render "form", dialyser: dialyser

data/app/views/renalware/hd/dialysers/index.html.slim

@@ -1,7 +1,8 @@
-.row
-  = render "header"
+= within_admin_layout(title: "HD Dialysers") do
+  dl.sub-nav
+    dd= link_to "List", hd_dialysers_path
+    dd= link_to "Add dialyser", new_hd_dialyser_path
 
-.row
   table.auto-layout
     thead
       tr

data/app/views/renalware/hd/dialysers/new.html.slim

@@ -1 +1,2 @@
-= render "form", dialyser: dialyser
+= within_admin_layout(title: "New HD Dialyser") do
+  = render "form", dialyser: dialyser

data/app/views/renalware/layouts/_non_patient.html.slim

@@ -1,16 +1,17 @@
 - generate_page_title(local_assigns: local_assigns)
 
-.non-patient-page
-  .row
-    ul.page-heading.columns.small-12
-      li
-        h1
-          = breadcrumbs_and_title(breadcrumbs: local_assigns[:breadcrumbs],
-                                  title: local_assigns[:title])
-      li.page-actions
-        / Output any page-level actions
-        = yield(:actions)
+.non-patient-page.main-content
+  .layout-wrapper
+    .row
+      ul.page-heading.columns.small-12
+        li
+          h1
+            = breadcrumbs_and_title(breadcrumbs: local_assigns[:breadcrumbs],
+                                    title: local_assigns[:title])
+        li.page-actions
+          / Output any page-level actions
+          = yield(:actions)
 
-  .row
-    .columns.small-12
-      = yield
+    .row
+      .columns.small-12
+        = yield

data/app/views/renalware/layouts/_patient.html.slim

@@ -1,6 +1,3 @@
-- content_for(:css) do
-  = stylesheet_link_tag "renalware/patient_pages", media: :all
-
 - content_for(:header) do
   = render "renalware/patients/header", patient: current_patient
 
@@ -11,11 +8,14 @@ nav.patient-side-nav.full-screenable
   .layout-wrapper
     = render "renalware/patients/side_menu", patient: current_patient
 
-.patient-content.full-screenable
+.main-content.patient-content.full-screenable
   .layout-wrapper
     = render "renalware/patients/mini_profile", patient: current_patient
+    .patient-alerts.lozenge
+      ul
+        = render "renalware/patients/alerts/list", patient: current_patient
+        = render "renalware/research/alerts", patient: current_patient
     = render "renalware/clinical/header", patient: current_patient
-    = render "renalware/patients/alerts/list", patient: current_patient
     .row.collapse
       - if local_assigns[:title].present?
         ul.page-heading.columns.small-12

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

@@ -1,4 +1,4 @@
-- cache(summary_part) do
+- cache_if(summary_part.cache?, summary_part) do
   #letters.summary-part--letters
     article
       header

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

@@ -1,17 +1,18 @@
-.letter-preview-admin
-  .row
-    .columns.large-8
-      .row
-        .columns.large-4
-          p Status: #{@letter.state.upcase}
-        .columns.large-8
-          p Typist: #{@letter.typist}
-      .row
-        .columns.large-12
-          div= render "actions", letter: @letter
+.main-content
+  .letter-preview-admin
+    .row
+      .columns.large-8
+        .row
+          .columns.large-4
+            p Status: #{@letter.state.upcase}
+          .columns.large-8
+            p Typist: #{@letter.typist}
+        .row
+          .columns.large-12
+            div= render "actions", letter: @letter
 
-    .columns.large-4
-      p Notes:
-      = simple_format @letter.notes
+      .columns.large-4
+        p Notes:
+        = simple_format @letter.notes
 
-= content_tag :iframe, "", src: patient_letters_letter_preview_path(@letter), class: "fullsize"
+  = content_tag :iframe, "", src: patient_letters_letter_preview_path(@letter), class: "fullsize"

data/app/views/renalware/medications/_summary_part.html.slim

@@ -1,19 +1,20 @@
-- cache(summary_part) do
-  .summary-part--prescriptions
-    #current-prescriptions
-      article
-        header
-          h2
-            = link_to "Current Prescriptions (#{summary_part.current_prescriptions.length})",
-                      patient_prescriptions_path(summary_part.patient)
+/ Not caching this in 2.0 - needs a bit more testing
+/ - cache_if(summary_part.cache?, summary_part) do
+.summary-part--prescriptions
+  #current-prescriptions
+    article
+      header
+        h2
+          = link_to "Current Prescriptions (#{summary_part.current_prescriptions.length})",
+                    patient_prescriptions_path(summary_part.patient)
 
-          = link_to patient_prescriptions_path(summary_part.patient), class: "button" do
-            | Add
+        = link_to patient_prescriptions_path(summary_part.patient), class: "button" do
+          | Add
 
-        ul.no-bullet
-          - summary_part.current_prescriptions.each do |prescription|
-            li class="drug-#{drug_types_colour_tag(prescription.drug_types)}"
-              = "#{prescription.drug.name}, "
-              = "#{prescription.dose}, "
-              = "#{prescription.medication_route.code} #{prescription.frequency} - "
-              = l(prescription.prescribed_on)
+      ul.no-bullet
+        - summary_part.current_prescriptions.each do |prescription|
+          li class="drug-#{drug_types_colour_tag(prescription.drug_types)}"
+            = "#{prescription.drug.name}, "
+            = "#{prescription.dose}, "
+            = "#{prescription.medication_route.code} #{prescription.frequency} - "
+            = l(prescription.prescribed_on)

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

@@ -1,7 +1,5 @@
-.row
-  h1 Renal Registry Reason for Change Codes
+ = within_admin_layout(title: "Renal Registry Reason for Change Codes") do
 
-.row
   table.responsive
     caption Haemodialysis to PD
     thead

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

@@ -1,3 +1,3 @@
-- if defined?(semantic_app_version)
-  footer
+footer
+  - if defined?(semantic_app_version)
     | Renalware® v#{semantic_app_version} © #{Date.current.year} Airslie Ltd   

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

@@ -3,5 +3,6 @@ li.has-dropdown
   ul.dropdown
     li
       = link_to "Renal Reg HD/PD Reasons for Change", modalities_reasons_path
+    = render "renalware/navigation/more_help_items"
     li.info
       | Version #{semantic_app_version}

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

@@ -0,0 +1 @@
+/ Host app may want to override this

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

@@ -1,3 +1,7 @@
+-if Renalware.config.display_feedback_button_in_navbar && current_user.present?
+  li.show-for-medium-up= link_to("Feedback",
+              new_system_user_feedback_path,
+              class: "button secondary")
 li.has-dropdown
   = link_to dashboard_path do
     i.fa.fa-home

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

@@ -1,45 +1,43 @@
-.row
-  h1 Request Form Print History
+= within_admin_layout(title: "Request Form Print History") do
+  .row
+    .search-form
+      fieldset
+        legend Filters
+        = simple_form_for query,
+            as: :q,
+            url: pathology_requests_requests_path,
+            html: { autocomplete: "off" },
+            method: :get do |f|
+          .row
+            .large-4.columns
+              = f.input :created_on_eq, as: :date_picker, label: "Printed on"
+            .large-8.columns.actions
+              = f.submit t("helpers.submit.filter"), class: "button"
+              span= " or "
+              = link_to t("helpers.reset"), pathology_requests_requests_path
 
-.row
-  .search-form
-    fieldset
-      legend Filters
-      = simple_form_for query,
-          as: :q,
-          url: pathology_requests_requests_path,
-          html: { autocomplete: "off" },
-          method: :get do |f|
-        .row
-          .large-4.columns
-            = f.input :created_on_eq, as: :date_picker, label: "Printed on"
-          .large-8.columns.actions
-            = f.submit t("helpers.submit.filter"), class: "button"
-            span= " or "
-            = link_to t("helpers.reset"), pathology_requests_requests_path
-
-.row
-  - if requests.empty?
-    p No requests forms have been printed yet.
-  - else
-    table#requests
-      thead
-        tr
-          th
-          th Patient
-          th Clinic
-          th Consultant
-          th Printed On
-          th Printed By
-
-      tbody
-        - requests.each do |request|
+  .row
+    - if requests.empty?
+      p No requests forms have been printed yet.
+    - else
+      table#requests
+        thead
           tr
-            td = link_to "View", pathology_requests_request_path(id: request.id, format: "pdf")
-            td = request.patient.full_name
-            td = request.clinic.name
-            td = request.consultant.full_name
-            td = I18n.l request.printed_on
-            td = request.created_by.full_name
+            th
+            th Patient
+            th Clinic
+            th Consultant
+            th Printed On
+            th Printed By
+
+        tbody
+          - requests.each do |request|
+            tr
+              td = link_to "View", pathology_requests_request_path(id: request.id, format: "pdf")
+              td = request.patient.full_name
+              td = request.clinic.name
+              td = request.consultant.full_name
+              td = I18n.l request.printed_on
+              td = request.created_by.full_name
 
-    = paginate requests
+      = paginate requests