egov_utils 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62a3bb3945d7477f7ea854dad437e3ee90e92314
-  data.tar.gz: '0941f20def3bb8c65e07af94961dea9669e31c2e'
+  metadata.gz: 3bee9e427897dfb93fc4f42d0b146def3c4cdd0c
+  data.tar.gz: 625f0ca14a939d628e64b2cff3ba81d3fdadc74d
 SHA512:
-  metadata.gz: bef0cd8b502f832ca3dbfc0c05662ead83ce9a5fdfcbefdc6ed4d262defe9b51a7ebcd7daa53bba55cff0d0e036e472081a368105e7cd1f655e70f3a926342e6
-  data.tar.gz: 00b53ade30c51f8d562dd77e11a29cf0db4e275c88b5b86558c82da9743bf72c10a9819fb238800ec242830fda3a35c8b629d5086a65d89d5d8ad8ce935c0169
+  metadata.gz: b9a9f694b7d5e2ee741ae28fb7459fe0242921b76a53e0a113d629e8dba33510faee48f826c08577a9c06009106ddcedf0d48e78b24af168b91b11c7cab3e390
+  data.tar.gz: e352cfd5672c519d8363b5c69a576e2f6b9e7ccacb6a341b3f9236c0d9ea1620fd84c5278024879c44d2db6c42017041510368796981512b58cac7bacf9b1f46

data/README.md

@@ -14,6 +14,9 @@ To be done:
 * ISDS SSO integration
 
 ## Usage
+
+Detailed developers documentation can be found at [Documentation](https://git.servis.justice.cz/libraries/egov_utils-rails/wikis/Documentation).
+
 Framework uses configuration in file config/config.yml
 
 ### LDAP

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

@@ -21,3 +21,4 @@
 //= require i18n/translations
 //= require egov_utils/eGovUtilities
 //= require egov_utils/roles
+//= require egov_utils/file_uid

data/app/assets/javascripts/egov_utils/file_uid.coffee

@@ -0,0 +1,65 @@
+$ = jQuery
+
+$.widget 'egov_utils.fileUid',
+  options:
+    available_agendas: ['T', 'TN']
+
+  _create: ()->
+    that = this
+
+    @container = $('<span></span>', class: 'egov-file-uid', style: 'position: relative; display: block;')
+    @file_uid_gui = @_create_file_uid_gui()
+
+    @container.insertAfter(@element)
+    @container.append(@element).append(@file_uid_gui)
+
+    @element.css(position: 'absolute', top: 0, left: 0, 'background-color': 'transparent')
+
+    @form = @element.closest('form')
+    @form.on 'submit', (evt)->
+      that.element.val(that.getValue())
+
+    if @element.val() != ''
+      this.setValue( @element.val() )
+
+  _destroy: ()->
+    @element.attr('style', '')
+    @element.insertAfter(@container)
+    @container.remove()
+
+
+  _create_file_uid_gui: (default_value)->
+    container = $('<div></div>', class: 'court_file_uid input-group')
+    @parts = [
+      $('<input type="text" name="senat" class="form-control senat"><input type="hidden" value="-">'),
+      $('<select type="text" name="agenda" class="form-control agenda"></select>'),
+      $('<input type="hidden" value="-"><input type="text" name="cislo_pripadu" class="form-control cislo_pripadu"><div class="input-group-addon">/</div><input type="hidden" value="/">'),
+      $('<input type="text" class="form-control">')
+    ]
+    for agenda in @options.available_agendas
+      @parts[1].append('<option value="'+agenda+'">'+agenda+'</option>')
+
+    for part in @parts
+      container.append(part)
+    container
+
+  setValue: (value)->
+    if value.indexOf('/') < 0
+      console.warn('Value for file uid has to have a "/" in it')
+      return false
+    flvl_ary = value.split('/')
+    @parts[@parts.length - 1].val(flvl_ary[1])
+    slvl_ary = flvl_ary[0].split('-')
+    if slvl_ary.length != 3
+      console.warn('Value for file uid has to have 2times "-" in it')
+      return false
+
+    @file_uid_gui.find('.senat').val(slvl_ary[0])
+    @file_uid_gui.find('.agenda').val(slvl_ary[1])
+    @file_uid_gui.find('.cislo_pripadu').val(slvl_ary[2])
+
+  getValue: ()->
+    value = ''
+    @file_uid_gui.find(':input').each (i, part)->
+      value += $(part).val()
+    value

data/app/models/egov_utils/person.rb

@@ -2,7 +2,7 @@ module EgovUtils
   class Person < ApplicationRecord
 
     validates :firstname, :lastname, :birth_date, presence: true
-    validates :birth_date, uniqueness: { scope: [:firstname, :lastname] }
+    validates :birth_date, uniqueness: { scope: [:firstname, :lastname] }, birthday: true
 
     def fullname
       firstname.to_s + ' ' + lastname.to_s

data/app/validators/birthday_validator.rb

@@ -0,0 +1,7 @@
+class BirthdayValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    return if options[:allow_nil] && value.presence.nil?
+    record.errors.add(attribute, :in_past) if !value || value >= Time.now.to_date
+    record.errors.add(attribute, :after_1920) if !value || value <= Date.new(1930, 1, 1)
+  end
+end

data/app/validators/fileuid_validator.rb

@@ -0,0 +1,8 @@
+class FileuidValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    return if options[:allow_nil] && value.presence.nil?
+    unless value =~ /\A\d+-\w{1,4}-\d+\/\d{4}\z/i
+      record.errors.add(attribute, (options[:message] || :fileuid_format))
+    end
+  end
+end

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

@@ -5,11 +5,13 @@ $ ->
     create_attributes ||= {}
   %>
 
-  $('body').off 'egov:submitted'
-  $('body').on 'egov:submitted', '#modal', (evt, data)->
+  after_modal_submit = (evt, data)->
     grid = $("#<%= grid_id %>").swidget()
     grid.dataSource.read()
 
+  $('body').off 'egov:submitted', after_modal_submit
+  $('body').on 'egov:submitted', '#modal', after_modal_submit
+
   <%# would be a bit cleaner to give the filled form to the shield grid create method, then send the form by ajax %>
   createRecord = (evt)->
     $.ajax('<%= new_polymorphic_path(schema.model, create_attributes.merge(format: :js)) %>')

data/app/views/egov_utils/people/_form.html.haml

@@ -1,3 +1,3 @@
 = form.text_field(:firstname)
 = form.text_field(:lastname)
-= form.date_field(:birth_date, data: {'date-view-mode' => 'decades'})
+= form.date_field(:birth_date, data: {'date-view-mode' => 'decades', 'date-min-date' => Date.new(1920, 1, 1).to_s, 'date-max-date' => Date.today.to_s, 'date-use-current' => false, 'date-view-date' => Date.new(1950, 1, 1).to_s })

data/app/views/layouts/egov_utils/_messages.html.haml

@@ -2,6 +2,6 @@
 - flash.each do |name, msg|
   - if msg.is_a?(String)
     %div{:class => "alert alert-#{name.to_s == 'notice' ? "info" : "alert"} alert-dismissible fade show", "role" => "alert"}
-      %button.close{'type' => 'button', 'data-dissmis' => 'alert'}
+      %button.close{'type' => 'button', 'data-dismiss' => 'alert'}
         %span{'aria-hidden' => 'true'}= raw '×'
       = msg

data/config/locales/cs.yml

@@ -55,6 +55,7 @@ cs:
     profile:
       too_many_authors: Příliš mnoho autorů
 
+
   labels: &my_labels
     user:
       password: Heslo
@@ -89,3 +90,6 @@ cs:
     messages:
       ico_format: Není správný formát IČO
       email_format: není e-mail
+      in_past: Musí být v minulosti
+      after_1920: Musí být po roce 1920
+      fileuid_format: Nesprávný tvar spisové značky

data/lib/bootstrap_form/fileuid.rb

@@ -0,0 +1,15 @@
+require 'egov_utils/helpers/tags/fileuid_field'
+
+module BootstrapForm
+  module Fileuid
+
+    def fileuid_field(method, options={})
+      form_group_builder(method, options) do
+        prepend_and_append_input(options) do
+          @template.fileuid_field(@object_name, method, objectify_options(options))
+        end
+      end
+    end
+
+  end
+end

data/lib/egov_utils/engine.rb

@@ -55,18 +55,26 @@ module EgovUtils
       # end
     end
 
+    initializer 'egov_utils.view_helpers' do
+      ActiveSupport.on_load(:action_view) do
+        require 'egov_utils/helpers/form_helper'
+        include ::EgovUtils::Helpers::FormHelper
+      end
+    end
+
     initializer 'egov_utils.bootstrap_form' do
       require 'bootstrap_form'
 
       require 'bootstrap_form/helpers/bootstrap4'
       require 'bootstrap_form/datetimepicker'
+      require 'bootstrap_form/fileuid'
       BootstrapForm::Helpers::Bootstrap.__send__(:prepend, BootstrapForm::Helpers::Bootstrap4)
 
       BootstrapForm::DATE_FORMAT = 'DD/MM/YYYY'
       ruby_format_string = BootstrapForm::DATE_FORMAT.gsub('YYYY', "%Y").gsub('MM', "%m").gsub('DD', "%d")
 
       BootstrapForm::FormBuilder.__send__(:prepend, BootstrapForm::Datetimepicker)
-
+      BootstrapForm::FormBuilder.__send__(:prepend, BootstrapForm::Fileuid)
 
       ActionView::Helpers::Tags::DateField.redefine_method(:format_date) do |value|
         value.try(:strftime, ruby_format_string)
@@ -81,5 +89,11 @@ module EgovUtils
     #   Rails.application.reload_routes!
     #   OmniAuth.config.path_prefix = "#{Rails.application.routes.named_routes[:egov_utils].path.spec.to_s}/auth"
     # end
+
+    initializer 'egov_utils.initialize_factory_paths', after: 'factory_bot.set_factory_paths' do
+      if bot_module = 'FactoryBot'.safe_constantize
+        FactoryBot.definition_file_paths << EgovUtils::Engine.root.join('spec', 'factories')
+      end
+    end
   end
 end

data/lib/egov_utils/helpers/form_helper.rb

@@ -0,0 +1,14 @@
+module EgovUtils
+  module Helpers
+    module FormHelper
+
+      # Returns an input tag of the "fileuid" type tailored for accessing a specified attribute (identified by +method+) on an object
+      # assigned to the template (identified by +object+). Additional options on the input tag can be passed as a
+      # hash with +options+.
+      def fileuid_field(object_name, method, options = {})
+        Tags::FileuidField.new(object_name, method, self, options).render
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+module EgovUtils
+  module Helpers
+    module Tags
+      class FileuidField < ActionView::Helpers::Tags::TextField
+
+        def render
+          res = super
+          res << @template_object.javascript_tag(javascript_str(@options))
+          res
+        end
+
+        private
+          def all_agendas
+            ['T', 'Tm', 'INS', 'E'] # a dalsi
+          end
+
+          def javascript_str(options)
+            agendas = all_agendas
+            agendas &= @options.delete('agendas') if @options['agendas']
+            index = name_and_id_index(options)
+            tag_id = @options.fetch("id") { tag_id(index) }
+
+            str = "$(function(){"
+            str << "  $('##{tag_id}').fileUid({ available_agendas: #{ agendas.to_json } });"
+            str << "  var destroy_evt_method = function(evt){"
+            str << "    $('##{tag_id}').fileUid('destroy');"
+            str << "    $(document).off('turbolinks:before-cache', destroy_evt_method);"
+            str << "  };"
+            str << "  $(document).on('turbolinks:before-cache', destroy_evt_method);"
+            str << "});"
+            pp str
+            str
+          end
+
+      end
+    end
+  end
+end

data/lib/egov_utils/test_utils/controller_helpers.rb

@@ -0,0 +1,29 @@
+module EgovUtils
+  module TestUtils
+    module ControllerHelpers
+
+      def default_user(params={})
+        user = FactoryBot.create(:egov_utils_user, params)
+        user
+      end
+
+      def admin_user
+        default_user(roles: ['admin'])
+      end
+
+      def basic_user
+        default_user(roles: ['user'])
+      end
+
+      def anonymous_user
+        u = default_user
+        allow(user).to receive(:persisted?).and_return(false)
+        u
+      end
+
+      def sign_in(user = basic_user)
+        allow(controller).to receive(:find_current_user).and_return(user)
+      end
+    end
+  end
+end

data/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '0.1.12'
+  VERSION = '0.1.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2017-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -276,6 +276,7 @@ files:
 - app/assets/config/egov_utils_manifest.js
 - app/assets/javascripts/egov_utils/application.js
 - app/assets/javascripts/egov_utils/eGovUtilities.coffee.erb
+- app/assets/javascripts/egov_utils/file_uid.coffee
 - app/assets/javascripts/egov_utils/groups.js
 - app/assets/javascripts/egov_utils/roles.coffee.erb
 - app/assets/javascripts/egov_utils/setup_locale.coffee.erb
@@ -314,7 +315,9 @@ files:
 - app/schemas/egov_utils/address_schema.rb
 - app/schemas/egov_utils/person_schema.rb
 - app/schemas/egov_utils/user_schema.rb
+- app/validators/birthday_validator.rb
 - app/validators/email_validator.rb
+- app/validators/fileuid_validator.rb
 - app/validators/ico_validator.rb
 - app/views/common/_grid.html.coffee
 - app/views/common/_modal.html.haml
@@ -342,11 +345,15 @@ files:
 - db/migrate/20170809150646_create_egov_utils_people.rb
 - db/migrate/20170824111701_create_egov_utils_groups.rb
 - lib/bootstrap_form/datetimepicker.rb
+- lib/bootstrap_form/fileuid.rb
 - lib/bootstrap_form/helpers/bootstrap4.rb
 - lib/egov_utils.rb
 - lib/egov_utils/auth_source.rb
 - lib/egov_utils/engine.rb
 - lib/egov_utils/has_audit_trail.rb
+- lib/egov_utils/helpers/form_helper.rb
+- lib/egov_utils/helpers/tags/fileuid_field.rb
+- lib/egov_utils/test_utils/controller_helpers.rb
 - lib/egov_utils/user_utils/application_controller_patch.rb
 - lib/egov_utils/user_utils/role.rb
 - lib/egov_utils/version.rb