renalware-core 2.0.144 → 2.0.145

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 681dfc892020816cf3a194e525126d5183edc902647a24f3a7368c70c49e357d
-  data.tar.gz: fc36c245a572d79fea89d1623d8e4baf34f6cd5aa3e209b15bb6a72dfce23dcc
+  metadata.gz: 264987f5d8be265da2a90a036b68107e57d56799d4ead8c1b40e11a351a9d65a
+  data.tar.gz: db66496b53c89e79e7ba629ba799ef891abd739b3097eeec89aedfcba2b21155
 SHA512:
-  metadata.gz: 7dc1cae45c025dea07e3be64d6a4b49a8ecff3527a899553277db43321ddbf02818500c2ca620d7c476ae3df81f9d37d00d2e9d2d9f096c4aedd86efdd3c99a5
-  data.tar.gz: 966296fde8a71919b5407f81b96df4b7e19c7a34ca64c78ebcdc21e06bcee7a090235312663e1c4a833029173b8ea8f41da55332c6a231188184ebf88555cf46
+  metadata.gz: be45e35ef297c5b1f031cdbbebdf0fa3579dbcc32c31b1d5786efaa96dd520328aff549ed7513cbf3d4a2599ae906595efecf93cc6d0c62cb56c8652ece29f7c
+  data.tar.gz: 9bf397ab6768aa9ef420077804f457865959f906ebac530e6149ab3cc68d3c7e5d4af60aed095a6e5deb1748c13abdf263faa243b9e74bfed729f77514675306

data/app/assets/javascripts/renalware/components/letters.js

@@ -88,19 +88,19 @@ Renalware.Letters = (function() {
     })
   };
 
-  var initInsertEventNotesIntoTextEditor = function() {
-    $(".insert-data-notes").on("click", function(e) {
-      e.preventDefault();
-      var notes = $(this).data("notes");
-      var targetEditorSelector = $(this).data("target");
-      if (notes && targetEditorSelector) {
-         var targetInput = $(targetEditorSelector)[0];
-         targetInput.editor.insertHTML(notes);
-      } else {
-        alert("There are no notes to insert");
-      }
-    });
-  };
+  // var initInsertEventNotesIntoTextEditor = function() {
+  //   $(".insert-data-notes").on("click", function(e) {
+  //     e.preventDefault();
+  //     var notes = $(this).data("notes");
+  //     var targetEditorSelector = $(this).data("target");
+  //     if (notes && targetEditorSelector) {
+  //        var targetInput = $(targetEditorSelector)[0];
+  //        targetInput.editor.insertHTML(notes);
+  //     } else {
+  //       alert("There are no notes to insert");
+  //     }
+  //   });
+  // };
 
   var pollBatchStatus = function(url) {
     var POLL_INTERVAL = 2000; // ms
@@ -143,7 +143,7 @@ Renalware.Letters = (function() {
       bindOnSalutationChange();
       initNewContactAsMainRecipient();
       initNewContactAsCC();
-      initInsertEventNotesIntoTextEditor();
+      //initInsertEventNotesIntoTextEditor();
       bindOnLetterAboutToBatchPrint();
       bindOnLetterAboutToPrint();
     },

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

@@ -3885,8 +3885,7 @@ var _default$3 = function(_Controller) {
     value: function insert(event) {
       var modal = $$2("#snippets-modal");
       var snippetBody = $$2(event.target).parent().closest("tr").find(".body").html();
-      var targetInputSelector = $$2(modal).data("target");
-      trix = document.querySelector("trix-editor");
+      var trix = document.querySelector("trix-editor");
       trix.editor.insertHTML(snippetBody);
       $$2(modal).foundation("reveal", "close");
     }
@@ -3894,6 +3893,36 @@ var _default$3 = function(_Controller) {
   return _default;
 }(Controller);
 
+var $$3 = window.$;
+
+var _default$4 = function(_Controller) {
+  _inherits(_default, _Controller);
+  function _default() {
+    _classCallCheck(this, _default);
+    return _possibleConstructorReturn(this, _getPrototypeOf(_default).apply(this, arguments));
+  }
+  _createClass(_default, [ {
+    key: "initInsertEventNotesIntoTrixEditor",
+    value: function initInsertEventNotesIntoTrixEditor(event) {
+      event.preventDefault();
+      var notes = $$3(event.target).data("notes");
+      if (notes && this.trix) {
+        this.trix.insertHTML(notes);
+      } else {
+        alert("There are no notes to insert");
+      }
+    }
+  }, {
+    key: "trix",
+    get: function get() {
+      return this.trixTarget.editor;
+    }
+  } ]);
+  return _default;
+}(Controller);
+
+_defineProperty(_default$4, "targets", [ "trix" ]);
+
 var application = Application.start();
 
 application.register("toggle", _default);
@@ -3903,3 +3932,5 @@ application.register("hd-prescription-administration", _default$1);
 application.register("home-delivery-modal", _default$2);
 
 application.register("snippets", _default$3);
+
+application.register("letters-form", _default$4);

data/app/inputs/trix_editor_input.rb

@@ -3,7 +3,7 @@
 # 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)
+    trix_options = options.slice(:spellcheck, :toolbar, :tabindex, :input, :class, :data)
     editor_options = { input: input_class, class: "trix-content" }.merge(trix_options)
 
     editor_tag = template.content_tag("trix-editor", "", editor_options)

data/app/javascript/renalware/controllers/letters/form_controller.js

@@ -0,0 +1,21 @@
+const $ = window.$
+import { Controller } from "stimulus"
+
+export default class extends Controller {
+  static targets = [ "trix" ]
+
+  initInsertEventNotesIntoTrixEditor(event) {
+    event.preventDefault()
+    let notes = $(event.target).data("notes")
+
+    if (notes && this.trix) {
+      this.trix.insertHTML(notes)
+    } else {
+      alert("There are no notes to insert")
+    }
+  }
+
+  get trix() {
+    return this.trixTarget.editor
+  }
+}

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

@@ -3,13 +3,10 @@ import { Controller } from "stimulus"
 
 export default class extends Controller {
   insert(event) {
-    // Note the trix_edito_helper is not inserting the correct class atm
-    // so for now we are just selecting the one and only (hopefully) trix-editor on the page
-    // let editorSelector = this.data.get("target-input")
+    // TODO: set up the trix editor in each page as data-target="snippets.trix"
     let modal = $("#snippets-modal")
     let snippetBody = $(event.target).parent().closest("tr").find(".body").html()
-    let targetInputSelector = $(modal).data("target")
-    trix = document.querySelector("trix-editor")
+    let trix = document.querySelector("trix-editor")
     trix.editor.insertHTML(snippetBody)
     $(modal).foundation("reveal", "close")
   }

data/app/javascript/renalware/index.js

@@ -17,9 +17,11 @@ import ToggleController from "./controllers/toggle_controller"
 import HDPrescriptionController from "./controllers/hd/prescription_administration_controller"
 import MedicationsHomeDeliveryModalController from "./controllers/medications/home_delivery_modal_controller"
 import SnippetsController from "./controllers/snippets_controller"
+import LettersFormController from "./controllers/letters/form_controller"
 
 const application = Application.start()
 application.register("toggle", ToggleController)
 application.register("hd-prescription-administration", HDPrescriptionController)
 application.register("home-delivery-modal", MedicationsHomeDeliveryModalController)
 application.register("snippets", SnippetsController)
+application.register("letters-form", LettersFormController)

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

@@ -8,7 +8,7 @@ ruby:
     span= " or "
     = link_to "cancel", back_path
 
-.form-content
+.form-content data-controller="letters-form"
   = render event if event.present?
 
   article
@@ -46,12 +46,17 @@ ruby:
     = snippets_modal_and_link_to_open_it(target_input_for_seleted_snippet: ".letter-body-editor")
 
     - if event&.respond_to?(:notes)
+
       = link_to "Insert #{event.class.name.demodulize.underscore.humanize.downcase} notes",
                 "/",
-                data: { notes: event.notes || "", target: ".letter-body-editor" },
+                data: { action: "click->letters-form#initInsertEventNotesIntoTrixEditor",
+                        notes: event.notes || "" },
                 class: "insert-data-notes button alternative right editor-toolbar-button"
 
-    = f.input :body, as: :trix_editor, class: "letter-body-editor", wrapper: :zilch
+    = f.input :body,
+              as: :trix_editor,
+              wrapper: :zilch,
+              data: { target: "letters-form.trix" }
 
   article
     header

data/lib/renalware/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.144
+  version: 2.0.145
 platform: ruby
 authors:
 - Airslie
@@ -1473,6 +1473,7 @@ files:
 - app/inputs/trix_editor_input.rb
 - app/inputs/user_picker_input.rb
 - app/javascript/renalware/controllers/hd/prescription_administration_controller.js
+- app/javascript/renalware/controllers/letters/form_controller.js
 - app/javascript/renalware/controllers/medications/home_delivery_modal_controller.js
 - app/javascript/renalware/controllers/snippets_controller.js
 - app/javascript/renalware/controllers/toggle_controller.js