renalware-core 2.0.142 → 2.0.143

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97fa40a78473a91cbd6af1cd8ac758f4bc28f1766da786297478cca142196ca2
-  data.tar.gz: 79a9c514757ce61ec8a36879fd9c19e46d1617c84b97f63780c9bf56ecdd1a25
+  metadata.gz: 4cb7d60384fbf68383c1160af8d367f348a292dac568ec324d2149fa5131d288
+  data.tar.gz: 9c91c199d79f644bcb93de90558bb7a3b7f176119c6167beb2a3c51927bf03bc
 SHA512:
-  metadata.gz: ba280c4668d9dadde37256b3a41847c287e4a96a337d841d908cc1b750b88014bf6e44b2f7a0dd75074d375a28fb8a51c0ad4b6fb00799210e107594d16665ed
-  data.tar.gz: 905203a234284ff12bf37ecbbd290e6b386569f58dd65012afb692a48ba6cd3b20f03baeed21a08829269c141ed7fb6e085bca676a00ed6536807b59061ab953
+  metadata.gz: d26f5db9d00643f130bb63f9134ecaa15b13c300a1723aaaa2a272d4144917bcdec886f0db2d9072413af64cf70996fdc11f52e600d9fae7a4a3dae355a396d5
+  data.tar.gz: dda49e2a4f3ea966327e8922263856ff918924a28ebed6b3b5c8326d75172d803e70bd7d373335217bfe6fa2b01cd856ba49911a725b72dca2f9f0432d65394f

data/app/assets/javascripts/renalware/components/dialogs.js.erb

@@ -18,7 +18,7 @@ $(document).on('opened.fndtn.reveal', '[data-reveal]', function () {
   $('form[data-client-side-validations]').enableClientSideValidations();
   $('.searchable_select', modal).select2();
   // If a modal is launched again, ensure the submit button is re-enabled.
-  $.rails.enableFormElement($('input[data-disable-with]'));
+  Rails.enableElement($('input[data-disable-with]')[0]);
   // Refresh layout of foundation widgets
   $(document).foundation('reflow');
 
@@ -29,5 +29,5 @@ $(document).on('opened.fndtn.reveal', '[data-reveal]', function () {
 
 // If there was an error submitting a modal form, be sure to re-enable the submit button
 $(document).on('ajaxError', function(event, xhr, status, error) {
-  $.rails.enableFormElement($('input[data-disable-with]'));
+  Rails.enableElement($('input[data-disable-with]'))[0];
 });

data/app/assets/javascripts/renalware/core.js.erb

@@ -13,13 +13,12 @@
 // Not that jquery3 is not currently compatible for foundation 5
 //= require jquery2
 //= require jquery-readyselector
-//= require jquery_ujs
+//= require rails-ujs
 //= require jquery-ui/core
 //= require jquery-ui/widgets/sortable
 //= require jquery-ui/effects/effect-highlight
 //= require dataTables/jquery.dataTables
 //= require dataTables/jquery.dataTables.foundation
-//= require trix
 //= require foundation/foundation
 //= require foundation/foundation.accordion
 //= require foundation/foundation.alert
@@ -43,6 +42,7 @@
 //= require rails.validations.simple_form
 //= require print-js/dist/print
 //= require moment/moment
+//= require trix/dist/trix
 //= require_directory ./components
 
 // This next file is compiled by rollup using files in app/javascripts.

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

@@ -3782,39 +3782,9 @@ function _possibleConstructorReturn(self, call) {
   return _assertThisInitialized(self);
 }
 
-var _default = function(_Controller) {
-  _inherits(_default, _Controller);
-  function _default() {
-    _classCallCheck(this, _default);
-    return _possibleConstructorReturn(this, _getPrototypeOf(_default).apply(this, arguments));
-  }
-  _createClass(_default, [ {
-    key: "connect",
-    value: function connect() {
-      this.element.textContent = "TestController connected.";
-    }
-  } ]);
-  return _default;
-}(Controller);
-
-var _default$1 = function(_Controller) {
-  _inherits(_default, _Controller);
-  function _default() {
-    _classCallCheck(this, _default);
-    return _possibleConstructorReturn(this, _getPrototypeOf(_default).apply(this, arguments));
-  }
-  _createClass(_default, [ {
-    key: "connect",
-    value: function connect() {
-      this.element.textContent = "AnotherTestController connected";
-    }
-  } ]);
-  return _default;
-}(Controller);
-
 var $ = window.$;
 
-var _default$2 = function(_Controller) {
+var _default = function(_Controller) {
   _inherits(_default, _Controller);
   function _default() {
     _classCallCheck(this, _default);
@@ -3848,7 +3818,7 @@ var _default$2 = function(_Controller) {
 
 var $$1 = window.$;
 
-var _default$3 = function(_Controller) {
+var _default$1 = function(_Controller) {
   _inherits(_default, _Controller);
   function _default() {
     _classCallCheck(this, _default);
@@ -3875,11 +3845,11 @@ var _default$3 = function(_Controller) {
   return _default;
 }(Controller);
 
-_defineProperty(_default$3, "targets", [ "container", "radio" ]);
+_defineProperty(_default$1, "targets", [ "container", "radio" ]);
 
-var $$2 = window.$;
+var Rails = window.Rails;
 
-var _default$4 = function(_Controller) {
+var _default$2 = function(_Controller) {
   _inherits(_default, _Controller);
   function _default() {
     _classCallCheck(this, _default);
@@ -3888,7 +3858,7 @@ var _default$4 = function(_Controller) {
   _createClass(_default, [ {
     key: "refreshForm",
     value: function refreshForm() {
-      $$2(this.formTarget[0]).trigger("submit.rails");
+      Rails.fire(this.formTarget, "submit");
     }
   }, {
     key: "askForPrintFeedback",
@@ -3900,39 +3870,12 @@ var _default$4 = function(_Controller) {
   return _default;
 }(Controller);
 
-_defineProperty(_default$4, "targets", [ "form", "printOptions", "printFeedback" ]);
-
-var $$3 = window.$;
-
-var _default$5 = function(_Controller) {
-  _inherits(_default, _Controller);
-  function _default() {
-    _classCallCheck(this, _default);
-    return _possibleConstructorReturn(this, _getPrototypeOf(_default).apply(this, arguments));
-  }
-  _createClass(_default, [ {
-    key: "openRemotePartial",
-    value: function openRemotePartial() {
-      $$3(this.containerTarget).html("");
-      var url = this.data.get("url");
-      $$3(this.containerTarget).load(url).foundation("reveal", "open");
-    }
-  } ]);
-  return _default;
-}(Controller);
-
-_defineProperty(_default$5, "targets", [ "container" ]);
+_defineProperty(_default$2, "targets", [ "form", "printOptions", "printFeedback" ]);
 
 var application = Application.start();
 
-application.register("test", _default);
-
-application.register("another_test", _default$1);
-
-application.register("toggle", _default$2);
-
-application.register("foundation-modal", _default$5);
+application.register("toggle", _default);
 
-application.register("hd-prescription-administration", _default$3);
+application.register("hd-prescription-administration", _default$1);
 
-application.register("home-delivery-modal", _default$4);
+application.register("home-delivery-modal", _default$2);

data/app/assets/stylesheets/renalware/core.scss

@@ -9,7 +9,7 @@
 @import "font-awesome";
 @import "foundation-datepicker/css/foundation-datepicker";
 @import "dataTables/jquery.dataTables.foundation";
-@import "trix";
+@import "trix/dist/trix";
 @import "balloon-css/src/balloon";
 @import "./lib/foundation_and_overrides";
 @import "./lib/clockpicker";

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

@@ -173,6 +173,19 @@ article.clinical-allergies {
           }
         }
 
+        &.covid_19 {
+          background-color: $nhs-yellow;
+          color: $dark-grey;
+
+          &:hover {
+            background-color: darken($nhs-yellow, 7);
+          }
+
+          .actions i:before {
+            color: $dark-grey;
+          }
+        }
+
         &.research-study-participant {
           background-color: darken($nhs-green, 3);
           color: $white;

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

@@ -0,0 +1,11 @@
+trix-toolbar {
+  display: inline-block;
+
+  .trix-button-group--file-tools,
+  .trix-button--icon-heading-1,
+  .trix-button--icon-code,
+  .trix-button--icon-quote
+   {
+    display: none;
+  }
+}

data/app/controllers/renalware/medications/prescriptions_controller.rb

@@ -2,6 +2,7 @@
 
 require_dependency "renalware/medications"
 
+# rubocop:disable Metrics/ClassLength
 module Renalware
   module Medications
     class PrescriptionsController < BaseController
@@ -73,7 +74,7 @@ module Renalware
         render :index, locals: locals
       end
 
-      # rubocop:disable Layout/LineLength
+      # rubocop:disable Layout/LineLength, Metrics/MethodLength
       def render_prescriptions_list_to_hand_to_patient
         render(
           pdf_options.merge(
@@ -89,7 +90,7 @@ module Renalware
           )
         )
       end
-      # rubocop:enable Layout/LineLength
+      # rubocop:enable Layout/LineLength, Metrics/MethodLength
 
       def pdf_filename
         "#{patient.family_name}_#{patient.hospital_identifier&.id}" \
@@ -147,7 +148,7 @@ module Renalware
         [
           :drug_id, :dose_amount, :dose_unit, :medication_route_id, :frequency,
           :administer_on_hd, :route_description, :notes, :prescribed_on, :provider,
-          :last_delivery_date, { termination_attributes: :terminated_on }
+          :last_delivery_date, :next_delivery_date, { termination_attributes: :terminated_on }
         ]
       end
 
@@ -222,3 +223,4 @@ module Renalware
     end
   end
 end
+# rubocop:enable Metrics/ClassLength

data/app/controllers/renalware/patients/alerts_controller.rb

@@ -15,6 +15,8 @@ module Renalware
       # POST js
       def create
         alert = Alert.new(alert_params.merge!(by: user, patient: patient))
+        alert.urgent = alert_params[:urgency] == "urgent"
+        alert.covid_19 = alert_params[:urgency] == "covid_19"
         authorize alert
         if alert.save
           render locals: { patient: patient, alert: alert }
@@ -55,7 +57,7 @@ module Renalware
       end
 
       def alert_params
-        params.require(:patients_alert).permit(:notes, :urgent)
+        params.require(:patients_alert).permit(:notes, :urgency)
       end
     end
   end

data/app/inputs/trix_editor_input.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# See https://github.com/kylefox/trix/blob/master/lib/trix/simple_form/trix_editor_input.rb
+class TrixEditorInput < SimpleForm::Inputs::Base
+  def input(_wrapper_options)
+    trix_options = options.slice(:spellcheck, :toolbar, :tabindex, :input, :class)
+    editor_options = { input: input_class, class: "trix-content" }.merge(trix_options)
+
+    editor_tag = template.content_tag("trix-editor", "", editor_options)
+    hidden_field = @builder.hidden_field(attribute_name, input_html_options)
+
+    template.content_tag("div", hidden_field + editor_tag, class: "trix-editor-wrapper")
+  end
+end

data/app/javascript/renalware/controllers/medications/home_delivery_modal_controller.js

@@ -1,4 +1,4 @@
-const $ = window.$
+const Rails = window.Rails
 import { Controller } from "stimulus"
 
 // Handles the modal dialog used for presenting Home Delivery print options to
@@ -9,7 +9,7 @@ export default class extends Controller {
   // Submit and re-display the form when 'drug type' or 'prescription duration'
   // dropdowns are changed
   refreshForm() {
-    $(this.formTarget[0]).trigger("submit.rails")
+    Rails.fire(this.formTarget, "submit")
   }
 
   // When the user has clicked Print (launching the PDF in a new tab), hide

data/app/javascript/renalware/index.js

@@ -13,17 +13,11 @@ import { Application } from "stimulus"
 // (via the polyfill) for new js development, and the remaining js can be ported or moved at some
 // point in the future.
 // The rollupjs setup from adapted from the approach used by ActiveStorage
-import TestController from "./controllers/test_controller"
-import AnotherTestController from "./controllers/another_test_controller"
 import ToggleController from "./controllers/toggle_controller"
 import HDPrescriptionController from "./controllers/hd/prescription_administration_controller"
 import MedicationsHomeDeliveryModalController from "./controllers/medications/home_delivery_modal_controller"
-import FoundationModalController from "./controllers/foundation_modal_controller"
 
 const application = Application.start()
-application.register("test", TestController)
-application.register("another_test", AnotherTestController)
 application.register("toggle", ToggleController)
-application.register("foundation-modal", FoundationModalController)
 application.register("hd-prescription-administration", HDPrescriptionController)
 application.register("home-delivery-modal", MedicationsHomeDeliveryModalController)

data/app/models/renalware/patients/alert.rb

@@ -8,6 +8,7 @@ module Renalware
       include Accountable
       acts_as_paranoid
 
+      attr_accessor :urgency # for use in forms
       validates :patient, presence: true
       validates :notes, presence: true
 

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

@@ -27,7 +27,7 @@ ruby:
     - target = "procedure-notes-editor"
     = f.label :notes
     = snippets_modal_and_link_to_open_it(target_input_for_seleted_snippet: ".#{target}")
-    = f.trix_editor :notes, class: target
+    = f.input :notes, as: :trix_editor, class: target, wrapper: :zilch
     br
     = f.input :catheter_make, wrapper: :horizontal_small
     = f.input :catheter_lot_no, wrapper: :horizontal_small

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

@@ -41,7 +41,8 @@
                     wrapper: :horizontal_medium
     = f.input :summarised_on, as: :date_picker, wrapper: :horizontal_datepicker
     = snippets_modal_and_link_to_open_it(target_input_for_seleted_snippet: ".discharge-summary")
-    = f.trix_editor :discharge_summary, class: "discharge-summary"
+    = f.label :discharge_summary
+    = f.input :discharge_summary, as: :trix_editor, class: "discharge-summary", wrapper: :zilch
 
   = f.submit class: :button
   span= " or "

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

@@ -27,8 +27,6 @@ ruby:
       |  |  
       = link_to "Edit",
                 edit_admissions_request_path(request, format: :html),
-                remote: true,
-                method: :get,
                 data: { "reveal-id" => "admissions-request-modal", "reveal-ajax" => "true" }
   td.handle
     i.fas.fa-bars

data/app/views/renalware/clinics/clinic_visits/_form.html.slim

@@ -43,7 +43,7 @@
           .columns.large-12
             - target = ".clinic-visit-notes-editor"
             = snippets_modal_and_link_to_open_it(target_input_for_seleted_snippet: target)
-            = f.trix_editor :notes, class: "clinic-visit-notes-editor"
+            = f.input :notes, as: :trix_editor, class: "clinic-visit-notes-editor", wrapper: :zilch
 
       fieldset
         legend Admin Notes

data/app/views/renalware/events/events/_form.html.slim

@@ -28,7 +28,7 @@
 
   = f.label :notes
   = snippets_modal_and_link_to_open_it(target_input_for_seleted_snippet: ".event-notes")
-  = f.trix_editor :notes, class: "event-notes"
+  = f.input :notes, as: :trix_editor, class: "event-notes", wrapper: :zilch
   = f.error :notes
   br
 

data/app/views/renalware/letters/letters/_form.html.slim

@@ -43,8 +43,6 @@ ruby:
       h2 Message
 
     = f.input :salutation
-
-    = f.label :body
     = snippets_modal_and_link_to_open_it(target_input_for_seleted_snippet: ".letter-body-editor")
 
     - if event&.respond_to?(:notes)
@@ -53,7 +51,7 @@ ruby:
                 data: { notes: event.notes || "", target: ".letter-body-editor" },
                 class: "insert-data-notes button alternative right editor-toolbar-button"
 
-    = f.trix_editor :body, class: "letter-body-editor"
+    = f.input :body, as: :trix_editor, class: "letter-body-editor", wrapper: :zilch
 
   article
     header

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

@@ -13,19 +13,16 @@
     | Print
   | 
 
-  span(data-controller="foundation-modal",
-       data-foundation-modal-url=new_patient_medications_home_delivery_event_path(patient))
-    = link_to "#",
-              class: "button secondary with-icon",
-              id: "show-home-delivery-modal",
-              data: { action: "click->foundation-modal#openRemotePartial" } do
-      i.fa.fa-print
-      | Print home delivery drugs
-    #print-home-delivery-drugs-modal.reveal-modal.small(data-reveal
-                                                        data-refresh-url=request.original_fullpath
-                                                        data-target="foundation-modal.container"
-                                                        data-controller="home-delivery-modal"
-                                                        data-home-delivery-url1=new_patient_medications_home_delivery_event_url(@patient))
+  / link to open the modal
+  = link_to new_patient_medications_home_delivery_event_path(patient),
+            class: "button secondary with-icon",
+            data: { "reveal-id" => "print-home-delivery-drugs-modal", "reveal-ajax" => "true" } do
+    i.fa.fa-print
+    | Print home delivery drugs
+
+  / modal placeholder
+  #print-home-delivery-drugs-modal.reveal-modal.small(data-reveal
+                                                      data-controller="home-delivery-modal")
 
 = within_patient_layout(title: "Prescriptions") do
   = render "filter_form", search: current_search, drug_types: drug_types, treatable: treatable

data/app/views/renalware/patients/alerts/_alert.html.slim

@@ -1,6 +1,12 @@
-li.patient-alert(class=("urgent" if alert.urgent) id="alert-#{alert.id}")
+ruby:
+  klasses = []
+  klasses << "covid_19" if alert.covid_19?
+  klasses << "urgent" if alert.urgent?
+  title = "Alert:"
+  title = "COVID-19 Alert:" if alert.covid_19?
+li.patient-alert(class=(klasses.join(" ")) id="alert-#{alert.id}")
   i.fas.fa-exclamation-triangle
-  span.title Alert:
+  span.title= title
   span.body= alert.notes
   span.author= alert.created_by.username
   span.date= l(alert.created_at.to_date)

data/app/views/renalware/patients/alerts/_form.html.slim

@@ -4,7 +4,10 @@
                   remote: true,
                   url: patient_alerts_path(patient_id: patient) do |f|
     h2= t(".title")
-    = f.input :urgent, as: :boolean, boolean_style: :inline
+    = f.input :urgency,
+              as: :radio_buttons,
+              collection: [[" URGENT","urgent"], [" COVID-19", "covid_19"]],
+              label: false
     = f.input :notes, autofocus: true
     = f.submit "Create alert", class: :button
     span= " or "

data/app/views/renalware/pd/peritonitis_episodes/edit.js.erb

@@ -3,3 +3,4 @@ $(el).html("<%= escape_javascript(
   render "form", local_assigns
 ) %>");
 initDatepickersIn(el);
+$("#peritonitis_episode_types .searchable_select").select2();

data/app/views/renalware/pd/peritonitis_episodes/update.js.erb

@@ -9,5 +9,5 @@ var el = "<%= "#" + dom_id(peritonitis_episode) %>";
     render "form", local_assigns
   ) %>");
   initDatepickersIn(el);
-
+  $("#peritonitis_episode_types .searchable_select").select2();
 <% end %>

data/app/views/renalware/snippets/snippets/_form.html.slim

@@ -10,7 +10,7 @@
     .small-12.medium-4.large-3.columns
       = f.label :body
     .small-12.medium-8.large-9.columns
-      = f.trix_editor :body
+      = f.input :body, as: :trix_editor, wrapper: :zilch
 
   = f.submit "Save", class: "button"
   = " or "

data/app/views/renalware/snippets/snippets/index.js.erb

@@ -15,7 +15,6 @@ $('.snippets').on('click', 'th a, .pagination a', function () {
 
 initTogglers();
 
-// The
 $('.insert-snippet').on('click', function (e) {
     var modal = $("#snippets-modal");
     var snippetBody = $(this).parent().closest("tr").find(".body").html();

data/app/views/renalware/system/email_templates/index.html.slim

@@ -9,7 +9,3 @@
 
     dt= link_to "User Reactivated Email", "/rails/mailers/renalware/admin/user_mailer/unexpiry"
     dd Sent when an administrator reactivates a deactivated user.
-
-  / You can remove this
-  .xxx(data-controller="test")
-  .xxx(data-controller="another_test")

data/app/views/renalware/system/messages/_form.html.slim

@@ -6,7 +6,8 @@
   = render "renalware/shared/errors", model: f.object
 
   = f.input :title, placeholder: "An optional title"
-  = f.trix_editor :body, wrapper: :horizontal_large
+  = f.label :body
+  = f.input :body, as: :trix_editor, wrapper: :zilch
   br
   = f.input :severity,
             collection: severities,

data/db/migrate/20200316131136_add_covid_19_to_patient_alerts.rb

@@ -0,0 +1,7 @@
+class AddCovid19ToPatientAlerts < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      add_column :patient_alerts, :covid_19, :boolean, null: false, default: false
+    end
+  end
+end

data/lib/renalware/engine.rb

@@ -52,7 +52,6 @@ require "ruby-hl7"
 require "sass-rails"
 require "scenic"
 require "slim-rails"
-require "trix"
 require "uglifier"
 require "validates_timeliness"
 require "virtus"

data/lib/renalware/version.rb

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

data/spec/support/factory_bot.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.configure do |config|
+  FactoryBot.use_parent_strategy = false
   FactoryBot.definition_file_paths = Array(Renalware::Engine.root.join("spec", "factories"))
   config.include FactoryBot::Syntax::Methods
 

data/spec/support/pages/medications/home_delivery_dialog.rb

@@ -57,8 +57,8 @@ module Pages
         end
       end
 
-      def visible?
-        page.has_css?("#print-home-delivery-drugs-modal .modal", visible: true)
+      def invisible?
+        page.has_no_css?("#print-home-delivery-drugs-modal .modal", visible: true)
       end
 
       def has_enabled_print_button?

data/spec/support/pages/medications/prescription_fom.rb

@@ -38,6 +38,14 @@ module Pages
         fill_in "Prescribed on", with: value
       end
 
+      def last_delivery_date=(date)
+        fill_in "Last delivery date", with: date
+      end
+
+      def next_delivery_date=(date)
+        fill_in "Next delivery date", with: date
+      end
+
       def provider=(value)
         within(".medications_prescription_provider") do
           choose value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.142
+  version: 2.0.143
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview-component
@@ -1160,7 +1160,6 @@ files:
 - app/assets/stylesheets/renalware/partials/_datepicker.scss
 - app/assets/stylesheets/renalware/partials/_disabled_block.scss
 - app/assets/stylesheets/renalware/partials/_document.scss
-- app/assets/stylesheets/renalware/partials/_editor.scss
 - app/assets/stylesheets/renalware/partials/_errors.scss
 - app/assets/stylesheets/renalware/partials/_forms.scss
 - app/assets/stylesheets/renalware/partials/_highlight.scss
@@ -1181,6 +1180,7 @@ files:
 - app/assets/stylesheets/renalware/partials/_toggle.scss
 - app/assets/stylesheets/renalware/partials/_toggling.scss
 - app/assets/stylesheets/renalware/partials/_tooltip.scss
+- app/assets/stylesheets/renalware/partials/_trix.scss
 - app/assets/stylesheets/renalware/partials/_typography.scss
 - app/assets/stylesheets/renalware/partials/_utilities.scss
 - app/assets/stylesheets/renalware/pathology_request_forms.scss
@@ -1470,12 +1470,10 @@ files:
 - app/inputs/inline_radio_buttons_input.rb
 - app/inputs/select_container_input.rb
 - app/inputs/simple_time_input.rb
+- app/inputs/trix_editor_input.rb
 - app/inputs/user_picker_input.rb
-- app/javascript/renalware/controllers/another_test_controller.js
-- app/javascript/renalware/controllers/foundation_modal_controller.js
 - app/javascript/renalware/controllers/hd/prescription_administration_controller.js
 - app/javascript/renalware/controllers/medications/home_delivery_modal_controller.js
-- app/javascript/renalware/controllers/test_controller.js
 - app/javascript/renalware/controllers/toggle_controller.js
 - app/javascript/renalware/index.js
 - app/jobs/application_job.rb
@@ -3859,6 +3857,7 @@ files:
 - db/migrate/20200301124200_create_medication_delivery_events.rb
 - db/migrate/20200301124300_create_medication_delivery_event_prescriptions.rb
 - db/migrate/20200306183423_add_next_delivery_date_to_prescriptions.rb
+- db/migrate/20200316131136_add_covid_19_to_patient_alerts.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb

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

@@ -1,47 +0,0 @@
-trix-toolbar {
-  background-color: #fff;
-
-  .button_row {
-    display: inline-block;
-
-    .button_group {
-      -webkit-justify-content: initial;
-      border: 0;
-      display: inline-block;
-      margin: 0;
-
-      button {
-        background-color: transparent;
-        border: 0;
-        margin: 0.5rem 0.2rem 0;
-        padding: 0.2rem;
-      }
-    }
-  }
-
-  // Hide Trix buttons we don't use
-  button.icon {
-    &.heading-1,
-    &.code,
-    &.link,
-    &.quote,
-    &.nesting-level {
-      display: none;
-    }
-  }
-
-  .button_group button.icon,
-  .button_group input[type="button"].icon {
-    height: auto;
-    opacity: 0.9; // prevent fuzzy SVGs in IE11
-  }
-}
-
-trix-editor {
-  border-color: #ccc;
-  border-radius: 0;
-  border-style: solid;
-  border-width: 1px;
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  padding: 0.6em 0.9em;
-}

data/app/javascript/renalware/controllers/another_test_controller.js

@@ -1,8 +0,0 @@
-import { Controller } from "stimulus"
-
-// A test controller to establish that rollup + stimulus + babel are working
-export default class extends Controller {
-  connect() {
-    this.element.textContent = "AnotherTestController connected"
-  }
-}

data/app/javascript/renalware/controllers/foundation_modal_controller.js

@@ -1,19 +0,0 @@
-const $ = window.$
-import { Controller } from "stimulus"
-
-// Controller for handling Foundation 'reveal' dialogs.
-// Assumes jQuery and foundation/reveal available.
-// The .container target is the html element the .reveal-modal class into which
-// the remote content will be loaded. Using a named target rather finding
-// .reveal-modal in case there are nested modal-controllers and >1 of this
-// elements exist in scope.
-export default class extends Controller {
-  static targets = [ "container" ]
-
-  // Open a dialog using a url to load a partial via ajax.
-  openRemotePartial() {
-    $(this.containerTarget).html("") // prevent old content from being initially re-displayed
-    const url = this.data.get("url")
-    $(this.containerTarget).load(url).foundation("reveal", "open")
-  }
-}

data/app/javascript/renalware/controllers/test_controller.js

@@ -1,8 +0,0 @@
-import { Controller } from "stimulus"
-
-// A test controller to establish that rollup + stimulus + babel are working
-export default class extends Controller {
-  connect() {
-    this.element.textContent = "TestController connected."
-  }
-}