egov_utils 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41e5e8f0fddbd48afc8de52397c54112e05b6bdab136dcc6b47cdf6591192af9
-  data.tar.gz: 153fe8400cbc5054d67ede4ad80baab8c4c5c2b36d9d9195e851e077219f98e0
+  metadata.gz: 8f0a5aac085108bad75499b396f611a9c5b91608f2f5db34dee6c1d12ca5a0d2
+  data.tar.gz: b87be337d3c809736b4dcd02e57dd1d6983067bfcb9a8f0428e25e2ed89b6257
 SHA512:
-  metadata.gz: 0d05de0762d92b03dd8c1437ea176030976cf3f9e78ae732b91859cc934b9a0b7de3f9a78e08f622870c2568966c02fca953c54d364ba95785c452f241f710b5
-  data.tar.gz: fffee71ae833b7930c9ec2706bdebc9aaa01c8670063409055f8703e3e6e0389b8228e3122ac87e15e69dbc7134d4f000381b822e7b16c8112546484083f42bc
+  metadata.gz: a61664e8179f266af435cf10c6edfbccb7b0ab0717289f9e1ffa0915b58e02df9fc192a96e1a09bba42310ccc681930a419a3043e162d7c8cefb511389de4ce1
+  data.tar.gz: d54bb74ce6c19c7c3c828a6fe4ef832d06f4c10f017981b9b353fde4f0dd661b5bafbc093b8dd07e501ffc4c61c8e6553e500a430ccf83938a87ebc7223820d7

data/app/controllers/egov_utils/registration_requests_controller.rb

@@ -48,13 +48,18 @@ module EgovUtils
       params
         .require(:registration_requests_create)
         .permit(:mail, :firstname, :lastname, :organization, :note,
-                :supervisor_name, :supervisor_phone, :supervisor_email)
+                :supervisor_name, :supervisor_phone, :supervisor_email,
+                :supervisor_assignment)
     end
 
     def update_params
       params
         .require(:registration_request)
-        .permit(:status, :reason, :internal_reason, roles: [])
+        .permit(:status, :reason, :internal_reason, roles: [], group_ids: [])
+        .tap do |p|
+          p[:roles] = p[:roles].reject(&:blank?)
+          p[:group_ids] = p[:group_ids].reject(&:blank?)
+        end
     end
   end
 end

data/app/models/egov_utils/registration_request.rb

@@ -4,7 +4,7 @@ module EgovUtils
               :supervisor_name, presence: true
     validate :check_user_already_exists!
 
-    attr_accessor :roles
+    attr_accessor :roles, :group_ids
 
     def fullname
       "#{firstname} #{lastname}"

data/app/services/egov_utils/refresh_groups.rb

@@ -2,7 +2,7 @@ module EgovUtils
   class RefreshGroups
 
     def call
-      hsh = groups.each_with_object({}) do |group, memo|
+      hsh = remote_groups.each_with_object({}) do |group, memo|
         infos = group.ldap_members
         infos.each do |info|
           memo[info] ||= []
@@ -11,17 +11,19 @@ module EgovUtils
       end
 
       hsh.each do |info, groups|
-        user = EgovUtils::User.find_by(login: info[:login])
+        user = EgovUtils::User.where("login ILIKE ?", info[:login]).first
         next unless user
 
         all_groups = user.groups.where(ldap_uid: nil) + groups
-        user.update(info.merge(groups: all_groups))
+        info[:login] = info[:login].downcase
+        info[:mail] = info[:mail].downcase
+        user.update(info.except(:dn).merge(groups: all_groups))
       end
     end
 
     private
 
-    def groups
+    def remote_groups
       EgovUtils::Group.where.not(ldap_uid: nil)
     end
   end

data/app/services/egov_utils/registration_requests/create.rb

@@ -9,6 +9,7 @@ module EgovUtils
       string :supervisor_name
       string :supervisor_phone
       string :supervisor_email
+      string :supervisor_assignment
 
       def execute
         request = RegistrationRequest.create(inputs.merge(status: :pending))

data/app/services/egov_utils/registration_requests/handle_request.rb

@@ -8,6 +8,9 @@ module EgovUtils
       array :roles, default: [] do
         string
       end
+      array :group_ids, default: [] do
+        integer
+      end
 
       def execute
         registration_request.update(
@@ -34,14 +37,15 @@ module EgovUtils
       private
 
       def create_user!
-        user = User.create(
+        User.create(
           mail: registration_request.mail,
           login: registration_request.mail,
           firstname: registration_request.firstname,
           lastname: registration_request.lastname,
           password: password,
           password_confirmation: password,
-          roles: roles.compact_blank,
+          roles: roles,
+          group_ids: group_ids,
           must_change_password: true,
           active: true,
           last_login_at: Time.current
@@ -54,4 +58,3 @@ module EgovUtils
     end
   end
 end
-

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

@@ -1,4 +1,3 @@
-= form.text_field(:name)
 = bootstrap_form_for(@group) do |f|
   = f.text_field :name
   = f.collection_check_boxes :roles, EgovUtils::UserUtils::Role.roles, :first, ->(role) { I18n.t("roles.#{role.first}") }

data/app/views/egov_utils/registration_requests/new.html.haml

@@ -10,6 +10,7 @@
   %h2= t('.supervisor')
   %em= t('.supervisor_info')
   = f.text_field(:supervisor_name)
+  = f.text_field(:supervisor_assignment)
   = f.text_field(:supervisor_email)
   = f.text_field(:supervisor_phone)
   = f.submit t(:label_registration_request)

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

@@ -20,6 +20,9 @@
     %tr
       %th= EgovUtils::RegistrationRequest.human_attribute_name('supervisor_name')
       %td= @registration_request.supervisor_name
+    %tr
+      %th= EgovUtils::RegistrationRequest.human_attribute_name('supervisor_assignment')
+      %td= @registration_request.supervisor_assignment
     %tr
       %th= EgovUtils::RegistrationRequest.human_attribute_name('supervisor_email')
       %td= @registration_request.supervisor_email
@@ -42,18 +45,27 @@
 
 - if @registration_request.status == 'pending'
   = bootstrap_form_for(@registration_request, url: '#') do |f|
+    = f.collection_radio_buttons :status, ['accepted', 'rejected'], :itself, ->(status) { t(".decision_status.#{status}") }, label: t('.decision')
+
     = f.text_area(:reason)
     = f.text_area(:internal_reason)
-    = f.hidden_field(:status, value: nil)
-    = f.collection_check_boxes :roles, EgovUtils::UserUtils::Role.roles, :first, ->(role) { I18n.t("roles.#{role.first}") }
 
-    = f.submit t('.accept'), class: 'btn btn-success', data: { value: 'accepted' }
-    = f.submit t('.reject'), class: 'btn btn-danger', data: { value: 'rejected' }
+    #roles-groups.d-none
+      = f.collection_check_boxes :roles, EgovUtils::UserUtils::Role.roles, :first, ->(role) { I18n.t("roles.#{role.first}") }
+      = f.collection_check_boxes :group_ids, EgovUtils::Group.where(ldap_uid: nil), :id, :name
+
+    = f.submit t('.save'), class: 'btn btn-primary'
 
 :javascript
   $(function() {
-    $('input[type=submit]').click(function(e) {
-      var status = $(this).data('value');
-      $('#registration_request_status').val(status);
+    $('input[type=radio]').click(function(e) {
+      var status = $(this).val();
+
+      console.log(status)
+      if (status === 'accepted') {
+        $('#roles-groups').removeClass('d-none');
+      } else {
+        $('#roles-groups').addClass('d-none');
+      }
     });
   });

data/config/locales/cs.yml

@@ -48,7 +48,7 @@ cs:
   warning_password_not_changed: Heslo nebylo změněno, zadali jste všechna hesla správně?
 
 
-  label_approve: Schválit
+  label_approve: Aktivovat
   label_new: Nový
   label_create: Vytvořit
   label_edit: Upravit
@@ -154,8 +154,11 @@ cs:
       reason: Odůvodnění
       internal_reason: Interní poznámka
       supervisor_name: 'Jméno schvalující osoby'
+      supervisor_assignment: 'Funkce schvalující osoby'
       supervisor_email: 'Kontaktní e-mail schvalující osoby'
       supervisor_phone: 'Kontaktní telefon na schvalující osobu'
+      roles: Role
+      groups: Skupiny
   active_interaction:
     attributes:
       egov_utils/registration_requests/create:
@@ -170,6 +173,7 @@ cs:
         reason: Odůvodnění
         internal_reason: Interní poznámka
         supervisor_name: 'Jméno schvalující osoby'
+        supervisor_assignment: 'Funkce schvalující osoby'
         supervisor_email: 'Kontaktní e-mail schvalující osoby'
         supervisor_phone: 'Kontaktní telefon na schvalující osobu'
 
@@ -266,8 +270,11 @@ cs:
         title: 'Žádosti o přístup do aplikace'
       show:
         title: 'Žádost o registraci - %{name}'
-        accept: 'Přijmout žádost'
-        reject: 'Odmítnout žádost'
+        decision: 'Rozhodnutí'
+        decision_status:
+          accepted: 'Přijmout žádost'
+          rejected: 'Odmítnout žádost'
+        save: 'Potvrdit'
     sessions:
       new:
         registration_request: 'Žádost o registraci'

data/db/migrate/20231006131159_add_supervisor_assignment_to_registration_requests.rb

@@ -0,0 +1,7 @@
+class AddSupervisorAssignmentToRegistrationRequests < ActiveRecord::Migration[6.1]
+  def change
+    add_column :egov_utils_registration_requests,
+               :supervisor_assignment,
+               :string
+  end
+end

data/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '1.2.4'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-09 00:00:00.000000000 Z
+date: 2023-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -655,6 +655,7 @@ files:
 - db/migrate/20230408123813_create_egov_utils_registration_requests.rb
 - db/migrate/20230412063325_add_days_before_archive_to_egov_utils_users.rb
 - db/migrate/20230427091407_add_fields_to_registration_requests.rb
+- db/migrate/20231006131159_add_supervisor_assignment_to_registration_requests.rb
 - lib/azahara_schema_currency.rb
 - lib/azahara_schema_currency/aggregation_attribute_patch.rb
 - lib/azahara_schema_currency/association_attribute_patch.rb