effective_datatables 4.17.4 → 4.19.0

data/app/assets/stylesheets/effective_datatables/_overrides.bootstrap4.scss

@@ -1,35 +1,85 @@
 // Override dataTables.bootstrap4.css defaults
 table.dataTable { border-collapse: collapse !important; }
 
-// Override default padding
-table.dataTable thead > tr > th.sorting_asc, table.dataTable thead > tr > th.sorting_desc, table.dataTable thead > tr > th.sorting,
+// Override default hover effect
+table.dataTable.table-striped > tbody > tr.odd > *,
+table.dataTable.table-striped > tbody > tr.odd.selected > *,
+table.dataTable.table-hover > tbody > tr:hover > *,
+table.dataTable.table-hover > tbody > tr.selected:hover > * { 
+  box-shadow: unset; 
+}
+
+// Override default sorting
+table.dataTable thead > tr > th.sorting:before, 
+table.dataTable thead > tr > th.sorting_asc:before, 
+table.dataTable thead > tr > th.sorting_desc:before,
+table.dataTable thead > tr > th.sorting_asc_disabled:before,
+table.dataTable thead > tr > th.sorting_desc_disabled:before,
+table.dataTable thead > tr > td.sorting:before,
+table.dataTable thead > tr > td.sorting_asc:before,
+table.dataTable thead > tr > td.sorting_desc:before,
+table.dataTable thead > tr > td.sorting_asc_disabled:before,
+table.dataTable thead > tr > td.sorting_desc_disabled:before {
+  content: '';
+}
+
+table.dataTable thead > tr > th.sorting:after,
+table.dataTable thead > tr > th.sorting_asc:after,
+table.dataTable thead > tr > th.sorting_desc:after,
+table.dataTable thead > tr > th.sorting_asc_disabled:after,
+table.dataTable thead > tr > th.sorting_desc_disabled:after,
+table.dataTable thead > tr > td.sorting:after,
+table.dataTable thead > tr > td.sorting_asc:after,
+table.dataTable thead > tr > td.sorting_desc:after,
+table.dataTable thead > tr > td.sorting_asc_disabled:after,
+table.dataTable thead > tr > td.sorting_desc_disabled:after {
+  content: '';
+}
+
+table.dataTable thead > tr > th.sorting, table.dataTable thead > tr > th.sorting_asc, table.dataTable thead > tr > th.sorting_desc, table.dataTable thead > tr > th.sorting_asc_disabled, table.dataTable thead > tr > th.sorting_desc_disabled,
+table.dataTable thead > tr > td.sorting,
 table.dataTable thead > tr > td.sorting_asc,
 table.dataTable thead > tr > td.sorting_desc,
-table.dataTable thead > tr > td.sorting { padding: 0.5em 0.5em 0.5em 0.5em; }
-
-// Override default sort icons
-table.dataTable thead .sorting:before,
-table.dataTable thead .sorting_asc:before,
-table.dataTable thead .sorting_desc:before,
-table.dataTable thead .sorting_asc_disabled:before,
-table.dataTable thead .sorting_desc_disabled:before,
-table.dataTable thead .sorting:after,
-table.dataTable thead .sorting_asc:after,
-table.dataTable thead .sorting_desc:after,
-table.dataTable thead .sorting_asc_disabled:after,
-table.dataTable thead .sorting_desc_disabled:after { content: ''; }
+table.dataTable thead > tr > td.sorting_asc_disabled,
+table.dataTable thead > tr > td.sorting_desc_disabled {
+  padding: 0.5em 0.5em 0.5em 0.5em;
+}
 
-table.dataTable > thead {
+table.dataTable.table-sm > thead > tr > th:not(.sorting_disabled) { padding-right: 0.5em; }
+table.dataTable thead > tr > th.sorting_disabled { padding-bottom: 8px; }
+
+table.dataTable > thead th {
+  background-repeat: no-repeat;
+  > span { padding-right: 1rem; }
+}
+
+table.dataTable > thead .sorting {
+  background-image: asset-data-url('dataTables/sort.svg');
+  background-position: right 0.25rem top 0.25rem;
+}
+
+table.dataTable > thead .sorting_asc {
+  background-image: asset-data-url('dataTables/sort-up.svg');
+  background-position: right 0.25rem top 0.25rem;
+}
+
+table.dataTable > thead .sorting_desc {
+  background-image: asset-data-url('dataTables/sort-down.svg');
+  background-position: right 0.25rem top 0.25rem;
+}
+
+// The New button
+table.dataTable thead {
   th.col-actions {
     text-align: right;
-
     span { display: block; height: 1.25em; }
   }
 }
 
+// Turbolinks destroy fix
 .dataTables_wrapper {
   table.dataTable {
-    tr.effective-datatables-inline-row { visibility: collapse; }  // Turbolinks destroy fix
+    tr.effective-datatables-inline-row { visibility: collapse; }
   }
 }
 
@@ -53,25 +103,17 @@ table.dataTable > thead {
   }
 }
 
-table.dataTable > thead th {
-  background-repeat: no-repeat;
-
-  > span { padding-right: 1rem; }
+table.dataTable.dtr-inline.collapsed > tbody > tr > td.dtr-control:before,
+table.dataTable.dtr-inline.collapsed > tbody > tr > th.dtr-control:before {
+  color: #0275d8;
 }
-
-table.dataTable > thead .sorting {
-  background-image: asset-data-url('dataTables/sort.svg');
-  background-position: right 0.25rem top 0.25rem;
+table.dataTable.dtr-inline.collapsed > tbody > tr > td.dtr-control.arrow-right::before,
+table.dataTable.dtr-inline.collapsed > tbody > tr > th.dtr-control.arrow-right::before {
+  color: #0275d8;
 }
-
-table.dataTable > thead .sorting_asc {
-  background-image: asset-data-url('dataTables/sort-up.svg');
-  background-position: right 0.25rem top 0.25rem;
-}
-
-table.dataTable > thead .sorting_desc {
-  background-image: asset-data-url('dataTables/sort-down.svg');
-  background-position: right 0.25rem top 0.25rem;
+table.dataTable.dtr-inline.collapsed > tbody > tr.parent > td.dtr-control:before,
+table.dataTable.dtr-inline.collapsed > tbody > tr.parent > th.dtr-control:before {
+  color: #0275d8;
 }
 
 // Collapsed Responsive View
@@ -90,6 +132,10 @@ table.dataTable > tbody > tr.child {
   }
 }
 
+table.dataTable.collapsed  {
+  th.col-bulk_actions:first-child { div { margin-left: 18px; } }
+}
+
 // Buttons
 .dataTables_buttons {
   text-align: right;
@@ -124,10 +170,6 @@ table.dataTable > thead {
   }
 }
 
-table.dataTable.collapsed  {
-  th.col-bulk_actions:first-child { div { margin-left: 18px; } }
-}
-
 // Processing div
 div.dataTables_wrapper div.dataTables_processing {
   margin: -26px 25% 0px 25%;

data/app/views/effective/datatables/_filter_date_range.html.haml

@@ -31,17 +31,45 @@
   = f.static_field :year do
     #{now.beginning_of_year.strftime('%F')} to #{now.strftime('%F')} (today)
 
+= f.show_if :date_range, :year do
+  = f.static_field :year, wrapper: { class: 'effective-datatables-filter' } do
+    - date = f.object.start_date.beginning_of_year
+
+    = link_to '#', 'data-effective-datatables-filter-prev-year': date.advance(years: -1).strftime('%F') do
+      = icon('arrow-left-circle')
+      %span.prev-year= date.advance(years: -1).strftime('%Y')
+
+    %span.start-date= f.object.start_date.strftime('%F')
+    to
+    %span.end-date= f.object.end_date.strftime('%F')
+
+    = link_to '#', 'data-effective-datatables-filter-next-year': date.advance(years: 1).strftime('%F') do
+      = icon('arrow-right-circle')
+      %span.next-year= date.advance(years: 1).strftime('%Y')
+
+    %div{style: 'display: none;'}
+      = f.date_field :start_date, name: name, autocomplete: 'off', feedback: false
+      = f.date_field :end_date, name: name, autocomplete: 'off', feedback: false
+
 = f.show_if :date_range, :month do
-  = f.static_field :month do
-    = link_to((prev_month.strftime('%b %Y') + ' ' + icon('arrow-left-circle')).html_safe, prev_month_path.sub(path, request.path))
-    #{start_date.beginning_of_month.strftime('%F')} to #{start_date.end_of_month.strftime('%F')}
-    = link_to((icon('arrow-right-circle') + ' ' + next_month.strftime('%b %Y')).html_safe, next_month_path.sub(path, request.path))
+  = f.static_field :month, wrapper: { class: 'effective-datatables-filter' } do
+    - date = f.object.start_date.beginning_of_month
 
-= f.show_if :date_range, :year do
-  = f.static_field :year do
-    = link_to((prev_year.strftime('%Y') + ' ' + icon('arrow-left-circle')).html_safe, prev_year_path.sub(path, request.path))
-    #{start_date.beginning_of_year.strftime('%F')} to #{start_date.end_of_year.strftime('%F')}
-    = link_to((icon('arrow-right-circle') + ' ' + next_year.strftime('%Y')).html_safe, next_year_path.sub(path, request.path))
+    = link_to '#', 'data-effective-datatables-filter-prev-month': date.advance(months: -1).strftime('%F') do
+      = icon('arrow-left-circle')
+      %span.prev-month= date.advance(months: -1).strftime('%b')
+
+    %span.start-date= f.object.start_date.strftime('%F')
+    to
+    %span.end-date= f.object.end_date.strftime('%F')
+
+    = link_to '#', 'data-effective-datatables-filter-next-month': date.advance(months: 1).strftime('%F') do
+      = icon('arrow-right-circle')
+      %span.next-month= date.advance(months: 1).strftime('%b')
+
+    %div{style: 'display: none;'}
+      = f.date_field :start_date, name: name, autocomplete: 'off', feedback: false
+      = f.date_field :end_date, name: name, autocomplete: 'off', feedback: false
 
 = f.show_if :date_range, :custom do
   .row

data/app/views/effective/datatables/_filters.html.haml

@@ -1,6 +1,6 @@
 .effective-datatables-filters{'aria-controls': datatable.to_param}
 
-  = effective_form_with(model: datatable.filters_form, scope: :filters, url: (datatable._form[:url] || '#'), method: datatable._form[:verb], id: nil) do |form|
+  = effective_form_with(model: datatable.filters_form, scope: :filters, url: (datatable._form[:url] || '#'), method: datatable._form[:verb], id: nil, authenticity_token: datatable._filters_form_required?) do |form|
     .form-row.align-items-center
       - if datatable._scopes.present?
         = datatable_scope_tag(form, datatable)

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.17.4'.freeze
+  VERSION = '4.19.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.17.4
+  version: 4.19.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-03 00:00:00.000000000 Z
+date: 2023-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,6 +94,7 @@ files:
 - app/assets/images/dataTables/sort-down.svg
 - app/assets/images/dataTables/sort-up.svg
 - app/assets/images/dataTables/sort.svg
+- app/assets/javascripts/dataTables/UPGRADE.md
 - app/assets/javascripts/dataTables/buttons/buttons.bootstrap4.js
 - app/assets/javascripts/dataTables/buttons/buttons.colVis.js
 - app/assets/javascripts/dataTables/buttons/buttons.html5.js