RubyGems - renalware-core - Versions diffs - 2.0.145 → 2.0.151 - Mend

renalware-core 2.0.145 → 2.0.151

Files changed (468) hide show

data/app/views/renalware/accesses/assessments/_form.html.slim CHANGED

@@ -4,7 +4,7 @@ ruby:
 .row.top
   .medium-6.columns
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", back_path
 .form-content
@@ -39,5 +39,5 @@ ruby:
   .row
     .large-12.columns
       = f.button :submit
-      span= " or "
+      '  or
       = link_to "cancel", back_path

data/app/views/renalware/accesses/assessments/show.html.slim CHANGED

@@ -8,7 +8,7 @@
   - return unless assessment
   .document-view
-    .grid
+    .mgrid
       .row
         - attributes_list = assessment.document.results.class.attributes_list
         = render "renalware/shared/attributes_group",

data/app/views/renalware/accesses/plans/new.html.slim CHANGED

@@ -18,5 +18,5 @@
                       wrapper: :horizontal_medium
       = f.submit "Save", class: "button"
-      span= " or "
+      '  or
       = link_to "cancel", patient_accesses_dashboard_path(patient)

data/app/views/renalware/accesses/procedures/_form.html.slim CHANGED

@@ -4,7 +4,7 @@ ruby:
 .row.top
   .medium-6.columns
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", back_path
 .form-content
@@ -41,5 +41,5 @@ ruby:
 .row
   .large-12.columns
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", back_path

data/app/views/renalware/accesses/procedures/show.html.slim CHANGED

@@ -8,7 +8,7 @@
   - return unless procedure
   .document-view
-    .grid
+    .mgrid
       .row
         .columns.small-12.large-6
           = article_tag "Access Procedure" do

data/app/views/renalware/accesses/profiles/_form.html.slim CHANGED

@@ -4,7 +4,7 @@ ruby:
 .row.top
   .medium-6.columns
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", back_path
 .form-content
@@ -31,5 +31,5 @@ ruby:
 .row
   .large-12.columns
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", back_path

data/app/views/renalware/accesses/profiles/show.html.slim CHANGED

@@ -8,7 +8,7 @@
   - return unless profile
   .document-view
-    .grid
+    .mgrid
       .row
         = render "renalware/shared/attributes_group",
             legend: "Access Profile", destination: "profile",

data/app/views/renalware/admin/cache/show.html.slim CHANGED

@@ -42,3 +42,39 @@
             method: :delete,
             data: { confirm: "Are you sure you want to clear the PDF letter cache?\n" },
             class: "button alert"
+  <label class="block">
+    <span class="text-gray-700">Name</span>
+    <input class="form-input mt-1 block w-full" placeholder="Jane Doe">
+  </label>
+  <div class="mt-4">
+    <span class="text-gray-700">Account Type</span>
+    <div class="mt-2">
+      <label class="inline-flex items-center">
+        <input type="radio" class="form-radio" name="accountType" value="personal">
+        <span class="ml-2">Personal</span>
+      </label>
+      <label class="inline-flex items-center ml-6">
+        <input type="radio" class="form-radio" name="accountType" value="busines">
+        <span class="ml-2">Business</span>
+      </label>
+    </div>
+  </div>
+  <label class="block mt-4">
+    <span class="text-gray-700">Requested Limit</span>
+    <select class="form-select mt-1 block w-full">
+      <option>$1,000</option>
+      <option>$5,000</option>
+      <option>$10,000</option>
+      <option>$25,000</option>
+    </select>
+  </label>
+  <div class="flex mt-6">
+    <label class="flex items-center">
+      <input type="checkbox" class="form-checkbox">
+      <span class="ml-2">I agree to the <span class="underline">privacy policy</span></span>
+    </label>
+  </div>

data/app/views/renalware/admin/playgrounds/pathology_chart_data.js.erb ADDED

	@@ -0,0 +1 @@
1	+ console.log("as")

data/app/views/renalware/admin/playgrounds/show.html.slim ADDED

@@ -0,0 +1,62 @@
+css:
+  .chart {
+    width: 500px;
+    height: 200px;
+  }
+  #patient_id {
+    width:300px;
+    display: block
+  }
+  #patient_id input {
+    width:200px;
+    display:inline;
+  }
+  #patient_id a {
+    width: 90px;
+    display:inline;
+    padding: 5px;
+    margin-left: 5px;
+  }
+= within_new_admin_layout(title: "Admin Playground") do
+  article
+    header
+      h2 Pathology Charts
+    span A testbed for trying out highchart linecharts
+    br
+    br
+    .chart-container(data-controller="charts"
+                    data-charts-url=pathology_chart_data_admin_playground_path)
+      .row
+        .columns.small-12.medium-6.large-4
+          = simple_form_for(form,
+                            remote: true,
+                            as: :chart,
+                            url: pathology_chart_data_admin_playground_path,
+                            wrapper: nil,
+                            method: :get,
+                            data: { target: "charts.form", action: "ajax:success->charts#redisplay" }) do |f|
+            = f.input :patient_id,
+                      collection: [[form.patient_id, form.patient_id]],
+                      selected: 1,
+                      input_html: { \
+                        class: "patient-id-select2 patient-ajax-search",
+                        data: { "ajax--url" => search_patients_path(format: :json),
+                                placeholder: "Search by patient name or hospital/NHS no." } \
+                      }
+            = f.input :obx_code,
+                      collection: Renalware::Pathology::ObservationDescription.order(:code).pluck(:code),
+                      input_html: {  class: "searchable_select" }
+            = f.input :period,
+                      collection: %w(all yr 6m 3m 1m wk),
+                      include_blank: false
+            = f.submit "Refresh", class: :button
+      #chart1 style="height: 300px; width: 500px" data-target="charts.chart"
+    / To test tailwindcss
+    .max-w-sm.rounded.overflow-hidden.shadow-lg &nbsp;

data/app/views/renalware/admin/users/_filters.html.slim CHANGED

@@ -7,5 +7,5 @@
           = f.search_field :family_name_or_given_name_or_username_or_email_cont
         .small-3.large-4.columns.actions.end
           = f.submit t("helpers.submit.filter"), class: "button"
-          span= " or "
+          '  or
           = link_to t("helpers.reset"), admin_users_path

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

@@ -54,5 +54,5 @@
               wrapper: :horizontal_small
     - msg = user.approved? ? "Update" : "Approve"
     = f.submit msg, class: "button"
-    span= " or "
+    '  or
     = link_to "cancel", admin_users_path

data/app/views/renalware/admissions/admissions/_filters.html.slim CHANGED

@@ -19,5 +19,5 @@
                   include_blank: "Any"
       .columns.medium-2.large-2.actions.end
         = f.submit "Filter", class: "button"
-        span= " or "
+        '  or
         = link_to t("helpers.reset"), admissions_admissions_path

data/app/views/renalware/admissions/admissions/_form.html.slim CHANGED

@@ -45,5 +45,5 @@
     = f.input :discharge_summary, as: :trix_editor, class: "discharge-summary", wrapper: :zilch
   = f.submit class: :button
-  span= " or "
+  '  or
   = link_to "Cancel", admissions_admissions_path

data/app/views/renalware/admissions/admissions/index.html.slim CHANGED

@@ -6,9 +6,9 @@
 = within_admin_layout(title: "Inpatient Admissions") do
   .panel.radius.compact
-    | If the patient is not on Renalware yet, please&nbsp;
+    ' If the patient is not on Renalware yet, please
     = link_to("add them", new_patient_path)
-    | &nbsp;first
+    |  first
   = render "table", admissions: admissions
   = paginate admissions

data/app/views/renalware/admissions/consults/_filters.html.slim CHANGED

@@ -37,5 +37,5 @@
                   label: "Modality"
       .columns.medium-2.large-2.actions.end
         = f.submit "Filter", class: "button"
-        span= " or "
+        '  or
         = link_to t("helpers.reset"), admissions_consults_path(reset: 1)

data/app/views/renalware/admissions/consults/_form.html.slim CHANGED

@@ -8,7 +8,7 @@
   / selected yet) otherwise it will display the selected patient who will always be
   / at option index 1.
   = f.input :patient_id,
-            wrapper: :horizontal_medium,
+            wrapper: :hz_md,
             collection: [[consult.patient&.to_s(:long), consult.patient&.id]],
             selected: 1,
             input_html: { \
@@ -19,39 +19,40 @@
   = f.input :consult_site_id,
             collection: Renalware::Admissions::ConsultSite.all,
-            wrapper: :horizontal_medium,
+            wrapper: :hz_md,
             include_blank: "Select local site (or enter other site below)",
             label: "Site"
   = ward_dropdown_grouped_by_hospital_unit(f,
     :hospital_ward_id,
-    include_blank: "Select local ward (or enter other ward below)")
+    include_blank: "Select local ward (or enter other ward below)",
+    wrapper: :hz_md)
-  = f.input :other_site_or_ward, wrapper: :horizontal_medium
-  = f.input :started_on, as: :date_picker, wrapper: :horizontal_datepicker
-  = f.input :e_alert
+  = f.input :other_site_or_ward, wrapper: :hz_md
+  = f.input :started_on, as: :date_picker, wrapper: :hz_datepicker
+  = f.input :e_alert, wrapper: :hz_md
   = f.association(:specialty,
-                  wrapper: :horizontal_medium,
+                  wrapper: :hz_md,
                   collection: Renalware::Admissions::Specialty.ordered)
-  = f.input :consult_type, wrapper: :horizontal_medium
-  = f.input :decided_on, as: :date_picker, wrapper: :horizontal_datepicker
-  = f.input :transfer_priority, include_blank: false, wrapper: :horizontal_small
+  = f.input :consult_type, wrapper: :hz_md
+  = f.input :decided_on, as: :date_picker, wrapper: :hz_datepicker
+  = f.input :transfer_priority, include_blank: false, wrapper: :hz_sm
   = f.input :priority,
             include_blank: true,
             collection: Renalware::Admissions::Consult::PRIORITY_VALUES,
-            wrapper: :horizontal_tiny
-  = f.input :transferred_on, as: :date_picker, wrapper: :horizontal_datepicker
+            wrapper: :hz_xs
+  = f.input :transferred_on, as: :date_picker, wrapper: :hz_datepicker
   = f.association :seen_by,
                   as: :user_picker,
                   collection: Renalware::User.ordered,
-                  wrapper: :horizontal_medium
-  = f.input :contact_number, wrapper: :horizontal_medium
+                  wrapper: :hz_md
+  = f.input :contact_number, wrapper: :hz_md
-  = f.input :aki_risk, include_blank: "Please select", wrapper: :horizontal_small
-  = f.input :requires_aki_nurse, as: :inline_radio_buttons, wrapper: :horizontal_small
-  = f.input :rrt, as: :inline_radio_buttons, wrapper: :horizontal_small
-  = f.input :description, wrapper: :horizontal_large, input_html: { rows: 10 }
+  = f.input :aki_risk, include_blank: "Please select", wrapper: :hz_sm
+  = f.input :requires_aki_nurse, as: :inline_radio_buttons, wrapper: :hz_sm
+  = f.input :rrt, as: :inline_radio_buttons, wrapper: :hz_sm
+  = f.input :description, wrapper: :hz_lg, input_html: { rows: 10 }
   = f.submit class: :button
-  span= " or "
+  '  or
   = link_to "Cancel", admissions_consults_path

data/app/views/renalware/admissions/consults/index.html.slim CHANGED

@@ -15,9 +15,9 @@
   = render "renalware/admissions/requests/modal_dialog_placeholder"
   .panel.radius.compact
-    | If the patient is not on Renalware yet, please&nbsp;
+    ' If the patient is not on Renalware yet, please
     = link_to("add them", new_patient_path)
-    | &nbsp;first
+    |  first
   = render "table", consults: consults, query: query
   = paginate consults

data/app/views/renalware/admissions/requests/_form.html.slim CHANGED

@@ -22,7 +22,7 @@
       = f.input :hospital_unit_id, collection: hospital_units, wrapper: :horizontal_medium
       = f.input :notes, as: :text, wrapper: :horizontal_large, input_html: { rows: 5 }
       = f.submit class: :button
-      span= " or "
+      '  or
       = link_to "Cancel",
                "#",
                "aria-label" => "Close",

data/app/views/renalware/clinical/allergies/_new.html.slim CHANGED

@@ -7,7 +7,7 @@
     h2= t(".title")
     = f.input :description, as: :text, autofocus: true
     = f.submit t(".save"), class: :button, data: { disable_with: t(".save_disable_with") }
-    span= " or "
+    '  or
     = link_to t(".cancel"),
              "#",
              "aria-label" => "Close",

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

@@ -44,5 +44,5 @@
 .row
   .large-12.columns
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", patient_clinical_profile_path(patient)

data/app/views/renalware/clinical/dry_weights/_form.html.slim CHANGED

@@ -14,5 +14,5 @@
 .row
   .large-12.columns
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", return_url

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

@@ -36,5 +36,5 @@
           .columns.large-12.form-actions
             = submit_tag "Update", class: "button"
-            span= " or "
+            '  or
             = link_to "Cancel", patient_clinical_profile_path(patient)

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

@@ -2,7 +2,7 @@
   = link_to "Edit", edit_patient_clinical_profile_path(patient), class: "button"
 = within_patient_layout(title: "Clinical Profile") do
-  .grid
+  .mgrid
     .row
       .columns.medium-6
         = article_tag("General") do
@@ -70,6 +70,16 @@
                  patient: patient,
                  limit: true
+      .columns.small-12.large-6
+        = render Renalware::Events::EventListComponent.new(\
+            patient: patient,
+            event_class: Renalware::Events::ClinicalFrailtyScore)
+      .columns.small-12.large-6
+        = render Renalware::Events::EventListComponent.new(\
+            patient: patient,
+            event_class: Renalware::Events::AdvancedCarePlan)
       .columns
         = render "renalware/clinical/body_compositions/list",
                  body_compositions: profile.body_compositions,

data/app/views/renalware/clinics/clinic_visits/_table.html.slim CHANGED

@@ -15,6 +15,8 @@ table.clinics.auto-layout
       th.col-width-tiny Temp
       th.col-width-tiny Urine blood
       th.col-width-tiny Urine protein
+      th.col-width-tiny(title="Body surface area") BSA
+      th.col-width-tiny(title="Total Body Water") TBW
       th.col-width-medium Created by
   tbody
     = render partial: "renalware/clinics/clinic_visits/table_row",

data/app/views/renalware/clinics/clinic_visits/_table_row.html.slim CHANGED

@@ -22,6 +22,8 @@ tr(class="#{'dna' if clinic_visit.did_not_attend?}")
   td.bp= clinic_visit.temperature
   td= clinic_visit.urine_blood&.text
   td= clinic_visit.urine_protein&.text
+  td= clinic_visit.body_surface_area
+  td= clinic_visit.total_body_water
   td.created-by= clinic_visit.created_by
 = content_tag(:tr, id: "clinic_visit-quick-preview-#{clinic_visit.id}", style: "display: none")
   td(colspan=15)

data/app/views/renalware/clinics/clinic_visits/new.html.slim CHANGED

@@ -15,5 +15,5 @@
       = render "form", f: f
       = f.submit "Save", class: "button"
-      span= " or "
+      '  or
       = link_to "cancel", patient_clinic_visits_path(patient)

data/app/views/renalware/clinics/visits/_filters.html.slim CHANGED

@@ -15,7 +15,7 @@
           = f.input :created_by_id_eq, as: :user_picker, collection: users, label: "Clinician"
         .medium-2.large-3.columns.actions.end
           = f.submit "Filter", class: "button"
-          span= " or "
+          '  or
           = link_to t("helpers.reset"), clinic_visits_path
   .filters__output

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

@@ -8,7 +8,7 @@ tr(class=letter.state.dasherize)
   td.actions
     = link_to "Toggle", "#quick-preview-#{letter.id}", data: { behaviour: "toggler" }
     = link_to letter.view_label, patient_letters_letter_path(letter.patient, letter)
-    - if policy(letter).update?
+    - if Pundit.policy!(current_user, letter).update?
       = link_to "Edit", edit_patient_letters_letter_path(letter.patient, letter)
 = content_tag(:tr, id: "quick-preview-#{letter.id}", style: "display: none")
   td

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

@@ -31,5 +31,5 @@
               wrapper: :horizontal_large
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", patient_clinical_profile_path(patient)