egov_utils 0.3.12 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a95d6fe7f9000bfac0bb24de5acade1576a49025702c5cf88d59e31544cbb7f
-  data.tar.gz: c896bf16364563056d2287637a341acd87e464968d7d7596ab253be25fd1bd18
+  metadata.gz: 2290ad2369d8330daa5b454e76bc5f042931f191e10697178b86bc08c5412fb5
+  data.tar.gz: cd4db6767c26c648c93bb6f70038ce294b0f8f215fb684cb7177a14af3ccbe50
 SHA512:
-  metadata.gz: 9fe9ea839119567599ee76678e0db5561215676c0738d57f6dc8c0f10f7f7a4c230399daa0433c011913ce6bd399d40f67d4b669c4dd3bd39ae1bb09a85b031d
-  data.tar.gz: 10a37f44366e72459915ded44329b3e3982c4b9c8ce6913dbad5eff5a54a1b9fed2ddbd3f655b2cb453f50e170356369c0556f233cd3fc8200251d67fca01433
+  metadata.gz: 65b89e4897982f5c62154dfacf26addab9ddffa031ff19c9425998a42c36d39f440ec1dbac5d2de30cd199b707983df3ed2f68bb3ca5770e738ca76de4934fa5
+  data.tar.gz: 55905eab4a285b84c1f1dc47f2d31cc4fa5ea2a92d612018695314227c949364295cc7895038d2dd76cdb5976d4554d8aa5453ec80e26f583d90829c8595f1a3

data/app/assets/javascripts/egov_utils/application.js

@@ -14,7 +14,7 @@
 //= require moment/cs
 //= require popper
 //= require bootstrap-sprockets
-//= require bootstrap-datetimepicker
+//= require tempusdominus-bootstrap-4
 //= require shieldui-all.min
 //= require select2/select2
 //= require select2/i18n/cs

data/app/assets/javascripts/egov_utils/eGovUtilities.coffee.erb

@@ -13,17 +13,17 @@ window.eGovUtilities =
     $.fn.select2.defaults.set( "theme", "bootstrap" )
 
     # datepicker defaults
-    $.extend $.fn.datetimepicker.defaults.icons, {
-      time: 'fa fa-clock-o',
-      date: 'fa fa-calendar',
-      up: 'fa fa-chevron-up',
-      down: 'fa fa-chevron-down',
-      previous: 'fa fa-chevron-left',
-      next: 'fa fa-chevron-right',
-      today: 'fa fa-calendar-check-o',
-      clear: 'fa fa-trash-o',
-      close: 'fa fa-close'
-    }
+    # $.extend $.fn.datetimepicker.Constructor.Default.icons, {
+    #   time: 'fa fa-clock-o',
+    #   date: 'fa fa-calendar',
+    #   up: 'fa fa-chevron-up',
+    #   down: 'fa fa-chevron-down',
+    #   previous: 'fa fa-chevron-left',
+    #   next: 'fa fa-chevron-right',
+    #   today: 'fa fa-calendar-check-o',
+    #   clear: 'fa fa-trash-o',
+    #   close: 'fa fa-close'
+    # }
 
     $(document).on 'change', '.custom-file-input:file', ()->
       $input = $(this)
@@ -54,13 +54,13 @@ window.eGovUtilities =
     $container ||= $(document)
     if !Modernizr.inputtypes.date
       pickers = $('[type="date"][data-provide="datepicker"]', $container)
-      pickers.parent().datetimepicker()
+      pickers.addClass('datetimepicker-input').parents().datetimepicker({allowInputToggle: true})
     if !Modernizr.inputtypes.datetime
       pickers = $('[type="datetime"][data-provide="datepicker"]', $container)
-      pickers.parent().datetimepicker()
+      pickers.addClass('datetimepicker-input').parents().datetimepicker({allowInputToggle: true})
     if !Modernizr.inputtypes['datetime-local']
       pickers = $('[type="datetime-local"][data-provide="datepicker"]', $container)
-      pickers.parent().datetimepicker()
+      pickers.addClass('datetimepicker-input').parents().datetimepicker({allowInputToggle: true})
 
   initPeople: ($container)->
     $container ||= $(document)

data/app/assets/stylesheets/egov_utils/egov_utils.scss

@@ -1,5 +1,7 @@
 /* all css to be included in main app */
 
+@import "tempusdominus-bootstrap-4";
+
 @import 'select2/select2';
 @import 'egov_utils/select2-bootstrap';
 

data/app/views/common/_grid.html.coffee

@@ -109,7 +109,7 @@ $ ->
       <% schema.columns.each do |col| %>
       <%= raw column_for_grid(grid, col) %>
       <% end %>
-      <% if can?(:update, schema.model) || can?(:destroy, schema.model) %>
+      <% if can?(:update, schema.model) || (local_assigns.fetch(:allow_delete, false) && can?(:destroy, schema.model)) %>
       {
         width: 150
         title: "<%= t('label_actions') %>"

data/app/views/egov_utils/users/_users_tab.html.haml

@@ -1,7 +1,7 @@
 %table.table#users
   %thead
     %tr
-      %th= t('model_attributes.user.fullname')
+      %th= EgovUtils::User.human_attribute_name('fullname')
       %th= EgovUtils::User.human_attribute_name('provider')
       %th= EgovUtils::User.human_attribute_name('roles')
       %th= EgovUtils::User.human_attribute_name('groups')

data/lib/bootstrap_form/check_box_patch.rb

@@ -12,37 +12,7 @@ module BootstrapForm
       end
       options[:label_class] = label_classes.compact.join(' ')
 
-
-      check_box_options[:class] = ['form-check-input', check_box_options[:class]].compact.join(' ')
-
-
-      html = check_box_without_bootstrap(name, check_box_options, checked_value, unchecked_value)
-      label_content = block_given? ? capture(&block) : options[:label]
-      html.concat(' ').concat(label_content || (object && object.class.human_attribute_name(name)) || name.to_s.humanize)
-
-      label_name = name
-      # label's `for` attribute needs to match checkbox tag's id,
-      # IE sanitized value, IE
-      # https://github.com/rails/rails/blob/c57e7239a8b82957bcb07534cb7c1a3dcef71864/actionview/lib/action_view/helpers/tags/base.rb#L116-L118
-      if options[:multiple]
-        label_name =
-          "#{name}_#{checked_value.to_s.gsub(/\s/, "_").gsub(/[^-\w]/, "").downcase}"
-      end
-
-      disabled_class = " disabled" if options[:disabled]
-      label_class    = options[:label_class]
-
-      if options[:inline]
-        label_class = " #{label_class}" if label_class
-        label(label_name, html, class: "checkbox-inline#{disabled_class}#{label_class}")
-      else
-        wrapper_class = ['form-check', options[:wrapper_class]]
-        wrapper_class << error_class if has_error?(name)
-        wrapper_class = wrapper_class.compact.join(' ')
-        content_tag(:div, class: "#{wrapper_class}#{disabled_class}") do
-          label(label_name, html, class: label_class).concat(generate_help(name, options[:help]))
-        end
-      end
+      super
     end
 
   end

data/lib/bootstrap_form/datetimepicker.rb

@@ -2,9 +2,9 @@ module BootstrapForm
   module Datetimepicker
     def date_field(name, *args)
       options = args.extract_options!.symbolize_keys!
-      options[:datetimepicker] = true
-      options[:data] = {'date-format' => 'L', 'date-extra-formats' => [BootstrapForm::DATE_FORMAT_JS]}.merge(options[:data] || {})
-      options[:append] = calendar_addon
+      prepare_options(name, options)
+      options[:input_group][:data].merge!({'date-format' => 'L', 'date-extra-formats' => [BootstrapForm::DATE_FORMAT_JS]}.merge(options[:data] || {}))
+      append_min_max(BootstrapForm::DATE_FORMAT_RUBY, options)
       args << options
       super
     end
@@ -19,9 +19,9 @@ module BootstrapForm
 
     def datetime_local_field(name, *args)
       options = args.extract_options!.symbolize_keys!
-      options[:datetimepicker] = true
-      options[:data] = {'date-extra-formats' => [BootstrapForm::DATE_FORMAT_JS+"THH:mm"+(options[:include_seconds] ? ':ss' : '')]}.merge(options[:data] || {})
-      options[:append] = calendar_addon
+      prepare_options(name, options)
+      options[:input_group][:data].merge!({'date-extra-formats' => [BootstrapForm::DATE_FORMAT_JS+"THH:mm"+(options[:include_seconds] ? ':ss' : '')]}.merge(options[:data] || {}))
+      append_min_max(BootstrapForm::DATE_FORMAT_RUBY+"T%T", options)
       args << options
       super
     end
@@ -30,8 +30,37 @@ module BootstrapForm
 
     private
 
+      def prepare_options(name, options)
+        input_group_id = default_group_id(name)
+        options[:datetimepicker] = true
+        options[:append] = calendar_addon
+        options[:input_group_class] = 'date'
+        options[:input_group] ||= {}
+        options[:input_group][:id] = input_group_id
+        options[:input_group][:data] = {'target-input' => 'nearest'}
+        options[:append_tag] = {data: {toggle: 'datetimepicker', target: '#' + input_group_id}}
+        options[:data] ||= {}
+        options[:data][:target] = '#' + input_group_id
+      end
+
+      def append_min_max(format, options)
+        options[:input_group][:data].merge!('date-min-date' => options[:min].try(:strftime, format), 'date-max-date' => options[:max].try(:strftime, format))
+      end
+
       def calendar_addon
-        content_tag('i', '', class: 'input-group-text fa fa-calendar')
+        content_tag('i', '', class: 'fa fa-calendar')
+      end
+
+      def default_group_id(method_name)
+        "#{sanitized_object_name}_#{sanitized_method_name(method_name)}_group"
+      end
+
+      def sanitized_object_name
+        @object_name.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
+      end
+
+      def sanitized_method_name(method_name)
+        method_name.to_s.sub(/\?$/, "")
       end
   end
 end

data/lib/bootstrap_form/fileuid.rb

@@ -5,7 +5,7 @@ module BootstrapForm
 
     def fileuid_field(method, options={})
       form_group_builder(method, options) do
-        prepend_and_append_input(options) do
+        prepend_and_append_input(method, options) do
           @template.fileuid_field(@object_name, method, objectify_options(options))
         end
       end

data/lib/bootstrap_form/helpers/bootstrap4.rb

@@ -7,6 +7,21 @@ module BootstrapForm
         super(name, options)
       end
 
+
+      # TODO check upstream - append tag options
+      def prepend_and_append_input(name, options, &block)
+        options = options.extract!(:prepend, :append, :input_group_class, :append_tag, :input_group)
+        input_group_class = ["input-group", options[:input_group_class]].compact.join(' ')
+
+        input = capture(&block) || "".html_safe
+
+        input = content_tag(:div, input_group_content(options[:prepend]), class: 'input-group-prepend') + input if options[:prepend]
+        input << content_tag(:div, input_group_content(options[:append]), (options[:append_tag] || {}).merge(class: 'input-group-append')) if options[:append]
+        input << generate_error(name)
+        input = content_tag(:div, input, (options[:input_group] || {}).merge(class: input_group_class)) unless options.empty?
+        input
+      end
+
     end
   end
 end

data/lib/bootstrap_form/select2.rb

@@ -1,20 +1,10 @@
 module BootstrapForm
   module Select2
 
-    if Gem::Version.new(::Rails::VERSION::STRING) >= Gem::Version.new("4.1.0")
-      def select2(method, choices = nil, options = {}, html_options = {}, &block)
-        form_group_builder(method, options, html_options) do
-          prepend_and_append_input(options) do
-            @template.select2(@object_name, method, choices, objectify_options(options), @default_options.merge(html_options), &block)
-          end
-        end
-      end
-    else
-      def select2(method, choices, options = {}, html_options = {}, &block)
-        form_group_builder(method, options, html_options) do
-          prepend_and_append_input(options) do
-            @template.select2(@object_name, method, choices, objectify_options(options), @default_options.merge(html_options))
-          end
+    def select2(method, choices = nil, options = {}, html_options = {}, &block)
+      form_group_builder(method, options, html_options) do
+        prepend_and_append_input(method, options) do
+          @template.select2(@object_name, method, choices, objectify_options(options), @default_options.merge(html_options), &block)
         end
       end
     end

data/lib/egov_utils.rb

@@ -1,8 +1,10 @@
 require 'jquery-rails'
 require 'jquery-ui-rails'
+require 'font-awesome-sass'
 require 'bootstrap'
 require 'bootstrap_form'
 require 'momentjs-rails'
+require 'bootstrap4-datetime-picker-rails'
 
 require 'egov_utils/fileuid'
 require 'egov_utils/model_permissions'

data/lib/egov_utils/engine.rb

@@ -108,8 +108,8 @@ module EgovUtils
       require 'bootstrap_form/check_box_patch'
       BootstrapForm::FormBuilder.__send__(:prepend, BootstrapForm::CheckBoxPatch)
 
+      #TODO: same as redefine method down?
       require 'egov_utils/helpers/tags/datetime_field_patch'
-      ActionView::Helpers::Tags::DatetimeField.prepend(EgovUtils::Helpers::Tags::DatetimeFieldPatch)
       ActionView::Helpers::Tags::DatetimeLocalField.prepend(EgovUtils::Helpers::Tags::DatetimeLocalFieldPatch)
 
       ActionView::Helpers::Tags::DateField.redefine_method(:format_date) do |value|

data/lib/egov_utils/helpers/tags/datetime_field_patch.rb

@@ -1,22 +1,6 @@
 module EgovUtils
   module Helpers
     module Tags
-      module DatetimeFieldPatch
-
-        def render
-          pickerize_options! if @options.stringify_keys['datetimepicker']
-          super
-        end
-
-        protected
-
-          def pickerize_options!
-            options = @options.stringify_keys
-            picker_data = {'provide' => 'datepicker', 'date-min-date' => format_date(datetime_value(options["min"])), 'date-max-date' => format_date(datetime_value(options["max"])) }
-            @options[:data] = picker_data.merge(options['data'] || {})
-          end
-
-      end
 
       module DatetimeLocalFieldPatch
         private

data/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '0.3.12'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.4.1
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-30 00:00:00.000000000 Z
+date: 2018-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -268,14 +268,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 4.0.0.dev
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 4.0.0.dev
+- !ruby/object:Gem::Dependency
+  name: bootstrap4-datetime-picker-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: momentjs-rails
   requirement: !ruby/object:Gem::Requirement