renalware-core 2.0.167 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa22cd0095f51d9bc225561fa2560b535a6e2c1af7afc9b6c831577b62f8fff9
-  data.tar.gz: 32cff2bcf9bd90f1f08f79716c8541601e8ef7ad09f2c35f4daefa14df89a711
+  metadata.gz: 3de51d60dd5f233b9ff39d828b7de6a0aac083a2a95c2025e9701523498324f1
+  data.tar.gz: d81cc6a1d591a6c6cfca77ba8f016391c79e4ed66d63903f9460b2958697467f
 SHA512:
-  metadata.gz: a40adc5547969171c58e7216f2e26ddad7b841a23c2a3e9710353639142b307007fbc6c98886e9c140a656e97a26fcbf39c9ef9091220b32ff1edfc92afd67c9
-  data.tar.gz: b05d494e9d5565979f7dbd9e755202cb227c1e895e065f3aa81e2de68070c36d24f79fb7e6e78b41acd84db767c2ad7069f34477c797bad968d10c8bc9348ef6
+  metadata.gz: 82ed3123ef1e13f417cc643a086bd4453ba29864176d5846afebd9410750f6476b4ca03903d741acfec7aea08c9129fc14a8067ce39843b7cc86960b65bc720b
+  data.tar.gz: 39affcac1ce90f4c1bef21b7cb7edd6a29c5e40b0d748e58fe2857019e0c4fc5e521dcd253790bb92f35f185f67b7e45c8185d6632bfb40e6fe75f75ff7f123b

data/README.md

@@ -249,5 +249,5 @@ docker-compose run web rake app:db:create
 #### Browser testing
 
 <a href="https://www.browserstack.com">
-<img alt="Browserstack logo" src="doc/Browserstack-logo.svg" width="188" height="43">
+<img alt="Browserstack logo" src="doc/Browserstack-logo.svg" width="188" height="43" >
 </a>

data/app/assets/javascripts/renalware/rollup_compiled.css

@@ -16426,7 +16426,6 @@ video {
 }
 
 .sticky {
-  position: -webkit-sticky;
   position: sticky;
 }
 
@@ -37576,7 +37575,6 @@ video {
   }
 
   .sm\:sticky {
-    position: -webkit-sticky;
     position: sticky;
   }
 
@@ -58661,7 +58659,6 @@ video {
   }
 
   .md\:sticky {
-    position: -webkit-sticky;
     position: sticky;
   }
 
@@ -79746,7 +79743,6 @@ video {
   }
 
   .lg\:sticky {
-    position: -webkit-sticky;
     position: sticky;
   }
 
@@ -100831,7 +100827,6 @@ video {
   }
 
   .xl\:sticky {
-    position: -webkit-sticky;
     position: sticky;
   }
 

data/app/assets/javascripts/renalware/rollup_compiled.js

@@ -7903,6 +7903,36 @@ var _default$b = function(_Controller) {
 
 _defineProperty(_default$b, "targets", [ "chart" ]);
 
+var _default$c = function(_Controller) {
+  _inherits(_default, _Controller);
+  var _super = _createSuper(_default);
+  function _default() {
+    _classCallCheck(this, _default);
+    return _super.apply(this, arguments);
+  }
+  _createClass(_default, [ {
+    key: "connect",
+    value: function connect() {}
+  }, {
+    key: "open",
+    value: function open(event) {
+      var _this = this;
+      var index = this.linkTargets.indexOf(event.currentTarget);
+      this.sectionTargets.forEach(function(elem, idx) {
+        elem.classList.remove(_this.openClass);
+        if (idx == index) {
+          elem.classList.add(_this.openClass);
+        }
+      });
+    }
+  } ]);
+  return _default;
+}(Controller);
+
+_defineProperty(_default$c, "targets", [ "section", "link" ]);
+
+_defineProperty(_default$c, "classes", [ "open" ]);
+
 var application = Application.start();
 
 application.register("toggle", _default);
@@ -7929,4 +7959,6 @@ application.register("pd-pet-chart", _default$a);
 
 application.register("pathology-sparklines", _default$b);
 
+application.register("collapsible", _default$c);
+
 window.Chartkick.use(window.Highcharts);

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

@@ -41,10 +41,8 @@ table.contacts tbody td{
     }
 
     .admin-notes {
-      display: inline-block;
-      background-color: darken($table-even-row-colour, 10);
-      padding: .2rem;
-      margin: .5rem 0 0 0;
+      background-color: table-even-row-colour;
+      padding: 2px 0;
       font-size: .9rem;
     }
   }

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

@@ -101,7 +101,8 @@ footer {
   overflow: auto;
 }
 
-.inline {
+.inline,
+.fn-form .inline {
   display: inline;
 }
 
@@ -180,3 +181,6 @@ section.display {
     padding: 1.4rem 0 0.4rem;
   }
 }
+
+// .collapsible { display: none }
+// .collapsible.open { display: block }

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

@@ -7,6 +7,7 @@ $btn-hover-color: darken($dark-grey, 10%);
   width: 210px;
 }
 
+.fn-form.patient-search-form,
 .patient-search-form {
 
   button.button.tiny.postfix {

data/app/components/renalware/events/event_list_component.html.slim

@@ -4,7 +4,7 @@ article.events
     .supplemental
       span= "#{event_count} of #{total_event_count}"
       span.noprint
-        = link_to "View All",
+        = link_to t("btn.view_all"),
                   renalware.patient_events_path(patient),
                   class: "button secondary"
 

data/app/components/renalware/letters/letters_in_progress_component.en.yml

@@ -0,0 +1,7 @@
+---
+en:
+  renalware:
+    letters:
+      letters_in_progress_component:
+        none: No letters in progress
+        title: Letters in progress

data/app/components/renalware/letters/letters_in_progress_component.html.slim

@@ -1,8 +1,8 @@
 article.letters
   header
-    h2 Letters in Progress
+    h2= t(".title")
   - if letters_in_progress.any?
     #letters-in-progress
       = render "renalware/dashboard/letters/table", letters: letters_in_progress
   - else
-    p.empty-section No letters in progress
+    p.empty-section=t(".none")

data/app/components/renalware/letters/letters_in_progress_component.pt.yml

@@ -0,0 +1,7 @@
+---
+pt:
+  renalware:
+    letters:
+      letters_in_progress_component:
+        none: No cartas em andamento
+        title: Cartas em andamento

data/app/components/renalware/letters/unread_electronic_ccs_component.en.yml

@@ -0,0 +1,7 @@
+---
+en:
+  renalware:
+    letters:
+      unread_electronic_ccs_component:
+        none: You have no electronic CCs
+        title: Electronic CCs

data/app/components/renalware/letters/unread_electronic_ccs_component.html.slim

@@ -1,7 +1,7 @@
 article.electonic_ccs
   header
-    h2 Electronic CCs
+    h2= t(".title")
   - if unread_electronic_ccs.any?
     = render "renalware/letters/electronic_receipts/table", receipts: unread_electronic_ccs
   - else
-    p.empty-section You have no electronic CCs.
+    p.empty-section= t(".none")

data/app/components/renalware/letters/unread_electronic_ccs_component.pt.yml

@@ -0,0 +1,7 @@
+---
+pt:
+  renalware:
+    letters:
+      unread_electronic_ccs_component:
+        none: Não tem electrónico CCs
+        title: Electrónico CCs

data/app/components/renalware/messaging/unread_messages_component.en.yml

@@ -0,0 +1,7 @@
+---
+en:
+  renalware:
+    messaging:
+      unread_messages_component:
+        none: You have no messages
+        title: Messages

data/app/components/renalware/messaging/unread_messages_component.html.slim

@@ -1,6 +1,6 @@
 article.messages
   header
-    h2 Messages
+    h2= t(".title")
     ul
       li= render "renalware/messaging/shared/key"
   - if unread_message_receipts.any?
@@ -8,4 +8,4 @@ article.messages
       = render "renalware/messaging/internal/receipts/table",
                 receipts: unread_message_receipts
   - else
-    p.empty-section You have no messages.
+    p.empty-section= t(".none")

data/app/components/renalware/messaging/unread_messages_component.pt.yml

@@ -0,0 +1,7 @@
+---
+pt:
+  renalware:
+    messaging:
+      unread_messages_component:
+        none: Não tem mensagens
+        title: Mensagens

data/app/components/renalware/patients/bookmarks_component.en.yml

@@ -0,0 +1,7 @@
+---
+en:
+  renalware:
+    patients:
+      bookmarks_component:
+        none: There are no patients bookmarked
+        title: Bookmarked Patients

data/app/components/renalware/patients/bookmarks_component.html.slim

@@ -1,11 +1,11 @@
 article.bookmarks
   header
-    h2.title= "Bookmarked Patients"
+    h2.title= t(".title")
     ul
-      li= link_to "View All", renalware.bookmarks_path, class: "button"
+      li= link_to t("btn.view_all"), renalware.bookmarks_path, class: "button"
 
   - if bookmarks.any?
     #bookmarks
       = render "renalware/dashboard/bookmarks/table", bookmarks: bookmarks
   - else
-    p.empty-section= t(".bookmarks.none")
+    p.empty-section= t(".none")

data/app/components/renalware/patients/bookmarks_component.pt.yml

@@ -0,0 +1,7 @@
+---
+pt:
+  renalware:
+    patients:
+      bookmarks_component:
+        none: None
+        title: Pacientes marcados

data/app/components/renalware/patients/messages_component.en.yml

@@ -0,0 +1,5 @@
+en:
+  renalware:
+    patients:
+      messages_component:
+        title: Messages

data/app/components/renalware/patients/messages_component.html.slim

@@ -2,9 +2,9 @@
   article.messages
     header
       h2
-        = link_to title, renalware.patient_messaging_internal_messages_path(patient)
+        = link_to formatted_title(t(".title")), renalware.patient_messaging_internal_messages_path(patient)
       ul
-        li= link_to "View All", renalware.patient_messaging_internal_messages_path(patient), class: "button"
+        li= link_to t("btn.view_all"), renalware.patient_messaging_internal_messages_path(patient), class: "button"
 
     - if messages.any?
       table.toggleable.easy-read data-controller="toggle"
@@ -12,9 +12,9 @@
           tr
             th.togglers.noprint= rows_toggler
             th.col-width-tiny
-            th.col-width-date-time Date
-            th.col-width-medium Author
-            th.col-width-medium Subject
+            th.col-width-date-time= t(".thead.date_")
+            th.col-width-medium= t(".thead.author")
+            th.col-width-medium= t(".thead.subject")
             th
               ' Body
               i(style="font-weight: normal") - toggle to see complete message

data/app/components/renalware/patients/messages_component.pt.yml

@@ -0,0 +1,5 @@
+pt:
+  renalware:
+    patients:
+      messages_component:
+        title: Mensagens

data/app/components/renalware/patients/messages_component.rb

@@ -6,7 +6,6 @@ module Renalware
       include ToggleHelper
       include Pagy::Backend
       include Pagy::Frontend
-      TITLE = "Messages"
 
       rattr_initialize [:patient!, :current_user!]
 
@@ -20,11 +19,11 @@ module Renalware
         @messages
       end
 
-      def title
+      def formatted_title(title)
         if pagination.items < pagination.count
-          "#{TITLE} (#{pagination.items} of #{pagination.count})"
+          "#{title} (#{pagination.items} of #{pagination.count})"
         else
-          "#{TITLE} (#{pagination.count})"
+          "#{title} (#{pagination.count})"
         end
       end
 

data/app/components/renalware/pd/adequacy_results_component.html.slim

@@ -1,7 +1,7 @@
 - if results.any?
   = render(Renalware::ArticleComponent.new(title: title)) do |article|
     - article.with(:actions) do
-      = link_to "Add", renalware.new_patient_pd_adequacy_result_path(patient), class: :button
-      = link_to "Show all", renalware.patient_pd_adequacy_results_path(patient), remote: true, class: "button secondary"
+      = link_to t("btn.add"), renalware.new_patient_pd_adequacy_result_path(patient), class: :button
+      = link_to t("btn.show_all"), renalware.patient_pd_adequacy_results_path(patient), remote: true, class: "button secondary"
     #adequacy-results-table
       = render "renalware/pd/adequacy_results/table", results: results, current_user: current_user

data/app/components/renalware/pd/pet_results_component.html.slim

@@ -17,8 +17,8 @@
             svg.h-6.w-6.stroke-current.text-black viewBox="0 0 24 26"  stroke-width="3" stroke-linecap="round" stroke-linejoin="round"
               path d="M12 20V10M18 20V4M6 20v-4"
 
-        = link_to "Show all", renalware.patient_pd_pet_results_path(patient), remote: true, class: "float-none button flex-initial secondary"
-        = link_to "Add", renalware.new_patient_pd_pet_result_path(patient), class: "float-none button flex-initial"
+        = link_to t("btn.show_all"), renalware.patient_pd_pet_results_path(patient), remote: true, class: "float-none button flex-initial secondary"
+        = link_to t("btn.add"), renalware.new_patient_pd_pet_result_path(patient), class: "float-none button flex-initial"
 
     div#pet-results-table data-tabs-target="panel"
 

data/app/components/renalware/system/admin_menu_component.html.slim

@@ -1,30 +1,42 @@
+/ To enable collapsible admin menu sections, remove -DISABLED below and uncomment
+/ the collapsible classes in _layout.scss
 
-ul.side-nav.side-nav--admin
+ul.side-nav.side-nav--admin(data-controller="collapsible-DISABLED" data-collapsible-open-class="open")
   li.heading Renalware Admin
+
   = admin_menu_item "Dashboard", renalware.admin_dashboard_path, %r{admin/dashboard}
   = admin_menu_item "Users", renalware.admin_users_path, %r{renalware/admin/users}
-  = admin_menu_item "Request Form Print History", renalware.pathology_requests_requests_path, %r{pathology/requests/requests}
-  = admin_menu_item "Pathology Request Config", renalware.pathology_requests_rules_path, %r{pathology/requests/rules}
-  = admin_menu_item "HD Transmission Logs", renalware.hd_transmission_logs_path, %r{hd/transmission_logs}
-
-  - unless Rails.env.production?
-    = super_admin_menu_item "Email Templates", renalware.system_email_templates_path, %r{system/email_templates}
   = super_admin_menu_item "Event Types", renalware.events_types_path, %r{events/types}
   = super_admin_menu_item "Drugs", renalware.drugs_drugs_path, %r{drugs/drugs}
   = super_admin_menu_item "Modalities", renalware.modalities_descriptions_path, %r{modalities/descriptions}
-  = super_admin_menu_item "PD Bags", renalware.pd_bag_types_path, %r{pd/bag_types}
+  li= link_to "PD", "#", data: { action: "collapsible#open", collapsible_target: "link" }
+  ul.collapsible(data-collapsible-target="section")
+    = super_admin_menu_item "Bags", renalware.pd_bag_types_path, %r{pd/bag_types}
   = super_admin_menu_item "Primary Care Physicians", renalware.patients_primary_care_physicians_path, %r{patients/primary_care_physicians}
   = super_admin_menu_item "Cache", renalware.admin_cache_path, %r{admin/cache}
   /li= link_to "File Imports", renalware.admin_feeds_files_path
   = super_admin_menu_item "User Feedback", renalware.system_user_feedback_index_path, %r{system/user_feedback}
   = super_admin_menu_item "System Messages", renalware.system_messages_path, %r{system/messages}
-  = super_admin_menu_item "HD Dialysates", renalware.hd_dialysates_path, %r{hd/dialysates}
-  = super_admin_menu_item "HD Dialysers", renalware.hd_dialysers_path, %r{hd/dialysers}
-  = super_admin_menu_item "HD Cannulation Types", renalware.hd_cannulation_types_path, %r{hd/cannulation_types}
+
+  li= link_to "HD", "#", data: { action: "collapsible#open", collapsible_target: "link" }
+  ul.collapsible(data-collapsible-target="section")
+    = admin_menu_item "Transmission Logs", renalware.hd_transmission_logs_path, %r{hd/transmission_logs}
+    = super_admin_menu_item "Dialysates", renalware.hd_dialysates_path, %r{hd/dialysates}
+    = super_admin_menu_item "Dialysers", renalware.hd_dialysers_path, %r{hd/dialysers}
+    = super_admin_menu_item "Cannulation Types", renalware.hd_cannulation_types_path, %r{hd/cannulation_types}
+
   = super_admin_menu_item "Print batches", renalware.letters_batches_path, %r{letters/batches}
-  = super_admin_menu_item "OBX", renalware.pathology_observation_descriptions_path, %r{admin/pathology_observation_descriptions}
-  = super_admin_menu_item "Pathology Code Groups", renalware.pathology_code_groups_path, %r{pathology/code_groups}
+  li= link_to "Pathology", "#", data: { action: "collapsible#open", collapsible_target: "link" }
+  ul.collapsible(data-collapsible-target="section")
+    = super_admin_menu_item "OBX", renalware.pathology_observation_descriptions_path, %r{admin/pathology_observation_descriptions}
+    = super_admin_menu_item " Code Groups", renalware.pathology_code_groups_path, %r{pathology/code_groups}
+    = developer_menu_item "HL7 Test", renalware.new_feeds_hl7_test_message_path, %r{admin/123}
+    = admin_menu_item "Request Form Print History", renalware.pathology_requests_requests_path, %r{pathology/requests/requests}
+    = admin_menu_item "Request Config", renalware.pathology_requests_rules_path, %r{pathology/requests/rules}
+
   = super_admin_menu_item "Virology Vaccination Types", renalware.virology_vaccination_types_path, %r{virology/vaccination_types}
   = admin_menu_item "Mailshots", renalware.letters_mailshots_path, %r{letters/mailshots}
   = super_admin_menu_item "Playground", renalware.admin_playground_path, %r{admin/playground}
-  = developer_menu_item "HL7 Test", renalware.new_feeds_hl7_test_message_path, %r{admin/123}
+
+  - unless Rails.env.production?
+    = super_admin_menu_item "Email Templates", renalware.system_email_templates_path, %r{system/email_templates}

data/app/components/renalware/system/users_awaiting_approval_component.en.yml

@@ -0,0 +1,7 @@
+---
+en:
+  renalware:
+    system:
+      users_awaiting_approval_component:
+        title: User Admin
+        waiting_for_approval: "%{count} users awaiting approval"

data/app/components/renalware/system/users_awaiting_approval_component.html.slim

@@ -2,5 +2,5 @@
   .columns.small-12.medium-6.large-4
     article.admin--users
       header
-        h2 User Admin
-      = link_to users_needing_approval_title, renalware.admin_users_path(q: { unapproved: true })
+        h2= t(".title")
+      = link_to t(".waiting_for_approval", count: users_needing_approval_count), renalware.admin_users_path(q: { unapproved: true })