Commit d357100c authored by Hussain Kashef's avatar Hussain Kashef

add field Other Autorities Weitere involvierte Stellen in Klient/innen

parent 95398b25
Pipeline #50113 failed with stage
in 24 minutes and 30 seconds
......@@ -129,7 +129,7 @@ class ClientsController < ApplicationController
params.require(:client).permit(
:gender_request, :age_request, :other_request, :birth_year, :salutation,
:nationality, :entry_date, :permit, :goals, :education, :interests, :acceptance,
:comments, :additional_comments, :involved_authority_id, :competent_authority,
:comments, :additional_comments, :involved_authority_id, :competent_authority, :other_authorities,
:actual_activities, :cost_unit, language_skills_attributes, relatives_attributes,
contact_attributes, availability_attributes
)
......
......@@ -44,6 +44,8 @@ nav.navbar.section-navigation
th= t_attr(:involved_authority, Client)
th.truncate-th
span= sort_link @q, :competent_authority, t_attr(:competent_authority, Client)
th.truncate-th
span= sort_link @q, :other_authorities, t_attr(:other_authorities, Client)
th.truncate-th
span= sort_link @q, :created_at, t_attr(:created_at, Client)
- if policy(Client).show_comments?
......@@ -76,6 +78,7 @@ nav.navbar.section-navigation
- if policy(Client).superadmin_privileges?
td= link_to client.involved_authority.full_name, profile_url_path(client.involved_authority) if client.involved_authority
td= client.competent_authority
td= client.other_authorities
td.no-wrap= l(client.created_at.to_date)
- if policy(Client).show_comments?
= td_truncate_content_modal(client.comments, 'Bemerkungen')
......
......@@ -31,6 +31,7 @@ tr id=dom_id(client)
- if policy(Client).superadmin_privileges?
td= link_to client.involved_authority.full_name, profile_url_path(client.involved_authority) if client.involved_authority
td= client.competent_authority
td= client.other_authorities
td.no-wrap= l(client.created_at.to_date)
- if policy(Client).show_comments?
= td_truncate_content_modal(client.comments, 'Bemerkungen')
......@@ -66,9 +66,6 @@ fieldset
= f.input :age_request, collection: Client::AGE_REQUESTS, default: :age_no_matter
= f.input :other_request
fieldset
legend Verfügbarkeit?
= render 'availability/form', f: f
.col-xs-12.col-md-6
fieldset
legend Interne Kriterien
......@@ -78,6 +75,16 @@ fieldset
= f.association :involved_authority, collection: @social_workers
= f.input :competent_authority
= f.input :other_authorities
.row
.col-xs-12.col-md-6
fieldset
legend Verfügbarkeit?
= render 'availability/form', f: f
.row
.col-xs-12.col-md-6
fieldset
legend= t_attr(:cost_unit)
= f.input :cost_unit, collection: Client.cost_unit_collection, include_blank: true, label_html: { class: 'sr-only' }
......
......@@ -27,6 +27,8 @@ h1 Klient/innen
th= sort_link @q, :involved_authority_profile_contact_full_name, t_attr(:involved_authority)
th.truncate-th
span= sort_link @q, :competent_authority, t_attr(:competent_authority, Client)
th.truncate-th
span= sort_link @q, :other_authorities, t_attr(:other_authorities, Client)
th.truncate-th
span= sort_link @q, :created_at, t_attr(:created_at, Client)
- if policy(Client).show_comments?
......
......@@ -59,6 +59,10 @@ h1.m-b-20= @client.contact.full_name
td= t_attr(:competent_authority)
td= @client.competent_authority
tr
td= t_attr(:other_authorities)
td= @client.other_authorities
tr
td Kostenträger
td
......
......@@ -333,6 +333,7 @@ de:
cost_unit: Kostenträger
city: Stadt
competent_authority: Anmeldende Stelle
other_authorities: Weitere involvierte Stellen
date_of_year: Geburtsjahr
education: Beruf oder Ausbildung im Herkunftsland
entry_date: Einreisedatum
......
class AddOtherAuthoritiesToClients < ActiveRecord::Migration[5.1]
def change
add_column :clients, :other_authorities, :text
end
end
......@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20190314100216) do
ActiveRecord::Schema.define(version: 20190703153811) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
......@@ -114,7 +114,7 @@ ActiveRecord::Schema.define(version: 20190314100216) do
t.text "agreement_text", default: "Freiwillige beachten folgende Grundsätze während ihres Einsatzes in der AOZ:\n* Verhaltenskodex für Freiwillige\n* Rechte und Pflichten für Freiwillige\n* AOZ Leitlinien Praktische Integrationsarbeit\n\nAllenfalls auch\n* Verpflichtungserklärung zum Schutz der unbegleiteten minderjährigen Asylsuchenden (MNA)\n* Niederschwellige Gratis-Deutschkurse: Informationen für freiwillige Kursleitende\n"
t.string "pdf_file_name"
t.string "pdf_content_type"
t.integer "pdf_file_size"
t.bigint "pdf_file_size"
t.datetime "pdf_updated_at"
t.bigint "submitted_by_id"
t.bigint "reactivated_by_id"
......@@ -217,6 +217,7 @@ ActiveRecord::Schema.define(version: 20190314100216) do
t.text "additional_comments"
t.bigint "reactivated_by_id"
t.datetime "reactivated_at"
t.text "other_authorities"
t.index ["acceptance"], name: "index_clients_on_acceptance"
t.index ["accepted_at"], name: "index_clients_on_accepted_at"
t.index ["birth_year"], name: "index_clients_on_birth_year"
......@@ -383,7 +384,7 @@ ActiveRecord::Schema.define(version: 20190314100216) do
t.text "agreement_text", default: "Freiwillige beachten folgende Grundsätze während ihres Einsatzes in der AOZ:\n* Verhaltenskodex für Freiwillige\n* Rechte und Pflichten für Freiwillige\n* AOZ Leitlinien Praktische Integrationsarbeit\n\nAllenfalls auch\n* Verpflichtungserklärung zum Schutz der unbegleiteten minderjährigen Asylsuchenden (MNA)\n* Niederschwellige Gratis-Deutschkurse: Informationen für freiwillige Kursleitende\n"
t.string "pdf_file_name"
t.string "pdf_content_type"
t.integer "pdf_file_size"
t.bigint "pdf_file_size"
t.datetime "pdf_updated_at"
t.bigint "submitted_by_id"
t.bigint "reactivated_by_id"
......@@ -553,7 +554,7 @@ ActiveRecord::Schema.define(version: 20190314100216) do
t.datetime "updated_at", null: false
t.string "avatar_file_name"
t.string "avatar_content_type"
t.integer "avatar_file_size"
t.bigint "avatar_file_size"
t.datetime "avatar_updated_at"
t.datetime "deleted_at"
t.boolean "flexible", default: false
......@@ -771,7 +772,7 @@ ActiveRecord::Schema.define(version: 20190314100216) do
t.datetime "deleted_at"
t.string "avatar_file_name"
t.string "avatar_content_type"
t.integer "avatar_file_size"
t.bigint "avatar_file_size"
t.datetime "avatar_updated_at"
t.bigint "user_id"
t.string "rejection_type"
......
......@@ -49,6 +49,7 @@ class ClientsTest < ApplicationSystemTestCase
select('Angemeldet', from: 'Prozess')
fill_in 'Bemerkungen', with: 'asdfasdf'
fill_in 'Anmeldende Stelle', with: 'asdfasdf'
fill_in 'Weitere involvierte Stellen' with;: 'asdfasdf'
select @social_worker.full_name, from: 'Fallführende Stelle'
select('Gemeinde', from: 'Kostenträger')
page.check('client_evening')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment