renalware-core 2.0.126 → 2.0.127

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1b4b5e0615d605d093018e57c295da81fa8b2c7b51bd83b8ab02065ce357c91
-  data.tar.gz: f78640822218ff8dfbae7ef9281d0cb9c5636791222fbb06a37cd36001b41ee8
+  metadata.gz: 334da5d5d7e32ed650c55379a33eedf5d4bba077a4480f987aece96dcb498ac9
+  data.tar.gz: 97f0bce7f1420f0d3f87b32e56bab92847c8f4efc61f7b2ba187a55749cd22fb
 SHA512:
-  metadata.gz: a4074e24c734e3c38efb99687920d41ab1ac0e555dc6663a7cc356fc8035465b94ffa18be1ddcf8c2bbafd2e347a77caf0cf7806cd7d201980e699d8077bfcb6
-  data.tar.gz: 680f524d251700a637fec7a8900a4c242cc691fad41d868254a773bd8de314859fbd7510bcb67fc01481cb300456b1bbebfee17aac0df95f0d86b63671ddd18e
+  metadata.gz: f83bf5d9b6e63e5ba23ba024b61aafc74bf92658bb9a80662d204bd1e5bd3cf75096ba5ebe7dc4ca58a988694d371b8b070cddf95298870dd21aa206f68c1525
+  data.tar.gz: 62f72f50326cb5275faa9205f0dff4e75c6f8efa7bd84b1a11047e6b3d9a495dc16049fd3e77544d64c93b8bb47cf59a3e8b4c379107a80f5eba88c7d67043af

data/app/assets/stylesheets/renalware/base/_variables.scss

@@ -61,7 +61,7 @@ $drug-type-default-colour: none;
 $drug-type-esa-colour: #ff9;
 $drug-type-immunosuppressant-colour: #ccfeff;
 
-$tab-border-color: $off-white;
+$tab-border-color: #ddd;
 
 // Patient header/banner
 $patient-header-muted-color: #777;
@@ -102,7 +102,7 @@ $letter-preview-background-colour: #ddd;
 
 // tables
 $table-even-row-colour: #fcfcfc;
-$table-border-colour: #ccc;
+$table-border-colour: #ddd;
 $table-toggled-content-colour: #fefff1;
 $table-urgent-colour: $nhs-yellow;
 $table-row-hover-colour: #f9f9f9;

data/app/assets/stylesheets/renalware/modules/_clinical.scss

@@ -51,7 +51,7 @@ article.clinical-allergies {
 }
 
 .clinical-header {
-  background-color: $table-border-colour;
+  background-color: $disabled-colour;
   padding: 0 .2em .2em .6em;
 
   @media print {
@@ -85,7 +85,7 @@ article.clinical-allergies {
     padding: 0;
 
     li {
-      border-bottom: 1px dotted $winter-sky;
+      border-bottom: 1px solid $winter-sky;
       display: inline-block;
       margin: 0.2rem .6rem .2rem 0;
       padding: 0
@@ -182,7 +182,7 @@ article.clinical-allergies {
           }
 
           a {
-            border-bottom: 1px dotted $white;;
+            border-bottom: 1px solid $white;;
             color: $white
           }
 

data/app/assets/stylesheets/renalware/modules/_problems.scss

@@ -2,7 +2,10 @@ table#problems,
 table#current_problems,
 table#archived_problems {
   td {
-    vertical-align: top;
+    // vertical-align: top;
+    span {
+      line-height: 1.1rem;
+    }
 
     ol {
       font-size: 1em;

data/app/assets/stylesheets/renalware/modules/_rotated_tables_headings.scss

@@ -0,0 +1,39 @@
+// Somewhat specialised for use in eg POS-S survey results table because
+// the attributes are quite finicky to get it to look right.
+// If you need to use these classes elsewhere and the look is not right,
+// please make sure PROMS survey results still look OK.
+.table-header-rotated {
+  width: auto;
+
+  th.rotate {
+    height: 138px;
+    white-space: nowrap;
+
+    // Firefox needs the extra DIV for some reason, otherwise the text disappears if you rotate
+    > div {
+      transform:
+        // Magic Numbers
+        translate(25px, 51px)
+        // 45 is really 360-45
+        rotate(315deg);
+      width: 2rem;
+    }
+
+    > div > span {
+      border-bottom: 1px solid #ccc ;
+      display: inline-block;
+      padding: .4rem .0rem;
+      margin: 0 0 1.1rem -0.5rem;
+    }
+  }
+
+  th.row-header {
+    padding: 0 10px;
+    border-bottom: 1px solid #ccc;
+  }
+
+  th {
+    overflow: visible;
+    vertical-align: inherit;
+  }
+}

data/app/assets/stylesheets/renalware/modules/_surveys.scss

@@ -55,4 +55,8 @@ dl.pos-s-key {
       text-align: left;
     }
   }
+
+  .summary-part--pos_s-patient-question-text {
+    text-align: right;
+  }
 }

data/app/assets/stylesheets/renalware/partials/_forms.scss

@@ -220,7 +220,7 @@ article {
     width: 100%;
 
     li {
-      border-bottom: 1px dotted $iron;
+      border-bottom: 1px solid $table-border-color;
       // font-weight: bold;
       padding-bottom: 0.2rem;
 

data/app/assets/stylesheets/renalware/partials/_tables.scss

@@ -5,8 +5,8 @@ table tbody tr th,
 table tbody tr td,
 table tr td {
   display: table-cell;
-  line-height: 1rem;
-  padding: 0.4rem 0.28571rem;
+  line-height: 1.3rem;
+  padding: 0.2rem 0.28571rem;
 }
 
 table thead th {
@@ -202,7 +202,7 @@ table {
 
   tr th,
   tr td {
-    border-bottom: 1px dotted $disabled-colour;
+    border-bottom: 1px solid $table-border-colour;
     border-left-width: 0;
     border-right: solid 1px $white;
     font-size: 1rem;
@@ -498,3 +498,9 @@ table tr.alt,
 table tr:nth-of-type(even) {
   background: transparent;
 }
+
+th, td {
+  &.valign-bottom {
+    vertical-align: bottom;
+  }
+}

data/app/assets/stylesheets/renalware/partials/_tabs.scss

@@ -16,7 +16,7 @@
   .ui-tabs-tab.ui-tabs-active,
   .ui-tabs-tab.ui-state-active {
     background-color: $white;
-    border-color: $table-border-colour;
+    border-color: $disabled-colour;
   }
 
   .ui-tabs-anchor {
@@ -66,7 +66,7 @@
 
     &.active {
       background-color: $smoke;
-      border: solid 1px $table-border-colour;
+      border: solid 1px $disabled-colour;
       border-bottom: solid 1px $smoke;
     }
   }
@@ -99,8 +99,8 @@
       position: relative;
       display: block;
       z-index: 0;
-      color: $table-border-colour;
-      background-color: $table-border-colour;
+      color: $disabled-colour;
+      background-color: $disabled-colour;
       padding: 0;
       margin: 0;
       margin-bottom: 1rem;

data/app/assets/stylesheets/renalware/partials/_toggling.scss

@@ -16,6 +16,7 @@
   }
 }
 
+// Toggle-all
 th.togglers .toggler {
   i:before {
     content: asset-data-url("renalware/icons/chevrons-down.svg");
@@ -37,7 +38,23 @@ th.togglers {
   width: 1rem;
 }
 
-// row-toggler-controller classes
+// Classes to be used when toggling open an initially hidden tr.
+// The expected structure
+// table.toggleable
+//   thead
+//      th.togglers
+//        a.toggler (link to toggle all rows)
+//      th ...
+//  (for each thing)
+//    tbody
+//      tr (visible)
+//        td.toggleable--toggler-container
+//          a.toggler (link to toggle thos tobody's last row)
+//        td ...
+//      tr (will be initially hidden as its the last tr)
+//        td
+//        td Content to display when toggled
+//
 .toggleable {
   .toggleable--open {
     td .toggler i:before {
@@ -57,5 +74,38 @@ th.togglers {
     &.toggleable--open tr:last-child {
       display: table-row;
     }
+
+    // Add this class to a toggleable tbody if there is nothing to toggle open to see.
+    // It prevents an empty row expanding down and taking up valuable space.
+    // An alternative could be to display 'No notes' or whatever, but that seems slightly odd.
+    &.toggleable--no-toggleable-content {
+      tr:last-child {
+        display: none;
+      }
+    }
+  }
+
+  &.toggleable--without-border-between-toggled-and-non-toggled-tr {
+    tbody.toggleable--open:not(.no-toggleable-content) {
+      td {
+        border-top: solid 1px $table-border-colour;
+      }
+
+      tr:first-child td {
+        border-bottom: none;
+      }
+
+      tr:last-child:not(.no-toggleable-content) td {
+        border-top: none;
+        padding-top: 0;
+      }
+    }
+  }
+
+  .toggleable--toggler-container {
+    padding: 0;
+    margin: 0;
+    text-align: center;
+    vertical-align: middle;
   }
 }

data/app/models/renalware/patients/ingestion/command_factory.rb

@@ -9,38 +9,29 @@ module Renalware
       # message type.
       #
       class CommandFactory
+        # rubocop:disable Metrics/CyclomaticComplexity
+        # Note that for now most of these mapped methods will only try and
+        # update the patient info and master patient index, and not actually
+        # try and create an admission/transfer etc
         def for(message)
           case message.action
-          when :add_person_information then make_add_patient(message)
+          when :add_person_information    then make_add_patient(message)
           when :update_person_information then make_update_patient(message)
-          # when :admit_patient then make_admit_patient(message)
-          # when :merge_patient then make_merge_patient(message)
-          # when :update_admission then make_update_admission(message)
-          # when :cancel_admission then make_cancel_admission(message)
-          # when :transfer_patient then make_transfer_patient(message)
-          # when :discharge_patient then make_discharge_patient(message)
-          # when :cancel_discharge then make_cancel_discharge(message)
+          when :admit_patient             then make_admit_patient(message)
+          when :update_admission          then make_update_admission(message)
+          when :cancel_admission          then make_cancel_admission(message)
+          when :transfer_patient          then make_transfer_patient(message)
+          when :discharge_patient         then make_discharge_patient(message)
+          when :cancel_discharge          then make_cancel_discharge(message)
+          # when :merge_patient then make_merge_patient(message) # complex so ignore for now.
           # when :add_consultant then make_add_consultant(message)
           else noop
           end
         end
+        # rubocop:enable Metrics/CyclomaticComplexity
 
         private
 
-        # def make_add_patient_with_finder(message)
-        #   CommandWithFinder.new(
-        #     make_add_patient(message),
-        #     message, finder: Finder::Patient.new
-        #   )
-        # end
-
-        # def make_add_patient_with_finder(message)
-        #   CommandWithFinder.new(
-        #     make_add_patient(message),
-        #     message, finder: Finder::Patient.new
-        #   )
-        # end
-
         def make_add_patient(message)
           Commands::AddOrUpdatePatient.new(message)
         end
@@ -53,40 +44,40 @@ module Renalware
           NullObject.instance
         end
 
-        # def make_merge_patient(message)
-        #   Commands::MergePatient.new(message,
-        #     major_patient_finder: make_patient_finder_with_add_if_missing,
-        #     minor_patient_finder: make_minor_patient_finder_with_add_if_missing)
-        # end
-
-        # def make_admit_patient(message)
-        #   Commands::AdmitPatient.new(message,
-        #     patient_finder: make_patient_finder_with_add_if_missing)
-        # end
+        def make_admit_patient(message)
+          Commands::AddOrUpdatePatient.new(message)
+          # Commands::AdmitPatient.new(message,
+          #   patient_finder: make_patient_finder_with_add_if_missing)
+        end
 
-        # def make_update_admission(message)
-        #   Commands::UpdateAdmission.new(message,
-        #     admission_finder: make_admission_finder_with_logging_if_missing)
-        # end
+        def make_update_admission(message)
+          Commands::AddOrUpdatePatient.new(message)
+          # Commands::UpdateAdmission.new(message,
+          #   admission_finder: make_admission_finder_with_logging_if_missing)
+        end
 
-        # def make_cancel_admission(message)
-        #   Commands::CancelAdmission.new(message,
-        #     admission_finder: make_admission_finder_with_logging_if_missing)
-        # end
+        def make_cancel_admission(message)
+          Commands::AddOrUpdatePatient.new(message)
+          # Commands::CancelAdmission.new(message,
+          #   admission_finder: make_admission_finder_with_logging_if_missing)
+        end
 
-        # def make_transfer_patient(message)
-        #   Commands::TransferPatient.new(message,
-        #     admission_finder: make_admission_finder_with_admit_if_missing)
-        # end
+        def make_transfer_patient(message)
+          Commands::AddOrUpdatePatient.new(message)
+          # Commands::TransferPatient.new(message,
+          #   admission_finder: make_admission_finder_with_admit_if_missing)
+        end
 
-        # def make_discharge_patient(message)
-        #   Commands::DischargePatient.new(message,
-        #     admission_finder: make_admission_finder_with_logging_if_missing)
-        # end
+        def make_discharge_patient(message)
+          Commands::AddOrUpdatePatient.new(message)
+          # Commands::DischargePatient.new(message,
+          #   admission_finder: make_admission_finder_with_logging_if_missing)
+        end
 
-        # def make_cancel_discharge(message)
-        #   Commands::CancelDischarge.new(message)
-        # end
+        def make_cancel_discharge(message)
+          Commands::AddOrUpdatePatient.new(message)
+          # Commands::CancelDischarge.new(message)
+        end
 
         # def make_add_consultant(message)
         #   Commands::AddConsultant.new(message)
@@ -133,6 +124,27 @@ module Renalware
         #     make_admit_patient(message).call
         #   }
         # end
+        #
+        #
+        # def make_add_patient_with_finder(message)
+        #   CommandWithFinder.new(
+        #     make_add_patient(message),
+        #     message, finder: Finder::Patient.new
+        #   )
+        # end
+
+        # def make_add_patient_with_finder(message)
+        #   CommandWithFinder.new(
+        #     make_add_patient(message),
+        #     message, finder: Finder::Patient.new
+        #   )
+        # end
+        #
+        # def make_merge_patient(message)
+        #   Commands::MergePatient.new(message,
+        #     major_patient_finder: make_patient_finder_with_add_if_missing,
+        #     minor_patient_finder: make_minor_patient_finder_with_add_if_missing)
+        # end
       end
     end
   end

data/app/models/renalware/patients/ingestion/message_mappers/patient.rb

@@ -48,23 +48,6 @@ module Renalware
             attrs.reject! { |_key, value| value.blank? }
             patient.attributes = attrs
 
-            # patient.given_name = patient_identification.given_name
-            # patient.family_name = patient_identification.family_name
-            # patient.suffix = patient_identification.suffix
-            # patient.title = patient_identification.title
-            # patient.attributes = {
-            #   local_patient_id: patient_identification.internal_id,
-            #   nhs_number: patient_identification.nhs_number,
-            #   given_name: patient_identification.given_name,
-            #   family_name: patient_identification.family_name,
-            #   suffix: patient_identification.suffix,
-            #   title: patient_identification.title,
-            #   born_on: Time.zone.parse(patient_identification.dob)&.to_date,
-            #   died_on: Time.zone.parse(patient_identification.death_date)&.to_date,
-            #   sex: patient_identification.sex,
-            #   practice: find_practice(message.practice_code) || patient.practice,
-            #   primary_care_physician: find_primary_care_physician(message.gp_code)
-            # }
             patient.build_current_address if patient.current_address.blank?
             patient.current_address.attributes = {
               street_1: address[0],

data/app/models/renalware/surveys/pos_s_summary_part.rb

@@ -5,18 +5,22 @@ require_dependency "renalware/surveys"
 module Renalware
   module Surveys
     class POSSSummaryPart < Renalware::SummaryPart
+      # Backed by a SQL view
       def rows
         @rows ||= POSSPivotedResponse.where(patient_id: patient.id)
       end
 
       def question_labels
-        survey
-          .questions
-          .order(:position)
-          .select(:code, :label)
-          .each_with_object({}) { |q, hash| hash[q.code] = q.label }
+        @question_labels ||= begin
+          survey
+            .questions
+            .order(:position)
+            .select(:code, :label)
+            .each_with_object({}) { |q, hash| hash[q.code] = q.label }
+        end
       end
 
+      # Return data for charting
       def data_for_question_code(_code)
         Renalware::Surveys::Response
           .where(patient_id: patient.id, question_id: 1)

data/app/models/renalware/ukrdc/incoming/import_survey.rb

@@ -9,14 +9,18 @@ module Renalware
       class ImportSurvey
         pattr_initialize [:patient, :survey_hash]
 
+        # Note that each question's answer may be a value like "1" or be an array where the second
+        # element is the user-entered question text e.g. ["1", "Paranoia"]
+        # This is used in POS-S so that a user can enter their own question text.
         def call
           responses.each do |question_code, answer|
             question = question_having_code(question_code)
-
+            answer = Array(answer)
             Surveys::Response.create!(
               patient_id: patient.id,
               question: question,
-              value: answer,
+              value: answer[0],
+              patient_question_text: answer[1],
               answered_on: answered_on
             )
           end

data/app/models/renalware/ukrdc/incoming/xml_document.rb

@@ -54,12 +54,22 @@ module Renalware
           end
         end
 
+        # Note that if a response has a QuestionText this can be some text the user entered
+        # (presumably so they can then assign it a response value) so we need to store the
+        # question text (e.g. Paranoia) as well as the response (eg 4).
+        # If we find a QuestionText we store an array containing it and the response in the hash
+        # otherwise we just add the response.
         def question_hash_from(survey_node)
           question_nodes = survey_node.xpath("Questions/Question")
           question_nodes.each_with_object({}) do |question_node, responses|
             code = question_node.xpath("string(QuestionType/Code)")
             response = question_node.xpath("string(Response)")
-            responses[code] = response
+            question_text = question_node.xpath("string(QuestionText)")
+            responses[code] = if question_text.present?
+                                [response, question_text]
+                              else
+                                response
+                              end
           end
         end
       end

data/app/presenters/renalware/hd/mdm_presenter.rb

@@ -33,6 +33,12 @@ module Renalware
         end
       end
 
+      def dry_weights
+        @dry_weights ||= begin
+          Clinical::DryWeight.for_patient(patient).ordered.includes(:assessor).limit(5)
+        end
+      end
+
       def preference_set
         @preference_set ||= PreferenceSet.for_patient(patient).first || NullObject.instance
       end

data/app/presenters/renalware/problems/summary_part.rb

@@ -6,7 +6,7 @@ module Renalware
   module Problems
     class SummaryPart < Renalware::SummaryPart
       def problems
-        @problems ||= patient.problems.ordered
+        @problems ||= patient.problems.with_notes
       end
 
       def cache_key

data/app/views/renalware/hd/mdm/_top.html.slim

@@ -1,13 +1,22 @@
-.columns.small-12.medium-6.large-6
+.columns.small-12.medium-6
   = render "renalware/hd/current_profile/summary", profile: mdm.hd_profile, patient: mdm.patient
+
+.columns.medium-6
+  = render "renalware/clinical/dry_weights/list",
+            dry_weights: mdm.dry_weights,
+            patient: mdm.patient,
+            limit: true
+
 .columns.small-12.medium-6.large-3
   - if mdm.access.present?
     = render "renalware/hd/accesses/summary", access: mdm.access, patient: mdm.patient
-.columns.medium-6.large-6
+
+.columns.medium-6
   = render "renalware/virology/profiles/summary",
            patient: mdm.patient,
            positive_results_only: true
-.columns.medium-6.large-6
+
+.columns.medium-6
   = render "summary", mdm: mdm
 = render "worryboard", mdm: mdm
 

data/app/views/renalware/hd/sessions/_row.html.slim

@@ -1,6 +1,6 @@
 tbody.hd-session-row(class=[session.state, stripe_class])
   tr
-    td.noprint(rowspan=2)= row_toggler
+    td.toggleable--toggler-container.noprint(rowspan=2)= row_toggler
     td.noprint(rowspan=2)= session.edit_or_view_url
     td.col-width-date(rowspan=2)= session.performed_on
     td= session.hospital_unit_unit_code

data/app/views/renalware/hd/sessions/dna/_row.html.slim

@@ -1,6 +1,6 @@
 tbody(class=[session.state, stripe_class])
   tr
-    td.noprint= row_toggler
+    td.toggleable--toggler-container.noprint= row_toggler
     td.noprint= session.edit_or_view_url
     td= session.performed_on
     td= session.hospital_unit_unit_code

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

@@ -4,7 +4,7 @@ table#current_problems.manual-stripes.auto-layout
       th.options.col-width-small
       th Description
       th.col-width-date Updated on
-      td.nowrap Updated by
+      td.col-width-medium.nowrap Updated by
       th.col-width-tiny Reorder
   = content_tag(:tbody, class: "sortables", data: { rel: sort_patient_problems_path(@patient) }) do
     - problems.each do |problem|

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

@@ -20,8 +20,24 @@
         = link_to patient_problems_path(summary_part.patient), class: "button" do
           | Add
 
-      ul.no-bullet
-        - summary_part.problems.each do |problem|
-          li
-            = problem.full_description
-            = " - #{l(problem.created_at.to_date)}"
+      table#problems.toggleable.toggleable--without-border-between-toggled-and-non-toggled-tr
+        thead.toggleable--open
+          th.togglers.noprint =rows_toggler
+          th Description
+          th.col-width-date Date
+
+        - summary_part.problems.each_with_index do |problem|
+          tbody.toggleable--open(class=("toggleable--no-toggleable-content" if problem.notes.none?))
+            tr
+              td.toggleable--toggler-container.noprint = row_toggler
+              td
+                span= problem.full_description
+              td= problem.created_at.to_date
+            tr
+              td
+              td
+                - if problem.notes.any?
+                  ol
+                    - problem.notes.each do |note|
+                      li= note.description
+              td

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

@@ -1,3 +1,6 @@
+/
+/ TODO: this could do with refactoring to move the formatting code into a helper or presenter.
+/
 .summary-part--pos_s
   article
     header
@@ -10,22 +13,55 @@
   / br
 
   - return if pos_s_summary_part.rows.blank?
-
+  br
+  br
+  br
+  br
   .xsss
-    table
+    table.table-header-rotated.toggleable
       thead
         tr
-          th.col-width-date Date
+          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= label
-      tbody
-        - pos_s_summary_part.rows.each do |row|
+            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)
-              td(class="pos-s--#{value}") = value
+              - 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
+              - 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

data/db/migrate/20191205185835_update_survey_views.rb

@@ -0,0 +1,12 @@
+class UpdateSurveyViews < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      update_view(
+        :survey_pos_s_pivoted_responses,
+        version: 2,
+        revert_to_version: 1,
+        materialized: false
+      )
+    end
+  end
+end

data/db/migrate/20191209160151_add_patient_question_text_to_survey_responses.rb

@@ -0,0 +1,7 @@
+class AddPatientQuestionTextToSurveyResponses < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      add_column :survey_responses, :patient_question_text, :text
+    end
+  end
+end

data/db/migrate/20191209163151_update_survey_views_to_allow_free_text.rb

@@ -0,0 +1,12 @@
+class UpdateSurveyViewsToAllowFreeText < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      update_view(
+        :survey_pos_s_pivoted_responses,
+        version: 3,
+        revert_to_version: 2,
+        materialized: false
+      )
+    end
+  end
+end

data/db/views/survey_pos_s_pivoted_responses_v02.sql

@@ -0,0 +1,37 @@
+/*
+This is a pivoted crosstab view taking POS-S renal questionnaire responses from
+patients and returning them with the question codes as the column headings.
+See also the eq5d_5l for comments about alternative use of crosstab function.
+*/
+SELECT  r.answered_on,
+        r.patient_id,
+        sum(r.value::integer) as "total_score",
+        MAX(CASE WHEN q.code = 'YSQ1' THEN r.value ELSE NULL END) AS "YSQ1",
+        MAX(CASE WHEN q.code = 'YSQ2' THEN r.value ELSE NULL END) AS "YSQ2",
+        MAX(CASE WHEN q.code = 'YSQ3' THEN r.value ELSE NULL END) AS "YSQ3",
+        MAX(CASE WHEN q.code = 'YSQ4' THEN r.value ELSE NULL END) AS "YSQ4",
+        MAX(CASE WHEN q.code = 'YSQ5' THEN r.value ELSE NULL END) AS "YSQ5",
+        MAX(CASE WHEN q.code = 'YSQ6' THEN r.value ELSE NULL END) AS "YSQ6",
+        MAX(CASE WHEN q.code = 'YSQ7' THEN r.value ELSE NULL END) AS "YSQ7",
+        MAX(CASE WHEN q.code = 'YSQ8' THEN r.value ELSE NULL END) AS "YSQ8",
+        MAX(CASE WHEN q.code = 'YSQ9' THEN r.value ELSE NULL END) AS "YSQ9",
+        MAX(CASE WHEN q.code = 'YSQ10' THEN r.value ELSE NULL END) AS "YSQ10",
+        MAX(CASE WHEN q.code = 'YSQ11' THEN r.value ELSE NULL END) AS "YSQ11",
+        MAX(CASE WHEN q.code = 'YSQ12' THEN r.value ELSE NULL END) AS "YSQ12",
+        MAX(CASE WHEN q.code = 'YSQ13' THEN r.value ELSE NULL END) AS "YSQ13",
+        MAX(CASE WHEN q.code = 'YSQ14' THEN r.value ELSE NULL END) AS "YSQ14",
+        MAX(CASE WHEN q.code = 'YSQ15' THEN r.value ELSE NULL END) AS "YSQ15",
+        MAX(CASE WHEN q.code = 'YSQ16' THEN r.value ELSE NULL END) AS "YSQ16",
+        MAX(CASE WHEN q.code = 'YSQ17' THEN r.value ELSE NULL END) AS "YSQ17",
+        MAX(CASE WHEN q.code = 'YSQ18' THEN r.value ELSE NULL END) AS "YSQ18",
+        MAX(CASE WHEN q.code = 'YSQ19' THEN r.value ELSE NULL END) AS "YSQ19",
+        MAX(CASE WHEN q.code = 'YSQ20' THEN r.value ELSE NULL END) AS "YSQ20",
+        MAX(CASE WHEN q.code = 'YSQ21' THEN r.value ELSE NULL END) AS "YSQ21",
+        MAX(CASE WHEN q.code = 'YSQ22' THEN r.value ELSE NULL END) AS "YSQ22"
+
+    FROM survey_responses r
+    inner JOIN survey_questions q ON q.id = r.question_id
+    inner JOIN survey_surveys s ON s.id = q.survey_id
+WHERE s.code = 'prom'
+GROUP BY r.answered_on, r.patient_id
+ORDER BY r.answered_on DESC;

data/db/views/survey_pos_s_pivoted_responses_v03.sql

@@ -0,0 +1,39 @@
+/*
+This is a pivoted crosstab view taking POS-S renal questionnaire responses from
+patients and returning them with the question codes as the column headings.
+See also the eq5d_5l for comments about alternative use of crosstab function.
+*/
+SELECT  r.answered_on,
+        r.patient_id,
+        sum(convert_to_float(r.value))::integer as "total_score",
+        MAX(CASE WHEN q.code = 'YSQ1' THEN r.value ELSE NULL END) AS "YSQ1",
+        MAX(CASE WHEN q.code = 'YSQ2' THEN r.value ELSE NULL END) AS "YSQ2",
+        MAX(CASE WHEN q.code = 'YSQ3' THEN r.value ELSE NULL END) AS "YSQ3",
+        MAX(CASE WHEN q.code = 'YSQ4' THEN r.value ELSE NULL END) AS "YSQ4",
+        MAX(CASE WHEN q.code = 'YSQ5' THEN r.value ELSE NULL END) AS "YSQ5",
+        MAX(CASE WHEN q.code = 'YSQ6' THEN r.value ELSE NULL END) AS "YSQ6",
+        MAX(CASE WHEN q.code = 'YSQ7' THEN r.value ELSE NULL END) AS "YSQ7",
+        MAX(CASE WHEN q.code = 'YSQ8' THEN r.value ELSE NULL END) AS "YSQ8",
+        MAX(CASE WHEN q.code = 'YSQ9' THEN r.value ELSE NULL END) AS "YSQ9",
+        MAX(CASE WHEN q.code = 'YSQ10' THEN r.value ELSE NULL END) AS "YSQ10",
+        MAX(CASE WHEN q.code = 'YSQ11' THEN r.value ELSE NULL END) AS "YSQ11",
+        MAX(CASE WHEN q.code = 'YSQ12' THEN r.value ELSE NULL END) AS "YSQ12",
+        MAX(CASE WHEN q.code = 'YSQ13' THEN r.value ELSE NULL END) AS "YSQ13",
+        MAX(CASE WHEN q.code = 'YSQ14' THEN r.value ELSE NULL END) AS "YSQ14",
+        MAX(CASE WHEN q.code = 'YSQ15' THEN r.value ELSE NULL END) AS "YSQ15",
+        MAX(CASE WHEN q.code = 'YSQ16' THEN r.value ELSE NULL END) AS "YSQ16",
+        MAX(CASE WHEN q.code = 'YSQ17' THEN r.value ELSE NULL END) AS "YSQ17",
+        MAX(CASE WHEN q.code = 'YSQ18' THEN r.value ELSE NULL END) AS "YSQ18",
+        MAX(CASE WHEN q.code = 'YSQ19' THEN r.value ELSE NULL END) AS "YSQ19",
+        MAX(CASE WHEN q.code = 'YSQ20' THEN r.value ELSE NULL END) AS "YSQ20",
+        MAX(CASE WHEN q.code = 'YSQ21' THEN r.value ELSE NULL END) AS "YSQ21",
+        MAX(CASE WHEN q.code = 'YSQ22' THEN r.value ELSE NULL END) AS "YSQ22",
+        MAX(CASE WHEN q.code = 'YSQ18' THEN r.patient_question_text ELSE NULL END) AS "YSQ18_patient_question_text",
+        MAX(CASE WHEN q.code = 'YSQ19' THEN r.patient_question_text ELSE NULL END) AS "YSQ19_patient_question_text",
+        MAX(CASE WHEN q.code = 'YSQ20' THEN r.patient_question_text ELSE NULL END) AS "YSQ20_patient_question_text"
+    FROM survey_responses r
+    inner JOIN survey_questions q ON q.id = r.question_id
+    inner JOIN survey_surveys s ON s.id = q.survey_id
+WHERE s.code = 'prom'
+GROUP BY r.answered_on, r.patient_id
+ORDER BY r.answered_on DESC;

data/lib/renalware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renalware
-  VERSION = "2.0.126"
+  VERSION = "2.0.127"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.126
+  version: 2.0.127
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-04 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview-component
@@ -1084,6 +1084,7 @@ files:
 - app/assets/stylesheets/renalware/modules/_problems.scss
 - app/assets/stylesheets/renalware/modules/_renal.scss
 - app/assets/stylesheets/renalware/modules/_reporting.scss
+- app/assets/stylesheets/renalware/modules/_rotated_tables_headings.scss
 - app/assets/stylesheets/renalware/modules/_snippets.scss
 - app/assets/stylesheets/renalware/modules/_surveys.scss
 - app/assets/stylesheets/renalware/modules/_system.scss
@@ -3719,6 +3720,9 @@ files:
 - db/migrate/20191105095304_update_views_to_exclude_deleted_sessions.rb
 - db/migrate/20191108105923_add_named_consultant_to_patients.rb
 - db/migrate/20191203112310_add_pg_stat_statements_extension.rb
+- db/migrate/20191205185835_update_survey_views.rb
+- db/migrate/20191209160151_add_patient_question_text_to_survey_responses.rb
+- db/migrate/20191209163151_update_survey_views_to_allow_free_text.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb
@@ -3851,6 +3855,8 @@ files:
 - db/views/reporting_pd_audit_v01.sql
 - db/views/survey_eq5d_pivoted_responses_v01.sql
 - db/views/survey_pos_s_pivoted_responses_v01.sql
+- db/views/survey_pos_s_pivoted_responses_v02.sql
+- db/views/survey_pos_s_pivoted_responses_v03.sql
 - lib/age_calculator.rb
 - lib/array_stringifier.rb
 - lib/breadcrumb.rb