diff --git a/app/views/assignments/show.html.slim b/app/views/assignments/show.html.slim index 035dc7e63b21eca6197ed915be526f98767e1315..12fdc9ff1d06f6431187d3a932d7b5e5240b9896 100644 --- a/app/views/assignments/show.html.slim +++ b/app/views/assignments/show.html.slim @@ -101,11 +101,11 @@ h4.m-b-10= t('assignment_pdf.client_title') .signature-title-row .col-xs-4 - = t('assignment_pdf.for_aoz') + = t('assignment_pdf.volunteer_title') .col-xs-4 = t('assignment_pdf.client_title') .col-xs-4 - = t('assignment_pdf.volunteer_title') + = t('assignment_pdf.for_aoz') .signature-row .col-xs-4 diff --git a/app/views/group_assignments/show.pdf.slim b/app/views/group_assignments/show.pdf.slim index f1503b759348237945e79c4458fcde7ea2559f2b..c669fcd3212cba8fb7c77c35ea191442c4130786 100644 --- a/app/views/group_assignments/show.pdf.slim +++ b/app/views/group_assignments/show.pdf.slim @@ -68,13 +68,16 @@ h4.m-b-10= t('assignment_pdf.volunteer_title') = t 'assignment_pdf.zurich' = ', ' = l Time.zone.today - .row - .col-xs-5= t('assignment_pdf.for_aoz') - .col-xs-7.col-input - .col-xs-6 - .row - .col-xs-5= t('assignment_pdf.city_date') - .col-xs-7.col-input - .row - .col-xs-5= t('assignment_pdf.volunteer_title_2') - .col-xs-7.col-input + +.signature-title-row + .col-xs-4 + = t('assignment_pdf.volunteer_title') + .col-xs-4 + = t('assignment_pdf.place_contact_person') + .col-xs-4 + = t('assignment_pdf.for_aoz') + +.signature-row + .col-xs-4 + .col-xs-4 + .col-xs-4 \ No newline at end of file diff --git a/config/locales/de.yml b/config/locales/de.yml index f04334630454573d0ec5d6ca76fbc74aac8b69b7..51dbfa455aa0308cb6527b61a63f6ebda94e2a0c 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -794,7 +794,7 @@ de: duration: Treffen mindestens 6 Monate bis email: E-mail first_time: '1.Treffen: Wann, wo?' - for_aoz: Leitung AOZ-Fachstelle Freiwilligenarbeit + for_aoz: AOZ-Fachbereich Freiwilligenarbeit function: Funktion frequency: Wie oft? last_name: Name @@ -811,6 +811,7 @@ de: trial_time: 4 Wochen Probezeit bis volunteer_title: Freiwillige Person volunteer_title_2: Der/die Freiwillige + place_contact_person: AOZ-Ansprechperson vor Ort weekly: 1x pro Woche assignment_description: Was? when: Tag / Zeit diff --git a/db/migrate/20220912145909_update_default_agreement_text2.rb b/db/migrate/20220912145909_update_default_agreement_text2.rb new file mode 100644 index 0000000000000000000000000000000000000000..e24d80c1e67281da10e111098181f3da47f39207 --- /dev/null +++ b/db/migrate/20220912145909_update_default_agreement_text2.rb @@ -0,0 +1,8 @@ +class UpdateDefaultAgreementText2 < ActiveRecord::Migration[6.1] + AGREEMENT_TEXT = "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\nBei Zusammenarbeit mit Minderjährigen:\n* Verpflichtungserklärung zum Schutz der unbegleiteten minderjährigen Asylsuchenden (MNA)\n" + + def change + change_column_default :assignments, :agreement_text, AGREEMENT_TEXT + change_column_default :group_assignments, :agreement_text, AGREEMENT_TEXT + end +end