effective_messaging 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f51a06c64a043da3819c077710fe75189bf0c9de2480c8bc7229fff8c1c984b8
-  data.tar.gz: 9a271eff256b981894a89f6fca51ff4e6c0abe731d2b1d7177ef3dd31a77287e
+  metadata.gz: ee0fc8653681a36c4de9e9756c348c2438e376bff57409b584a5d7e514a1e596
+  data.tar.gz: bf10b4a5f6641193eac7f0da6300d6851b3d51417fe72b36095e6702823936f9
 SHA512:
-  metadata.gz: 9d41b44b4829586760bdb2d177fab1aa2bf871f9250ed8679605f98a3704196560f8fc6489b90a78c264b66a9c400a91ae051388ccf379953c799d9fab04b3ef
-  data.tar.gz: 9c6fe1ace4437ac55f032a8834dab9156afa0c3290e5ecd9ec59e9567459af404298dc76cd3a6b98dc39115e05abb1b83cf8a79856cd2823bec64e9be6b75998
+  metadata.gz: 6fdbe70ef0e37d29dc8126ac9416361e4cfd87929f20975dcff60d4281d2804b96c3def8d0a2303be2210e98985310a1858beddaeeb332366ec33bb0bfe69fb6
+  data.tar.gz: 22dafc2abd52b17461126ceafc84164c6d9446f8fe2ff8f997da2b29ff8db5cdc959a1c59123f75ad45499df19057cc04cfd98a03074f12ce6a4958a4406d77e

data/app/datatables/admin/effective_notifications_datatable.rb

@@ -32,7 +32,7 @@ module Admin
       col :scheduled_method, visible: false
       col :scheduled_dates, visible: false
 
-      col :report, search: Effective::Report.notifiable.sorted
+      col :report, search: Effective::Report.notifiable.sorted, action: :show
 
       col(:rows_count) do |notification|
         notification.report.collection().count

data/app/models/effective/notification.rb

@@ -203,7 +203,7 @@ module Effective
     end
 
     def renderer
-      view_context || ApplicationController.renderer
+      view_context || nil # This isn't ideal
     end
 
     def rows_count

data/app/views/admin/notifications/_form_notification.html.haml

@@ -11,29 +11,34 @@
 
     = f.select :audience_emails, f.object.audience_emails, label: 'Send to', multiple: true, tags: true, hint: 'Add one or more email address by pressing enter'
 
+  %h2 Enabled
+  %p When unchecked, no emails will be sent
+  = f.check_box :enabled, label: "Yes, this notification is enabled and notification emails should be sent"
+
   %h2 Schedule
   %p Please select how and when the notifications should be sent
 
-  = f.check_box :enabled, label: "Yes, this notification is enabled and notification emails should be sent"
+  .row
+    .col-md-6
+      = f.select :schedule_type, Effective::Notification::SCHEDULE_TYPES
 
-  = f.show_if(:enabled, true) do
-    = f.select :schedule_type, Effective::Notification::SCHEDULE_TYPES
+  = f.show_if(:schedule_type, 'immediate') do
+    .d-flex
+      Send notification immediately and then every
+      .mx-3= f.number_field :immediate_days, label: false, min: 0, max: 365
+      day(s) thereafter, for
+      .mx-3= f.number_field :immediate_times, label: false, min: 1, max: 1000
+      total notification(s).
 
-    = f.show_if(:schedule_type, 'immediate') do
-      .d-flex
-        Send notification immediately and then every
-        .mx-3= f.number_field :immediate_days, label: false, min: 0, max: 365
-        day(s) thereafter, for
-        .mx-3= f.number_field :immediate_times, label: false, min: 1, max: 1000
-        total notification(s).
+  = f.show_if(:schedule_type, 'scheduled') do
+    = f.hidden_field :scheduled_method, value: 'dates'
 
-    = f.show_if(:schedule_type, 'scheduled') do
-      /= f.radios :scheduled_method, Effective::Notification::SCHEDULED_METHODS, label: false, required: true
-      = f.hidden_field :scheduled_method, value: 'dates'
+    %p Send notification on the following scheduled dates:
 
-      /= f.show_if(:scheduled_method, 'dates') do
-      %p Send notification on the following scheduled dates:
-      = f.select :scheduled_dates, f.object.scheduled_dates, label: false, multiple: true, tags: true, hint: 'Add one or more dates by pressing enter. Please input in the format YYYY-MM-DD'
+    .row
+      .col-md-6
+        = f.select :scheduled_dates, f.object.scheduled_dates, multiple: true, tags: true, 
+          hint: 'Add one or more dates by pressing enter. Please input in the format YYYY-MM-DD'
 
   %h2 Report
   .row

data/lib/effective_messaging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMessaging
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_messaging
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2023-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails