tramway-admin 1.31.0.2 → 1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85b6f6446c7992da10f8047f5307cde053f95c0cddbecd3fb8452b54b1e1f275
-  data.tar.gz: f1c47470978a8da9341e5cde7327f6561bdfda5f2ea8629779457ca3994f33b3
+  metadata.gz: da3bc56fc776dfe427a596e31529b9f8c3c6f97db1db373931afb3e113c1ecdd
+  data.tar.gz: 4a8f36847d9ec84316bd18fa0633baf3c50177a9f29b4ef847a5c16bb683acfe
 SHA512:
-  metadata.gz: 04655db55e12c76dc60edf28cf11c9e3cc73cc3256646e02363e4793522aed373300aea0c0af9391bf5a92f01391f5b72b9893426a4d7cac5eb33b9b3eb9758c
-  data.tar.gz: b529d3b27ce0c0a9288df0282ae0ca979ad6363446cef0cd6771b5e0279a3a42987126fc093dea569cb76ba84f48aea24bef5813ef1ef2ac19beefe099fac063
+  metadata.gz: ef3fceeab511ec3eea980f77ce39de35f6447c91e191f79563751704fbd45adb2949619b04eaad84516a952c21ad415a3fbe64efdc6c1540c82bd228ddfa4ff1
+  data.tar.gz: b73d51193a4ea7d0ed2810538146bc8154f29e7640a175356b4ab1dc71ef8ce8392908f77eabcf55ae5ad2453218b384d92c9b9336366ea44c31b7cefecedf0d

data/README.md

@@ -106,13 +106,28 @@ class YourModelDecorator < Tramway::Core::ApplicationDecorator
     def collections
       [ :all, :scope1, :scope2 ]
     end
+    
+    def list_filters
+      {
+        filter_name: {
+          select_collection: filter_collection,
+          query: lambda do |list, value|
+            list.where some_attribute: value
+          end
+        }
+      }
+    end
   end
   
   delegate :title, to: :object
 end
 ```
 
-**NOTE:** `collections` methods must return array of scopes of `YourModel`. Every collection will be a tab in a list of your model in admin panel.
+**NOTES:**
+* `collections` method must return array of scopes of `YourModel`. Every collection will be a tab in a list of your model in admin panel
+* `list_filters` method returns hash of filters where:
+  * select_collection - collection which will be in the select of filter. It must be compatible with [options_for_select](https://apidock.com/rails/ActionView/Helpers/FormOptionsHelper/options_for_select) method
+  * query - some Active Record query which be used as a filter of records
 
 #### 10. Add inheritance to YourModel
 

data/app/assets/stylesheets/tramway/admin/application.sass

@@ -31,3 +31,14 @@ td.actions
   height: auto
   max-height: 30em
   overflow-x: hidden
+
+.row-fluid.filters
+  width: 100%
+  display: flex
+
+  select
+    width: 100%
+
+  .submit
+    display: flex
+    flex-direction: row-reverse

data/app/controllers/tramway/admin/application_controller.rb

@@ -34,8 +34,15 @@ module Tramway
           records = records.send "#{current_admin.role}_scope", current_admin.id
           records = records.ransack(params[:filter]).result if params[:filter].present?
           params[:list_filters]&.each do |filter, value|
-            if value.present?
-              records = decorator_class.list_filters[filter.to_sym][:query].call(records, value)
+            case decorator_class.list_filters[filter.to_sym][:type]
+            when :select
+              records = decorator_class.list_filters[filter.to_sym][:query].call(records, value) if value.present?
+            when :dates
+              begin_date = params[:list_filters][filter.to_sym][:begin_date]
+              end_date = params[:list_filters][filter.to_sym][:end_date]
+              if begin_date.present? && end_date.present?
+                records = decorator_class.list_filters[filter.to_sym][:query].call(records, begin_date, end_date) if value.present?
+              end
             end
           end
           hash.merge! collection => records.count
@@ -97,7 +104,9 @@ module Tramway
         #  model: params[:model]
         # )
         # raise "Looks like model #{params[:model]} is not included to tramway-admin for `#{current_admin.role}` role. Add it in the `config/initializers/tramway.rb`. This way `Tramway::Admin.set_available_models(#{params[:model]})`"
-        Tramway::Admin.forms.include? params[:form].underscore.sub(%r{^admin/}, '').sub(/_form$/, '') if params[:form].present?
+        if params[:form].present?
+          Tramway::Admin.forms.include? params[:form].underscore.sub(%r{^admin/}, '').sub(/_form$/, '')
+        end
       end
 
       def available_scope_given?

data/app/controllers/tramway/admin/records_controller.rb

@@ -7,8 +7,15 @@ class Tramway::Admin::RecordsController < ::Tramway::Admin::ApplicationControlle
     records = records.full_text_search params[:search] if params[:search].present?
     records = records.ransack(params[:filter]).result if params[:filter].present?
     params[:list_filters]&.each do |filter, value|
-      if value.present?
-        records = decorator_class.list_filters[filter.to_sym][:query].call(records, value)
+      case decorator_class.list_filters[filter.to_sym][:type]
+      when :select
+        records = decorator_class.list_filters[filter.to_sym][:query].call(records, value) if value.present?
+      when :dates
+        begin_date = params[:list_filters][filter.to_sym][:begin_date]
+        end_date = params[:list_filters][filter.to_sym][:end_date]
+        if begin_date.present? && end_date.present?
+          records = decorator_class.list_filters[filter.to_sym][:query].call(records, begin_date, end_date) if value.present?
+        end
       end
     end
     records = records.send "#{current_admin.role}_scope", current_admin.id

data/app/views/tramway/admin/records/_search.html.haml

@@ -1,15 +1,28 @@
 - if searchable_model?(model_class) || decorator_class(model_class).list_filters.any?
-  .col-md-6
+  .col-md-8
     .search
-      = form_tag records_path, method: :get do |f|
-        .form-group.text
-          .input-group
-            - if searchable_model?(model_class)
-              = text_field_tag :search, params[:search], class: 'text form-control'
-            = hidden_field_tag :model, params[:model]
-            = hidden_field_tag :scope, params[:scope]
-            = hidden_field_tag :filter, params[:filter]
-            - decorator_class(model_class).list_filters.each do |filter|
-              = select_tag "list_filters[#{filter[0]}]", build_options_for_select(filter[0], filter[1][:select_collection]), include_blank: true, class: 'form-control'
-            .input-group-append
-              = submit_tag t('helpers.actions.search'), class: 'btn btn-primary'
+      = form_tag records_path, class: 'form-inline', method: :get do |f|
+        - if searchable_model?(model_class)
+          = text_field_tag :search, params[:search], class: 'text form-control'
+        = hidden_field_tag :model, params[:model]
+        = hidden_field_tag :scope, params[:scope]
+        = hidden_field_tag :filter, params[:filter]
+        - decorator_class(model_class).list_filters.each_slice(3) do |slice|
+          .row-fluid.filters
+            - slice.each do |filter|
+              .col-md-4
+                = label_tag t("admin.filters.#{model_class.to_s.underscore}.#{filter[0]}")
+                - case filter[1][:type]
+                - when :select
+                  = select_tag "list_filters[#{filter[0]}]", build_options_for_select(filter[0], filter[1][:select_collection]), include_blank: true, class: 'form-control'
+                - when :dates
+                  = text_field_tag "list_filters[#{filter[0]}][begin_date]", '', class: 'form-control', id: 'filter_datepicker_begin_date', value: params[:list_filters][filter[0]][:begin_date]
+                  = text_field_tag "list_filters[#{filter[0]}][end_date]", '', class: 'form-control', id: 'filter_datepicker_end_date', value: params[:list_filters][filter[0]][:end_date]
+                  :javascript
+                    $(function () {
+                      $('#filter_datepicker_begin_date').datepicker();
+                      $('#filter_datepicker_end_date').datepicker();
+                    });
+        .row-fluid.filters
+          .col-md-4.offset-md-8.submit
+            = submit_tag t('helpers.actions.search'), class: 'btn btn-primary'

data/app/views/tramway/admin/records/index.html.haml

@@ -5,7 +5,8 @@
 - tabs = get_collection
 .page-header
   .row
-    .col-md-6
+    - search_render_show = searchable_model?(model_class) || decorator_class(model_class).list_filters.any?
+    %div{ class: "col-md-#{search_render_show ? 4 : 12}" }
       %h1
         = current_title
         = link_to fa_icon(:plus), new_current_model_record_path, class: 'btn btn-primary'

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '1.31.0.2'
+    VERSION = '1.32'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.31.0.2
+  version: '1.32'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2020-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-kaminari-views