renalware-core 2.0.0.pre.beta7 → 2.0.0.pre.beta8

data/app/views/renalware/admissions/requests/create.js.erb

@@ -0,0 +1,3 @@
+<%# We render this view when the message has been successfully sent.%>
+<%= refresh(".flash-message", partial: "renalware/shared/flash_messages", locals: local_assigns) %>
+$("#admissions-request-modal").foundation('reveal', 'close');

data/app/views/renalware/admissions/requests/destroy.js.erb

@@ -0,0 +1,3 @@
+// Remove the just-deleted admissions request from the
+<%= refresh(".flash-message", partial: "renalware/shared/flash_messages", locals: local_assigns) %>
+$("#admissions_request_<%=request_id %>").fadeOut(300, function(){ $(this).remove();})

data/app/views/renalware/admissions/requests/edit.html.slim

@@ -0,0 +1,4 @@
+= render "form",
+         request: request,
+         reasons: reasons,
+         hospital_units: hospital_units

data/app/views/renalware/admissions/requests/edit.js.erb

@@ -0,0 +1,4 @@
+var modal = $("#admissions-request-modal")
+$(modal).html("<%=
+  j(render 'form', request: request, reasons: reasons, hospital_units: hospital_units)
+%>");

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

@@ -0,0 +1,3 @@
+= within_admin_layout(title: "Admission Requests (TCI list)") do
+  = render "table", requests: requests
+  = paginate requests

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

@@ -0,0 +1,4 @@
+= render "form",
+         request: request,
+         reasons: reasons,
+         hospital_units: hospital_units

data/app/views/renalware/admissions/requests/new.js.erb

@@ -0,0 +1,4 @@
+var modal = $("#admissions-request-modal")
+$(modal).html("<%=
+  j(render 'form', request: request, reasons: reasons, hospital_units: hospital_units)
+%>");

data/app/views/renalware/admissions/requests/update.js.erb

@@ -0,0 +1,9 @@
+<%# We render this view when the request has been successfully updated.%>
+<%= refresh(".flash-message", partial: "renalware/shared/flash_messages", locals: local_assigns) %>
+$("#admissions-request-modal").foundation('reveal', 'close');
+// Refresh the just-updated admissions request
+<%=
+  replace("#admissions_request_#{request.id}",
+            partial: "request",
+            locals: { request: request })
+%>

data/app/views/renalware/api/ukrdc/patients/_allergies.xml.builder

@@ -5,7 +5,7 @@
 xml = builder
 
 xml.Allergies do
-  patient.allergies.each do |allergy|
+  patient.allergies.includes(:updated_by).each do |allergy|
     xml.Allergy do
       xml.Allergy do
         xml.comment! "We don't have snomed code for allergies..?"

data/app/views/renalware/api/ukrdc/patients/_clinical_relationships.xml.builder

@@ -1,6 +1,5 @@
 xml = builder
 
-
 xml.ClinicalRelationships do
   xml.comment! "Not supplied in RW 2.0"
 end

data/app/views/renalware/api/ukrdc/patients/_lab_orders.xml.builder

@@ -1,6 +1,11 @@
 xml = builder
 
 xml.LabOrders(start: Time.zone.today.iso8601, stop: Time.zone.today.iso8601) do
-  xml.comment! "Check what start and stop refer to here"
-  xml.comment! "TODO"
+  xml.comment! "TODO: start and stop date"
+
+  render partial: "renalware/api/ukrdc/patients/lab_orders/lab_order",
+       collection: patient.observation_requests.includes(:description,
+                                                         observations: {description: :measurement_unit}),
+       as: :request,
+       locals: { builder: builder }
 end

data/app/views/renalware/api/ukrdc/patients/_observations.xml.builder

@@ -6,7 +6,7 @@ xml = builder
 
 xml.Observations(start: Time.zone.today.iso8601, stop: Time.zone.today.iso8601) do
   xml.comment! "Check what start and stop refer to here"
-  patient.clinic_visits.each do |visit|
+  patient.clinic_visits.includes(:updated_by).each do |visit|
     render "clinic_visit_observation",
            visit: visit,
            method: :systolic_bp,

data/app/views/renalware/api/ukrdc/patients/_patient.xml.builder

@@ -12,12 +12,14 @@ xml.Patient do
     xml.PatientNumber do
       xml.Number patient.nhs_number
       xml.Organization "NHS"
+      xml.NumberType "NI"
     end
     Renalware.config.patient_hospital_identifiers.values.each do |field|
       next if (number = patient.public_send(field)).blank?
       xml.PatientNumber do
         xml.Number number
         xml.Organization "LOCALHOSP"
+        xml.NumberType "MRN"
       end
     end
   end

data/app/views/renalware/api/ukrdc/patients/_sending_facility.xml.builder

@@ -1,7 +1,7 @@
 xml = builder
 
 xml.SendingFacility(
-  channelName: "RenalwareV2",
+  channelName: "Renalware",
   channelId: "TODO",
   time: Time.zone.now.to_datetime) do
 end

data/app/views/renalware/api/ukrdc/patients/lab_orders/_lab_order.xml.builder

@@ -0,0 +1,46 @@
+# See HL7 spec http://pacs.hk/Doc/HL7/Hl7V231.pdf
+#
+xml = builder
+
+xml.LabOrder do
+  xml.ReceivingLocation do
+    xml.code "TODO"
+    xml.Description # request.pathology_lab.name
+  end
+  xml.PlacerId request.requestor_order_number
+  xml.FillerId "??ORC:3 Labs Order Id"
+  xml.OrderedBy do
+    xml.Code "unknown"
+    xml.Description request.requestor_name
+  end
+  xml.OrderItem do
+    xml.Code "TODO: LOIN code for request? E.g. MB from 'OBR|1|^PCS|09B0099478^LA|FBC^FULL BLOOD COUNT^MB|..'"
+  end
+  xml.OrderCategory do
+    xml.Code request.description.code
+  end
+  xml.SpecimenCollectedTime "TODO"
+  xml.SpecimenReceivedTime "TODO"
+  xml.Priority do
+    xml.Code "TODO: Probably n/a"
+  end
+  xml.SpecimenSource request.description.bottle_type
+  xml.Duration "OBR:27.3 but no available in the example messages I have"
+
+  xml.ResultItems do
+    render partial: "renalware/api/ukrdc/patients/lab_orders/result_item",
+           collection: request.observations,
+           as: :observation,
+           locals: { builder: builder }
+  end
+
+  xml.PatientClass do
+    xml.CodingStandard "HL7_0004"
+    xml.Code "e.g. I for Inpatient"
+    xml.Description "e.g. Inpatient?"
+  end
+  xml.EnteredOn request.requested_at.iso8601
+  xml.EnteredAt do
+    xml.code "location code here"
+  end
+end

data/app/views/renalware/api/ukrdc/patients/lab_orders/_result_item.xml.builder

@@ -0,0 +1,14 @@
+xml = builder
+observation = Renalware::Pathology::ObservationPresenter.new(observation)
+
+xml.ResultItem do
+  xml.ResultType observation.description_name
+  xml.EnteredOn observation.updated_at&.iso8601
+  xml.ObservationTime observation.observed_at&.iso8601
+  xml.PrePost "?"
+  xml.ServiceId "?"
+  xml.SubId "?"
+  xml.ResultValue observation.result
+  xml.ResultValueUnits observation.measurement_unit_name
+  xml.ReferenceRange "?"
+end

data/app/views/renalware/clinical/allergies/_mini.html.slim

@@ -1,3 +1,4 @@
+- require_dependency("renalware/renal")
 - patient = Renalware::Clinical.cast_patient(patient)
 
 .allergies

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

@@ -20,11 +20,15 @@
     - if dashboard.unread_messages_receipts.any?
       = render "renalware/messaging/shared/key"
       .unread-messages
-        = render "renalware/messaging/receipts/table",
+        = render "renalware/messaging/internal/receipts/table",
                  receipts: dashboard.unread_messages_receipts
     - else
       p.empty-section= t(".messages.none")
 
   section.electonic_ccs
     h2 Electronic CCs
-    p.empty-section= t(".electronic_ccs.none")
+    - 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")

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

@@ -1,17 +1,17 @@
 tr(class=letter.state.dasherize)
-  td
-    = link_to "Toggle", "#quick-preview-#{letter.id}", data: { behaviour: "toggler" }
-    = pipe_separator
-    = link_to letter.view_label, patient_letters_letter_path(letter.patient, letter)
-    - if policy(letter).update?
-      = pipe_separator
-      = link_to "Edit", edit_patient_letters_letter_path(letter.patient, letter)
   td.state
     span= letter.state_description
   td= l letter.issued_on
   td= letter.author
   td= link_to letter.patient, patient_clinical_summary_path(letter.patient)
   td= letter.description
+  td.actions
+    = link_to "Toggle", "#quick-preview-#{letter.id}", data: { behaviour: "toggler" }
+    = pipe_separator
+    = link_to letter.view_label, patient_letters_letter_path(letter.patient, letter)
+    - if policy(letter).update?
+      = pipe_separator
+      = link_to "Edit", edit_patient_letters_letter_path(letter.patient, letter)
 = content_tag(:tr, id: "quick-preview-#{letter.id}", style: "display: none")
   td
   td(colspan=7)

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

@@ -1,12 +1,12 @@
 table.auto-layout.letters
   thead
     tr
-      th.col-width-medium
-      th.col-width-small State
+      th.col-width-tiny State
       th.col-width-date Date
       th.col-width-medium Author
       th.col-width-large Patient
       th Description
+      th.col-width-small
 
   tbody
     = render partial: "renalware/dashboard/letters/letter", collection: letters

data/app/views/renalware/devise/passwords/edit.html.erb

@@ -0,0 +1,27 @@
+<%= within_admin_layout(title: "Change your password") do %>
+
+  <%= simple_form_for(resource,
+                      as: resource_name,
+                      url: password_path(resource_name),
+                      wrapper: :horizontal_form,
+                      html: { autocomplete: "off", method: :put }) do |f| %>
+    <%= render "renalware/shared/errors", model: resource %>
+    <%= f.input :reset_password_token, as: :hidden %>
+    <%= f.full_error :reset_password_token %>
+    <%= f.input :password,
+                label: "New password",
+                required: true,
+                autofocus: true,
+                wrapper: :horizontal_small,
+                hint: ("#{@minimum_password_length} characters minimum" if @minimum_password_length) %>
+    <%= f.input :password_confirmation,
+                label: "Confirm your new password",
+                required: true,
+                wrapper: :horizontal_small %>
+
+    <%= f.button :submit, "Change my password" %>
+  <% end %>
+
+  <%= render "devise/shared/links" %>
+
+<% end %>

data/app/views/renalware/devise/passwords/new.html.erb

@@ -0,0 +1,18 @@
+<%= within_admin_layout(title: "Forgot your password?") do %>
+  <%= simple_form_for(resource,
+                      as: resource_name,
+                      url: password_path(resource_name),
+                      html: { method: :post, autocomplete: "off" }) do |f| %>
+
+    <%= f.error_notification %>
+    <div class="row">
+      <div class="columns small-12 medium-6 last">
+        <%= f.input :email, required: true, autofocus: true %>
+
+      </div>
+    </div>
+
+    <%= f.button :submit, "Send me reset password instructions" %>
+  <% end %>
+  <%= render "devise/shared/links" %>
+<% end %>

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

@@ -0,0 +1,25 @@
+ = within_admin_layout(title: "Register") do
+  = simple_form_for(resource,
+                    as: resource_name,
+                    url: registration_path(resource_name),
+                    wrapper: :horizontal_form) do |f|
+
+    = custom_devise_error_messages!
+
+    = f.input :given_name, input_html: { autofocus: true }, wrapper: :horizontal_medium
+    = f.input :family_name, wrapper: :horizontal_medium
+    = f.input :username, wrapper: :horizontal_small
+    = f.input :email, wrapper: :horizontal_small
+    = f.input :password,
+              as: :password,
+              input_html: { autocomplete: "off" },
+              hint: "#{@minimum_password_length} characters minimum",
+              wrapper: :horizontal_small
+    = f.input :password_confirmation,
+              as: :password,
+              input_html: { autocomplete: "off" },
+              wrapper: :horizontal_small
+    = f.submit "Sign up", class: "button save"
+
+  = render "devise/shared/links"
+

data/app/views/renalware/letters/electronic_receipts/_table.html.slim

@@ -0,0 +1,45 @@
+table.letters.electronic-ccs.has-togglable-rows
+  thead
+    tr
+      th.col-width-date Date
+      th.col-width-medium Author
+      th.col-width-large Patient
+      th Description
+      th.col-width-small
+
+  tbody
+    - receipts.each do |receipt|
+      - letter = Renalware::Letters::LetterPresenter.new(receipt.letter)
+      tr(id=receipt.html_identifier)
+        td= l(letter.issued_on)
+        td= letter.author
+        td= link_to letter.patient, patient_clinical_summary_path(letter.patient)
+        td= letter.description
+        td.actions
+          = link_to "Toggle", "##{receipt.html_preview_identifier}", data: { behaviour: "toggler" }
+          = pipe_separator
+          = link_to letter.view_label,
+                    patient_letters_letter_path(letter.patient, letter, back_url: request.fullpath)
+
+      = content_tag(:tr, id: receipt.html_preview_identifier, style: "display: none")
+        td
+        td(colspan=3)
+          .quick-preview
+            = simple_format letter.body
+
+        td.nowrap
+          - if policy(receipt).mark_as_read?
+            ul.actions
+              li= link_to "Keep as unread",
+                          "##{receipt.html_preview_identifier}",
+                          data: { behaviour: "toggler" },
+                          class: "button secondary keep-as-unread"
+
+              li= link_to(mark_as_read_letters_letter_electronic_receipt_path(letter, receipt),
+                          class: "button mark-as-read",
+                          method: :patch,
+                          remote: true) do
+                i.fa.fa-check
+                | Mark as read
+
+

data/app/views/renalware/letters/electronic_receipts/mark_as_read.js.erb

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

data/app/views/renalware/letters/electronic_receipts/read.html.slim

@@ -0,0 +1,5 @@
+= within_admin_layout(title: "Electronic CCs") do
+  = render "renalware/letters/shared/electronic_cc_type_tabs"
+  = render search_form
+  = render "table", receipts: receipts
+  = paginate receipts

data/app/views/renalware/letters/electronic_receipts/sent.html.slim

@@ -0,0 +1,40 @@
+= within_admin_layout(title: "Electronic CCs") do
+  = render "renalware/letters/shared/electronic_cc_type_tabs"
+  = render search_form
+
+  table.letters.electronic-ccs.sent.has-togglable-rows
+    thead
+      tr
+        th.col-width-date Date
+        th.col-width-medium Author
+        th.col-width-large Patient
+        th Description
+        th Recipient
+        th Read?
+        th
+
+    tbody
+      - receipts.each do |receipt|
+        - letter = Renalware::Letters::LetterPresenter.new(receipt.letter)
+        tr
+          td= l(letter.issued_on)
+          td= letter.author
+          td= link_to letter.patient, patient_clinical_summary_path(letter.patient)
+          td= letter.description
+          td= receipt.recipient
+          td= yes_no(receipt.read?)
+          td.actions
+            = link_to "Toggle", "##{receipt.html_preview_identifier}", data: { behaviour: "toggler" }
+            = pipe_separator
+            = link_to(\
+                letter.view_label,
+                patient_letters_letter_path(letter.patient, letter, back_url: request.fullpath))
+
+        = content_tag(:tr, id: receipt.html_preview_identifier, style: "display: none")
+          td
+          td(colspan=5)
+            .quick-preview
+              = simple_format letter.body
+          td
+
+  = paginate receipts

data/app/views/renalware/letters/electronic_receipts/unread.html.slim

@@ -0,0 +1,5 @@
+= within_admin_layout(title: "Electronic CCs") do
+  = render "renalware/letters/shared/electronic_cc_type_tabs"
+  = render search_form
+  = render "table", receipts: receipts
+  = paginate receipts

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

@@ -218,11 +218,17 @@ scss:
       }
       margin-bottom: 20px;
     }
-
   }
 
   .footer {
     .ccs {
+      .electronic {
+        list-style-type: none;
+        list-style-position: outside;
+        margin: 0;
+        padding: 0;
+      }
+
       h3 {
         font-size: 1em;
         margin-bottom: 20px;
@@ -292,6 +298,11 @@ scss:
     .ccs
       h3 cc:
 
+      ul.electronic
+        - letter.electronic_cc_recipients.each do |user|
+          li= user.professional_signature
+
+
       .private
         p Private and confidential