renalware-core 2.0.132 → 2.0.133

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

@@ -4,13 +4,13 @@ table.auto-layout
       th.at-least.col-width-medium= t(".patient_name")
       th.col-width-nhs-no= t(".nhs_number")
       th.col-width-reference-no= t(".hospital_number")
-      th.col-width-date= t(".born_on")
+      th.show-for-medium-up.col-width-date= t(".born_on")
       th.col-width-tiny= t(".age")
       th.col-width-tiny= t(".sex")
-      th.col-width-medium= t(".modality")
-      th= t(".notes")
-      th= t(".tags")
-      th.col-width-date-time= t(".bookmarked_on")
+      th= t(".modality")
+      th.show-for-medium-up= t(".notes")
+      th.show-for-medium-up= t(".tags")
+      th.col-width-date= t(".bookmarked_on")
       th.col-width-tiny
 
   tbody

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

@@ -1,45 +1,8 @@
 .dashboard-content
-  article.letters
-    header
-      h2 Letters in Progress
-    - if dashboard.letters_in_progress.any?
-      #letters-in-progress
-        = render "renalware/dashboard/letters/table", letters: dashboard.letters_in_progress
-    - else
-      p.empty-section= t(".letters.in_progress.none").html_safe
-
-  article.bookmarks
-    header
-      h2.title= "Bookmarked Patients"
-      ul
-        li= link_to "View All", bookmarks_path, class: "button"
-
-    - if dashboard.bookmarks.any?
-      #bookmarks
-        = render "renalware/dashboard/bookmarks/table", bookmarks: dashboard.bookmarks
-    - else
-      p.empty-section= t(".bookmarks.none")
-
-  article.messages
-    header
-      h2 Messages
-      ul
-        li= render "renalware/messaging/shared/key"
-    - if dashboard.unread_messages_receipts.any?
-      .unread-messages
-        = render "renalware/messaging/internal/receipts/table",
-                 receipts: dashboard.unread_messages_receipts
-    - else
-      p.empty-section= t(".messages.none")
-
-  article.electonic_ccs
-    header
-      h2 Electronic CCs
-    - if dashboard.unread_electronic_ccs.any?
-      = render "renalware/letters/electronic_receipts/table",
-               receipts: dashboard.unread_electronic_ccs
-    - else
-      p.empty-section= t(".electronic_ccs.none")
+  = render(Renalware::Letters::LettersInProgressComponent, current_user: current_user)
+  = render(Renalware::Patients::BookmarksComponent, current_user: current_user)
+  = render(Renalware::Messaging::UnreadMessagesComponent, current_user: current_user)
+  = render(Renalware::Letters::UnreadElectronicCCsComponent, current_user: current_user)  
 
   - if current_user_is_admin?
     = render Renalware::Admin::Users::SummaryPart.new(nil, current_user)

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

@@ -3,8 +3,8 @@ tr(class=letter.state.dasherize)
     span= letter.state_description
   td= l letter.effective_date
   td= letter.author
-  td= link_to letter.patient, patient_clinical_summary_path(letter.patient)
-  td= letter.description
+  td.col-width-medium-with-ellipsis= link_to letter.patient, patient_clinical_summary_path(letter.patient)
+  td.col-width-medium-with-ellipsis= letter.description
   td.actions
     = link_to "Toggle", "#quick-preview-#{letter.id}", data: { behaviour: "toggler" }
     = link_to letter.view_label, patient_letters_letter_path(letter.patient, letter)

data/app/views/renalware/hd/mdm_patients/_patient.html.slim

@@ -3,6 +3,11 @@
 - transplant_patient = Renalware::Transplants::PatientPresenter.new(patient)
 
 tr
+  td.actions
+    = link_to view_proc.call(patient), target: "_blank" do
+      i.fa.fa-external-link-square-alt
+      |   
+      = t(".view")
   td.full-name= link_to patient, view_proc.call(patient)
   td.nowrap= patient.nhs_number
   td.nowrap= patient.hospital_identifier
@@ -26,4 +31,3 @@ tr
   td.show-for-xlarge-up= l(patient.current_observation_set.pthi_observed_at)
   td.show-for-xlarge-up= patient.current_observation_set.urr_result
   td.show-for-xlarge-up= l(patient.current_observation_set.urr_observed_at)
-  td.actions= link_to t(".view"), view_proc.call(patient)

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

@@ -2,6 +2,7 @@
 table#patients.mdm-patients.columns
   thead
     tr
+      th.col-width-tiny
       th.col-width-large= sort_link(path, :family_name, t(".name"))
       th.col-width-nhs-no= t(".nhs_no")
       th.col-width-reference-no= t(".hosp_no")
@@ -25,7 +26,7 @@ table#patients.mdm-patients.columns
       th.show-for-xlarge-up.col-width-date= sort_link(path, :pthi_date, t(".pthi_date"))
       th.show-for-xlarge-up.col-width-tiny= sort_link(path, :urr, t(".urr"))
       th.show-for-xlarge-up.col-width-date= sort_link(path, :urr_date, t(".urr_date"))
-      th.col-width-tiny
+
   tbody
     = render partial: "patient",
              collection: presenter.patients,

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

@@ -1,14 +1,7 @@
 table.recent-pathology
   tbody
-    tr
-      th.code HGB
-      td.result= recent_pathology.hgb_result
-      td.nowrap.observed_at= (l(recent_pathology.hgb_observed_at))
-    tr
-      th.code PLT
-      td.result= recent_pathology.plt_result
-      td.nowrap.observed_at= (l(recent_pathology.plt_observed_at))
-    tr
-      th.code CRP
-      td.result= recent_pathology.crp_result
-      td.nowrap.observed_at= (l(recent_pathology.crp_observed_at))
+    - recent_pathology.each do |code, value|
+      tr
+        th.code= code
+        td.result= value[:result]
+        td.nowrap.observed_at= (value[:observed_at] && l(Date.parse(value[:observed_at])))

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

@@ -1,6 +1,11 @@
 - observation_set = patient.current_observation_set
 - transplant_patient = Renalware::Transplants::PatientPresenter.new(patient)
 tr
+  td.actions
+    = link_to view_proc.call(patient), target: "_blank" do
+      i.fa.fa-external-link-square-alt
+      |   
+      = t(".view")
   td.full-name= link_to patient.to_s(:default), view_proc.call(patient)
   td.nowrap= patient.nhs_number
   td.nowrap= patient.hospital_identifier
@@ -16,4 +21,3 @@ tr
   td= l(observation_set.cre_observed_at)
   td= observation_set.egfr_result
   td= l(patient.esrf_date)
-  td.actions= link_to t(".view"), view_proc.call(patient)

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

@@ -2,6 +2,7 @@
 table#patients.mdm-patients.columns
   thead
     tr
+      th.col-width-tiny
       th.col-width-large= sort_link(path, :family_name, t(".name"))
       th.col-width-nhs-no= sort_link(path, :nhs_number, t(".nhs_no"))
       th.col-width-reference-no= t(".hosp_no")
@@ -14,7 +15,6 @@ table#patients.mdm-patients.columns
         th.col-width-date= sort_link(path, :"#{code}_date", t(".#{code}_date"))
       th.col-width-tiny= sort_link(path, :egfr, t(".egfr"))
       th.col-width-date= t(".esrf")
-      th.col-width-small
 
   tbody
     = render partial: "patient",

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

@@ -1,25 +1,29 @@
-h2 Current
-= render "renalware/medications/prescriptions/table",
-      id: "current-prescriptions",
-      patient: patient,
-      treatable: treatable,
-      prescriptions: current_prescriptions,
-      search: current_search,
-      current_scope: true
-.row
-  .large-12.columns
-    .right
-      = link_to "Add Prescription",
-                new_patient_prescription_path(patient, treatable),
-                remote: true,
-                class: %i(button tiny add_prescription)
+article
+  header
+    h2 Current
+    ul
+      li
+        = link_to "Add Prescription",
+            new_patient_prescription_path(patient, treatable),
+            remote: true,
+            class: %i(button add_prescription)
 
-- if defined? historical_prescriptions
-  h2 Historical
   = render "renalware/medications/prescriptions/table",
-      id: "historical-prescriptions",
-      patient: patient,
-      treatable: treatable,
-      prescriptions: historical_prescriptions,
-      search: historical_prescriptions_search,
-      current_scope: false
+        id: "current-prescriptions",
+        patient: patient,
+        treatable: treatable,
+        prescriptions: current_prescriptions,
+        search: current_search,
+        current_scope: true
+
+- if defined? historical_prescriptions
+  article
+    header
+      h2 Historical
+    = render "renalware/medications/prescriptions/table",
+        id: "historical-prescriptions",
+        patient: patient,
+        treatable: treatable,
+        prescriptions: historical_prescriptions,
+        search: historical_prescriptions_search,
+        current_scope: false

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

@@ -6,7 +6,7 @@ tr(class="#{ "urgent" if message.urgent?}" id=message.html_identifier)
   td= message.author
   td= l(message.sent_at)
   td= l(receipt.read_at)
-  td= default_patient_link(patient)
+  td.col-width-medium-with-ellipsis= default_patient_link(patient)
   td= patient.nhs_number
   td= patient.hospital_identifier
   td.col-width-medium-with-ellipsis= message.subject

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

@@ -4,20 +4,21 @@
             class: "button"
 
 = within_patient_layout(title: "Modality History") do
-  table
-    thead
-      tr
-        th Modality
-        th Notes
-        th.col-width-date Start Date
-        th.col-width-date.wide Termination Date
-        th Added by
-
-    tbody
-      - modalities.each do |modality|
+  article
+    table
+      thead
         tr
-          td= modality.description.name
-          td= modality.notes
-          td= l modality.started_on
-          td= l modality.ended_on
-          td= modality.created_by.full_name
+          th Modality
+          th Notes
+          th.col-width-date Start Date
+          th.col-width-date.wide Termination Date
+          th Added by
+
+      tbody
+        - modalities.each do |modality|
+          tr
+            td= modality.description.name
+            td= modality.notes
+            td= l modality.started_on
+            td= l modality.ended_on
+            td= modality.created_by.full_name

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

@@ -14,3 +14,4 @@ li.has-dropdown
     li= link_to "HD Dialysers", hd_dialysers_path
     li= link_to "HD Cannulation Types", hd_cannulation_types_path
     li= link_to "Print batches", letters_batches_path
+    li= link_to "Pathology Code Groups", renalware.pathology_code_groups_path

data/app/views/renalware/pathology/code_groups/edit.html.slim

@@ -0,0 +1,8 @@
+= within_admin_layout(title: "Pathology Code Group") do
+  h3= group.name
+  = simple_form_for(group, 
+                    url: renalware.pathology_code_group_path(group), 
+                    method: :patch,
+                    as: :code_group) do |f|
+    = f.input :description
+    = f.submit "Save", class: :button

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

@@ -0,0 +1,16 @@
+= within_admin_layout(title: "Pathology Code Groups") do
+  
+  table.code-groups-table
+    thead 
+      tr  
+        th Group name
+        th Description
+    tbody
+      - groups.each do |group|
+        tr
+          td.actions
+            - if policy(group).edit?
+              = link_to "View", pathology_code_group_path(group)
+          td= group.name
+          td= group.description
+

data/app/views/renalware/pathology/code_groups/show.html.slim

@@ -0,0 +1,34 @@
+= within_admin_layout(title: group.name) do
+
+  .panel.info.radius.columns
+    | Editing code groups here is not currently support, sorry. 
+    | You'll need to update the database directly for now.
+
+  h5= group.description
+  = link_to "Edit group", edit_pathology_code_group_path(group)
+
+  br
+  br
+  
+  article 
+    header 
+      h2 Codes
+
+    table.pathology-code-group-memberships.sortables
+      thead
+        /th.col-width-tiny
+        th.col-width-tiny Subgroup 
+        th.col-width-small Position inside sub group
+        th.col-width-small Code
+        th Name
+        
+      tbody
+        - group.memberships.order(:subgroup, :position_within_subgroup ).each do |membership|
+          tr.sortable
+            /td
+              i.fas.fa-bars
+            td= membership.subgroup
+            td= membership.position_within_subgroup
+            td= membership.observation_description.code
+            td= membership.observation_description.name
+            

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

@@ -5,8 +5,12 @@
 
 = within_patient_layout(title: "Problems") do
 
-  h2 Current
-  = render "renalware/problems/problems/current_table", problems: current_problems
-  br
-  h2 Archived
-  = render "renalware/problems/problems/archived_table", problems: archived_problems
+  article
+    header
+      h2 Current
+    = render "renalware/problems/problems/current_table", problems: current_problems
+
+  article
+    header
+      h2 Archived
+    = render "renalware/problems/problems/archived_table", problems: archived_problems

data/app/views/renalware/surveys/_eq5d_summary_part.html.slim

@@ -3,24 +3,24 @@
     header
       h2 EQ5D
 
-  / b Example WIP for charting one question over time
-  / = line_chart(eq5d_summary_part.data_for_question_code(1), curve: false)
-  / br
-  / br
-  / br
+    / b Example WIP for charting one question over time
+    / = line_chart(eq5d_summary_part.data_for_question_code(1), curve: false)
+    / br
+    / br
+    / br
 
-  - return if eq5d_summary_part.rows.blank?
+    - return if eq5d_summary_part.rows.blank?
 
-  .xsss
-    table
-      thead
-        tr
-          th.col-width-date Date
-          - eq5d_summary_part.question_labels.each do |code, label|
-            th= label
-      tbody
-        - eq5d_summary_part.rows.each do |row|
+    .xsss
+      table
+        thead
           tr
-            td= row.answered_on
+            th.col-width-date Date
             - eq5d_summary_part.question_labels.each do |code, label|
-              td= row.send(code.to_sym)
+              th= label
+        tbody
+          - eq5d_summary_part.rows.each do |row|
+            tr
+              td= row.answered_on
+              - eq5d_summary_part.question_labels.each do |code, label|
+                td= row.send(code.to_sym)

data/app/views/renalware/surveys/_pos_s_summary_part.html.slim

@@ -6,70 +6,71 @@
     header
       h2 POS-S
 
-  / b Example WIP for charting one question over time
-  / = line_chart(eq5d_summary_part.data_for_question_code(1), curve: false)
-  / br
-  / br
-  / br
+    / b Example WIP for charting one question over time
+    / = line_chart(eq5d_summary_part.data_for_question_code(1), curve: false)
+    / br
+    / br
+    / br
 
-  - return if pos_s_summary_part.rows.blank?
-  br
-  br
-  br
-  br
-  .xsss
-    table.table-header-rotated.toggleable
-      thead
-        tr
-          th.togglers= rows_toggler
-          th.col-width-date.valign-bottom Date
-          th.col-width-tiny.valign-bottom Total
-          - pos_s_summary_part.question_labels.each do |code, label|
-            th.rotate
-              div
-                span= label
+    - return if pos_s_summary_part.rows.blank?
 
-      - superscript_char = 97
-      - pos_s_summary_part.rows.each do |row|
-        tbody
+    br
+    br
+    br
+    br
+    .xsss
+      table.table-header-rotated.toggleable
+        thead
           tr
-            td= row_toggler
-            td= row.answered_on
-            td= row.total_score
+            th.togglers= rows_toggler
+            th.col-width-date.valign-bottom Date
+            th.col-width-tiny.valign-bottom Total
             - pos_s_summary_part.question_labels.each do |code, label|
-              - value = row.send(code.to_sym)
-              - patient_question_text = row.try(:"#{code}_patient_question_text")
-              td(class="pos-s--#{value}")
-                - if patient_question_text
-                  span(title="Toggle row for question text")= value
-                  sup= superscript_char.chr
-                  - superscript_char += 1
-                - else
-                  = value
-          tr
-            td
-            td
-            td
-            td(class="summary-part--pos_s-patient-question-text" colspan=(pos_s_summary_part.question_labels.count ))
-              - superscript_char = 97
+              th.rotate
+                div
+                  span= label
+
+        - superscript_char = 97
+        - pos_s_summary_part.rows.each do |row|
+          tbody
+            tr
+              td= row_toggler
+              td= row.answered_on
+              td= row.total_score
               - pos_s_summary_part.question_labels.each do |code, label|
+                - value = row.send(code.to_sym)
                 - patient_question_text = row.try(:"#{code}_patient_question_text")
-                - if patient_question_text
-                  sup= superscript_char.chr
-                  |  
-                  span= patient_question_text
-                  |   
-                  - superscript_char += 1
+                td(class="pos-s--#{value}")
+                  - if patient_question_text
+                    span(title="Toggle row for question text")= value
+                    sup= superscript_char.chr
+                    - superscript_char += 1
+                  - else
+                    = value
+            tr
+              td
+              td
+              td
+              td(class="summary-part--pos_s-patient-question-text" colspan=(pos_s_summary_part.question_labels.count ))
+                - superscript_char = 97
+                - pos_s_summary_part.question_labels.each do |code, label|
+                  - patient_question_text = row.try(:"#{code}_patient_question_text")
+                  - if patient_question_text
+                    sup= superscript_char.chr
+                    |  
+                    span= patient_question_text
+                    |   
+                    - superscript_char += 1
 
-    / Colour-coded key
-    dl.pos-s-key
-      dt.pos-s--0 0
-      dd Not at all
-      dt.pos-s--1 1
-      dd Slightly
-      dt.pos-s--2 2
-      dd Moderately
-      dt.pos-s--3 3
-      dd Severely
-      dt.pos-s--4 4
-      dd Overwhelmingly
+      / Colour-coded key
+      dl.pos-s-key
+        dt.pos-s--0 0
+        dd Not at all
+        dt.pos-s--1 1
+        dd Slightly
+        dt.pos-s--2 2
+        dd Moderately
+        dt.pos-s--3 3
+        dd Severely
+        dt.pos-s--4 4
+        dd Overwhelmingly