tramway-admin 1.31.0.1 → 1.32.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e527df685599efb7b14fa1ff445ae7f61aea669a1edd406d7a5d127fe2026f6
-  data.tar.gz: 41a7ee8ab8836d19122a094784fa3fa3c162e469a005b5f2b7a174f178bc3897
+  metadata.gz: 8a1bea8f2efa7d5814d01ecbc9b1be1e0ce806a23e4d30468efed48977da8a39
+  data.tar.gz: 521deb526b82adb0bf8e12e637bd5110f43319e226647cead7782e3fff2690b1
 SHA512:
-  metadata.gz: c6a8ba79872d5a473f77e1fe69e5d7c5d3d710890fd0293d3afbab411a347254c3dc25da2201cc6ad1ea48d9d50146356c2b1b7b5244c2483ff255b088473ea7
-  data.tar.gz: 96cc001da48f111185dcd722ca4f61f16f4f08f1668512a6a8aa43d36b24bbeed6f13fc70a4a95bfce0644332ac5f5c30781f486447cee6d57b3c6497a5066c2
+  metadata.gz: 8af70fa074a7859b0f393b47c0e256a16d02f3b33146a9cd61220d2fe3a7b33d811debcc7aa1b066f46ef027e7497d758359dc9d1b558a3036852ff6b0eb0e48
+  data.tar.gz: 14debf20343bd4b96d7e157c93bd40f7a633fd6cadf674b4b9c712bf821dc9659db61e4121cd018b0ca0570626d7b892ad37ff23cf592540253a710e35b0a420

data/README.md

@@ -1,13 +1,6 @@
 # Tramway::Admin
-Short description and motivation.
 
-## English readme
-
-*If you need translation of this Readme, please message us kalashnikov@ulmic.ru. We'll translate for you and post to this page*
-
-## Russian readme
-
-Готовая админка для проекта. Она подготовлена для работы со всеми tramway плагинами, а также поддерживает и ваши модели тоже.
+Create admin panel for your application FAST!
 
 ## Usage
 How to use my plugin.
@@ -106,13 +99,61 @@ class YourModelDecorator < Tramway::Core::ApplicationDecorator
     def collections
       [ :all, :scope1, :scope2 ]
     end
+    
+    def list_filters
+      {
+        filter_name: {
+          type: :select,
+          select_collection: filter_collection,
+          query: lambda do |list, value|
+            list.where some_attribute: value
+          end
+        },
+        date_filter_name: {
+          type: :dates,
+          query: lambda do |list, begin_date, end_date|
+            list.where 'created_at > ? AND created_at < ?', begin_date, end_date
+          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
+
+Filters naming:
+
+*Select filters*
+
+```yaml
+en:
+  tramway:
+    admin:
+      filters:
+        model_name:
+          filter_name: Your Filter
+```
+
+*Date filters*
+
+```yaml
+en:
+  tramway:
+    admin:
+      filters:
+        model_name:
+          date_filter_name:
+            begin_date: Your Begin date filter
+            end_date Your end date filter
+```
 
 #### 10. Add inheritance to YourModel
 
@@ -140,6 +181,24 @@ class Admin::YourModelForm < Tramway::Core::ApplicationForm
   end
 end
 ```
+
+### 12. You can add search to your index page
+
+Tramway use gem [PgSearch](https://github.com/Casecommons/pg_search`) as search engine
+
+Just add `search` method to `YourModel` like this
+
+```ruby
+search_by *attributes, **associations # `attributes` and `associations` should be the same syntax as in PgSearch
+```
+
+Example:
+
+```ruby
+class YourModel < Tramway::Core::ApplicationRecord
+  search_by :my_attribute, :another_attribute, my_association: [ :my_association_attribute, :another_my_association_attribute ]
+```
+
 #### 12. Run server `rails s`
 #### 13. Launch `localhost:3000/admin`
 

data/Rakefile

@@ -1,34 +1,10 @@
 # frozen_string_literal: true
 
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require 'rdoc/task'
+require 'rake'
+require 'rspec/core/rake_task'
 
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Tramway::Admin'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = Dir.glob('spec/**/*_spec.rb')
+  t.rspec_opts = '--format documentation'
 end
-
-APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
-load 'rails/tasks/engine.rake'
-
-load 'rails/tasks/statistics.rake'
-
-require 'bundler/gem_tasks'
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-task default: :test
+task default: :spec

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

@@ -31,3 +31,18 @@ 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
+
+  .dates_filter
+    display: flex
+    flex-direction: row

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

@@ -34,8 +34,17 @@ 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?
+                if value.present?
+                  records = decorator_class.list_filters[filter.to_sym][:query].call(records, begin_date, end_date)
+                end
+              end
             end
           end
           hash.merge! collection => records.count
@@ -97,7 +106,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?
+          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,17 @@ 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?
+          if value.present?
+            records = decorator_class.list_filters[filter.to_sym][:query].call(records, begin_date, end_date)
+          end
+        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,35 @@
 - 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|
+              - case filter[1][:type]
+              - when :select
+                .col-md-4
+                  = label_tag t("admin.filters.#{model_class.to_s.underscore}.#{filter[0]}")
+                  = select_tag "list_filters[#{filter[0]}]", build_options_for_select(filter[0], filter[1][:select_collection]), include_blank: true, class: 'form-control'
+              - when :dates
+                .col-md-8.dates_filter
+                  .begin_date
+                    = label_tag t("admin.filters.#{model_class.to_s.underscore}.#{filter[0]}.begin_date")
+                    = text_field_tag "list_filters[#{filter[0]}][begin_date]", '', class: 'form-control', id: 'filter_datepicker_begin_date', value: params.dig(:list_filters, filter[0], :begin_date)
+                  %span
+                    \ -
+                  .end_date
+                    = label_tag t("admin.filters.#{model_class.to_s.underscore}.#{filter[0]}.end_date")
+                    = text_field_tag "list_filters[#{filter[0]}][end_date]", '', class: 'form-control', id: 'filter_datepicker_end_date', value: params.dig(: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.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'tramway/core'
 require 'tramway/admin/engine'
 require 'tramway/admin/singleton_models'
 require 'tramway/admin/records_models'

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '1.31.0.1'
+    VERSION = '1.32.1.1'
   end
 end

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.31.0.1
+  version: 1.32.1.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-05 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: tramway-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.18.3.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.18.3.4
+- !ruby/object:Gem::Dependency
+  name: tramway-auth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: tramway-user
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.3.2
 - !ruby/object:Gem::Dependency
   name: bootstrap-kaminari-views
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +196,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Engine for admin
 email:
 - kalashnikovisme@gmail.com