egov_utils 0.2.13 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0180df0129a941cc5e555901b831867c2540fb9fba09d2ae8ac4d174e07606d7'
-  data.tar.gz: 9790504b20a2987452da2433aa0364de5d0d6b1ad59d3646cfdf3d2b761dda4a
+  metadata.gz: db8d02864512bcde337488cdcff4446ab6603d612ff7fe85aebcae592abad8a5
+  data.tar.gz: 887cb22e5ead25efd16576a9c9481336a5e669a57f485d18933b6be05462f495
 SHA512:
-  metadata.gz: c458ee913a5c0b9c6727db5283b971cec87fcbea447ee540d665201addfed1a3ca396fe5019d9d4128348bf717c711330c05e1654fc1bef4849561d90a2935b6
-  data.tar.gz: f455d3005cdaa372d499ac0fc42a288814554249cf8b909ac625b11c10673d098647fefd94c2c7e2fa994af5eecca5fca4473058a7740f70d1f9fdca648632f4
+  metadata.gz: 621e9e7fbcf99247224f07289dad00275d4f06251e17e4f9cf7e482bed13692cca82690fe880b81d83df56684ff6be65a7c987c6e934621b67821d65dab2f42a
+  data.tar.gz: b8b6df91a246ad9216f149bf5eea8fbad81947830ae553763a49aa8906ddffbd7807b12163f5dbe0c6086307a9bf4aeadff72cd7397a15a071631538b7980203

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

@@ -30,6 +30,7 @@ window.eGovUtilities =
     eGovUtilities.initDatepickers($container)
     eGovUtilities.initSelect2($container)
     eGovUtilities.initFileFields($container)
+    eGovUtilities.initPeople($container)
 
   clearBeforeCache: ($container)->
     $container ||= $(document)
@@ -53,6 +54,15 @@ window.eGovUtilities =
       pickers = $('[type="datetime-local"][data-provide="datepicker"]', $container)
       pickers.parent().datetimepicker()
 
+  initPeople: ($container)->
+    $container ||= $(document)
+    $('.person-form .person-type-toggle', $container).on('change', (evt)->
+      val = $(this).val();
+      $form = $(this).closest('.person-form');
+      $form.find('.natural_person').toggle( val == 'natural').find(':input').prop('disabled', val != 'natural');
+      $form.find('.legal_person').toggle( val == 'legal').find(':input').prop('disabled', val != 'legal');
+    ).change()
+
   initSelect2: ($container)->
     $container ||= $(document)
     $('[data-provide="select2"]', $container).select2()

data/app/attributes/egov_utils/legal_form_attribute.rb

@@ -0,0 +1,13 @@
+module EgovUtils
+  class LegalFormAttribute < AzaharaSchema::Attribute
+
+    def initialize(model, name)
+      super(model, name, 'love')
+    end
+
+    def available_values
+      @available_values ||= EgovUtils::LegalForm.all.collect{|lf| [lf.name, lf.key] }
+    end
+
+  end
+end

data/app/models/egov_utils/abstract_person.rb

@@ -0,0 +1,7 @@
+module EgovUtils
+  class AbstractPerson < ApplicationRecord
+
+    self.abstract_class = true
+
+  end
+end

data/app/models/egov_utils/legal_person.rb

@@ -0,0 +1,15 @@
+module EgovUtils
+  class LegalPerson < AbstractPerson
+
+    belongs_to :person, class_name: 'EgovUtils::Person'
+
+    def fullname
+      name
+    end
+
+    def to_s
+      "#{fullname} (#{ico})"
+    end
+
+  end
+end

data/app/models/egov_utils/natural_person.rb

@@ -0,0 +1,18 @@
+module EgovUtils
+  class NaturalPerson < AbstractPerson
+
+    belongs_to :person, class_name: 'EgovUtils::Person'
+
+    validates :firstname, :lastname, :birth_date, presence: true
+    validates :birth_date, uniqueness: { scope: [:firstname, :lastname] }, birthday: true
+
+    def fullname
+      firstname.to_s + ' ' + lastname.to_s
+    end
+
+    def to_s
+      "#{fullname} (#{I18n.t(:text_born_on_at, place: birth_place, date: I18n.l(birth_date.to_date))})"
+    end
+
+  end
+end

data/app/models/egov_utils/person.rb

@@ -2,18 +2,28 @@ module EgovUtils
   class Person < ApplicationRecord
 
     belongs_to :residence, class_name: 'EgovUtils::Address', optional: true
+    has_one :natural_person
+    has_one :legal_person
 
-    validates :firstname, :lastname, :birth_date, presence: true
-    validates :birth_date, uniqueness: { scope: [:firstname, :lastname] }, birthday: true
+    enum person_type: { natural: 1, legal: 16 }
 
-    accepts_nested_attributes_for :residence
+    validates :person_entity, presence: true
 
-    def fullname
-      firstname.to_s + ' ' + lastname.to_s
+    accepts_nested_attributes_for :residence, :natural_person, :legal_person
+
+    delegate :fullname, :fullname=, to: :person_entity
+
+    def person_entity
+      case person_type
+      when 'natural'
+        natural_person
+      when 'legal'
+        legal_person
+      end
     end
 
     def to_s
-      "#{fullname} (#{I18n.t(:text_born_on_at, place: birth_place, date: I18n.l(birth_date.to_date))})"
+      person_entity.to_s
     end
 
   end

data/app/resources/egov_utils/legal_form.rb

@@ -0,0 +1,9 @@
+module EgovUtils
+  class LegalForm < Love
+
+    def self.find_by_key(key)
+      where(key: key).first
+    end
+
+  end
+end

data/app/resources/egov_utils/love.rb

@@ -1,5 +1,21 @@
 require 'activeresource'
 
+
+module EgovUtils
+  module AzaharaJsonResourceFormat
+    include ActiveResource::Formats::JsonFormat
+    extend self
+
+    def decode(json)
+      resources = super(json)
+      (resources.is_a?(Hash) && resources.key?('entities')) ? resources['entities'] : resources
+    end
+
+  end
+end
+
+
+
 module EgovUtils
   class Love < ::ActiveResource::Base
 
@@ -9,6 +25,8 @@ module EgovUtils
     end
 
     self.site = "#{config['love_url'] || Rails.configuration.try(:love_url)}/api/v1/"
+    self.format = EgovUtils::AzaharaJsonResourceFormat
+
 
     def self.where(clauses = {})
       raise ArgumentError, "expected a clauses Hash, got #{clauses.inspect}" unless clauses.is_a? Hash

data/app/schemas/egov_utils/abstract_person_schema.rb

@@ -0,0 +1,5 @@
+module EgovUtils
+  class AbstractPersonSchema < AzaharaSchema::ModelSchema
+
+  end
+end

data/app/schemas/egov_utils/legal_person_schema.rb

@@ -0,0 +1,14 @@
+module EgovUtils
+  class LegalPersonSchema < AzaharaSchema::ModelSchema
+
+    def self.attribute(model, attr_name, attr_type=nil)
+      case attr_name
+      when 'legal_form'
+        LegalFormAttribute.new(model, attr_name)
+      else
+        super
+      end
+    end
+
+  end
+end

data/app/schemas/egov_utils/natural_person_schema.rb

@@ -0,0 +1,15 @@
+module EgovUtils
+  class NaturalPersonSchema < AzaharaSchema::ModelSchema
+
+    def main_attribute_name
+      'fullname'
+    end
+
+    def initialize_available_attributes
+      @available_attributes ||= []
+      @available_attributes << AzaharaSchema::DerivedAttribute.new(model, 'fullname', :concat, 'firstname', 'lastname', schema: self)
+      super
+    end
+
+  end
+end

data/app/schemas/egov_utils/person_schema.rb

@@ -7,7 +7,7 @@ module EgovUtils
 
     def initialize_available_attributes
       @available_attributes ||= []
-      @available_attributes << AzaharaSchema::DerivedAttribute.new(model, 'fullname', :concat, 'firstname', 'lastname', schema: self)
+      @available_attributes << AzaharaSchema::DerivedAttribute.new(model, 'fullname', :concat, 'natural_person-fullname', 'legal_person-name', schema: self)
       super
     end
 

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

@@ -1,8 +1,18 @@
-.row
-  .col-12.col-sm-6= form.text_field(:firstname)
-  .col-12.col-sm-6= form.text_field(:lastname)
-  .col-12.col-sm-6= 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 })
-  .col-12.col-sm-6= form.text_field(:birth_place)
-  .col-12
-    = form.fields_for(:residence, person.residence || EgovUtils::Address.new) do |fields|
-      = render 'egov_utils/addresses/form', form: fields, address: fields.object
+.person-form
+  .row
+    .col-12= form.select :person_type, enum_values_for_select(person.class, :person_type), {}, class: 'person-type-toggle'
+  .natural_person.row
+    = form.fields_for(:natural_person, person.natural_person || EgovUtils::NaturalPerson.new) do |fields|
+      .col-12.col-sm-6= fields.text_field(:firstname)
+      .col-12.col-sm-6= fields.text_field(:lastname)
+      .col-12.col-sm-6= fields.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 })
+      .col-12.col-sm-6= fields.text_field(:birth_place)
+  .legal_person.row
+    = form.fields_for(:legal_person, person.legal_person || EgovUtils::LegalPerson.new) do |fields|
+      .col-12= fields.text_field(:name)
+      .col-12.col-sm-6= fields.text_field(:ico)
+      .col-12.col-sm-6= fields.select2 :legal_form, list_values_for_select(azahara_attribute_for(EgovUtils::LegalPerson, 'legal_form'))
+  .row
+    .col-12
+      = form.fields_for(:residence, person.residence || EgovUtils::Address.new) do |fields|
+        = render 'egov_utils/addresses/form', form: fields, address: fields.object

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

@@ -1 +1,2 @@
-= current_user.fullname
+%h3= current_user.fullname
+= current_user.mail || current_user.login

data/app/views/layouts/egov_utils/mailer.html.erb

@@ -8,7 +8,13 @@
   </head>
 
   <body>
-    Dobrý den,<br />
+    <p>
+      <% if content_for?(:greeting) %>
+      <%= yield :greeting %>
+      <% else %>
+      Dobrý den,
+      <% end %>
+    </p>
     <br />
     <%= yield %>
     <br />

data/app/views/layouts/egov_utils/mailer.text.erb

@@ -1,4 +1,8 @@
+<% if content_for?(:greeting) %>
+<%= yield :greeting %>
+<% else %>
 Dobrý den,
+<% end %>
 
 <%= yield %>
 

data/config/locales/cs.yml

@@ -46,6 +46,7 @@ cs:
   label_new: Nový
   label_edit: Upravit
   label_profile: Profil
+  label_change_password: Změnit heslo
   label_login: Přihlásit
   label_logout: Odhlásit
   label_signup: Registrovat
@@ -104,13 +105,22 @@ cs:
       region: Kraj
       country: Země
     egov_utils/person:
+      person_type: Typ osoby
+      person_types:
+        natural: Fyzická
+        legal: Právnická
+    egov_utils/abstract_person:
       fullname: Celé jméno
+    egov_utils/natural_person:
       firstname: Jméno
       lastname: Příjmení
       birth_date: Datum narození
       birth_place: Místo narození
       residence: Bydliště
-
+    egov_utils/legal_person:
+      name: Název
+      ico: IČO
+      legal_form: Právní forma
 
   models_errors: &my_model_errors
     profile:

data/db/migrate/20180403132853_rename_people_to_natural_people.rb

@@ -0,0 +1,9 @@
+class RenamePeopleToNaturalPeople < ActiveRecord::Migration[5.1]
+  def up
+    rename_table :egov_utils_people, :egov_utils_natural_people
+  end
+
+  def down
+    rename_table :egov_utils_natural_people, :egov_utils_people
+  end
+end

data/db/migrate/20180403133155_create_egov_utils_people_base.rb

@@ -0,0 +1,9 @@
+class CreateEgovUtilsPeopleBase < ActiveRecord::Migration[5.1]
+  def change
+    create_table :egov_utils_people do |t|
+      t.integer :person_type
+      t.string :joid
+      t.references :residence, foreign_key: {to_table: :egov_utils_addresses}
+    end
+  end
+end

data/db/migrate/20180403141531_join_people_tables.rb

@@ -0,0 +1,23 @@
+class JoinPeopleTables < ActiveRecord::Migration[5.1]
+  def up
+    add_reference :egov_utils_natural_people, :person, foreign_key: { to_table: :egov_utils_people }
+    select_rows("SELECT id, residence_id FROM egov_utils_natural_people").each do |row|
+      if row.second
+        value = exec_insert("INSERT INTO egov_utils_people (person_type, residence_id) VALUES (1, #{row.second})", "person create")
+      else
+        value = exec_insert("INSERT INTO egov_utils_people (person_type) VALUES (1)", "person create")
+      end
+      id_value = ActiveRecord::Base.connection.send(:last_inserted_id, value)
+      execute("UPDATE egov_utils_natural_people SET person_id = #{id_value} WHERE id = #{row.first}")
+    end
+    # remove_reference :egov_utils_natural_people, :residence
+  end
+
+  def down
+    add_reference :egov_utils_natural_people, :residence, foreign_key: { to_table: :egov_utils_addresses }
+    EgovUtils::NaturalPerson.preload(:person).all.each do |np|
+      np.update_column(:residence_id, np.person.residence_id)
+    end
+    remove_reference :egov_utils_natural_people, :person, foreign_key: { to_table: :egov_utils_people }
+  end
+end

data/db/migrate/20180403150556_create_egov_utils_legal_people.rb

@@ -0,0 +1,10 @@
+class CreateEgovUtilsLegalPeople < ActiveRecord::Migration[5.1]
+  def change
+    create_table :egov_utils_legal_people do |t|
+      t.references :person, foreign_key: { to_table: :egov_utils_people }
+      t.string :name
+      t.string :ico
+      t.integer :legal_form
+    end
+  end
+end

data/lib/egov_utils.rb

@@ -5,6 +5,7 @@ require 'bootstrap_form'
 require 'momentjs-rails'
 
 require 'egov_utils/fileuid'
+require 'egov_utils/model_permissions'
 
 require "egov_utils/engine"
 

data/lib/egov_utils/model_permissions.rb

@@ -0,0 +1,52 @@
+module EgovUtils
+  class ModelPermissions
+
+    def self.build(model, user)
+      klass = model
+      klasses = [klass]
+      while klass != klass.base_class
+        klass = klass.superclass
+        klasses << klass
+      end
+      klasses.each do |kls|
+        perm_class = "#{kls.name}Permissions".safe_constantize
+        return perm_class.new(user) if perm_class
+      end
+      EgovUtils::ModelPermissions.new(model, user)
+    end
+
+    attr_reader :model, :user
+
+    def initialize(model, user)
+      @model, @user = model, user
+    end
+
+    def readable_attributes(action=:show)
+      model.column_names
+    end
+
+    def basic_editable_attributes(action=:update)
+      model.column_names - ['id', 'updated_at', 'created_at']
+    end
+
+    def basic_editable_attributes_for(entity, action=:update)
+      basic_editable_attributes(action)
+    end
+
+    def editable_attributes(action=:update)
+      attributes = basic_editable_attributes(action)
+      assocs = model.reflect_on_all_associations.select{|assoc| model.method_defined?("#{assoc.name}_attributes=".to_sym) }
+      attributes << assocs.each_with_object({}) {|assoc, obj| obj["#{assoc.name}_attributes"] = self.class.build(assoc.klass, user).editable_attributes(action) }
+      attributes
+    end
+
+    #TODO nested attributes should take entity as well - what to do with has_many?
+    def editable_attributes_for(entity, action=:update)
+      attributes = basic_editable_attributes(action)
+      assocs = model.reflect_on_all_associations.select{|assoc| model.method_defined?("#{assoc.name}_attributes=".to_sym) }
+      attributes << assocs.each_with_object({}) {|assoc, obj| obj["#{assoc.name}_attributes"] = self.class.build(assoc.klass, user).editable_attributes_for(action) }
+      attributes
+    end
+
+  end
+end

data/lib/egov_utils/user_utils/application_controller_patch.rb

@@ -59,6 +59,14 @@ module EgovUtils
         return false
       end
 
+      def editable_attributes(model, action=:update)
+        EgovUtils::ModelPermissions.build(model, current_user).editable_attributes(action)
+      end
+
+      def editable_attributes_for(entity, action=:update)
+        EgovUtils::ModelPermissions.build(entity.type, current_user).editable_attributes_for(entity, action)
+      end
+
       protected
         def find_current_user
           # existing session

data/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '0.2.13'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.3.0
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-21 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -310,14 +310,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: egon_gate
   requirement: !ruby/object:Gem::Requirement
@@ -388,6 +388,7 @@ files:
 - app/attributes/egov_utils/all_role_names.rb
 - app/attributes/egov_utils/district.rb
 - app/attributes/egov_utils/full_address.rb
+- app/attributes/egov_utils/legal_form_attribute.rb
 - app/attributes/egov_utils/region.rb
 - app/controllers/egov_utils/addresses_controller.rb
 - app/controllers/egov_utils/application_controller.rb
@@ -409,17 +410,24 @@ files:
 - app/mailers/egov_utils/application_mailer.rb
 - app/mailers/egov_utils/user_mailer.rb
 - app/models/ability.rb
+- app/models/egov_utils/abstract_person.rb
 - app/models/egov_utils/address.rb
 - app/models/egov_utils/application_record.rb
 - app/models/egov_utils/audit_detail.rb_bac
 - app/models/egov_utils/audit_record.rb_bac
 - app/models/egov_utils/group.rb
+- app/models/egov_utils/legal_person.rb
+- app/models/egov_utils/natural_person.rb
 - app/models/egov_utils/person.rb
 - app/models/egov_utils/principal.rb
 - app/models/egov_utils/user.rb
+- app/resources/egov_utils/legal_form.rb
 - app/resources/egov_utils/love.rb
 - app/resources/egov_utils/organization.rb
+- app/schemas/egov_utils/abstract_person_schema.rb
 - app/schemas/egov_utils/address_schema.rb
+- app/schemas/egov_utils/legal_person_schema.rb
+- app/schemas/egov_utils/natural_person_schema.rb
 - app/schemas/egov_utils/person_schema.rb
 - app/schemas/egov_utils/user_schema.rb
 - app/validators/birthday_validator.rb
@@ -481,6 +489,10 @@ files:
 - db/migrate/20171115142450_add_confirmation_code_to_users.rb
 - db/migrate/20180125133500_add_password_generation_to_egov_utils_users.rb
 - db/migrate/20180126131416_create_egov_utils_groups_users.rb
+- db/migrate/20180403132853_rename_people_to_natural_people.rb
+- db/migrate/20180403133155_create_egov_utils_people_base.rb
+- db/migrate/20180403141531_join_people_tables.rb
+- db/migrate/20180403150556_create_egov_utils_legal_people.rb
 - lib/bootstrap_form/check_box_patch.rb
 - lib/bootstrap_form/custom_file_field.rb
 - lib/bootstrap_form/datetimepicker.rb
@@ -495,6 +507,7 @@ files:
 - lib/egov_utils/helpers/form_helper.rb
 - lib/egov_utils/helpers/tags/datetime_field_patch.rb
 - lib/egov_utils/helpers/tags/fileuid_field.rb
+- lib/egov_utils/model_permissions.rb
 - lib/egov_utils/redmine/issue.rb
 - lib/egov_utils/routes/admin_constraint.rb
 - lib/egov_utils/settings.rb