aoz-003 merge requestshttps://git.panter.ch/open-source/aoz-003/-/merge_requests2018-05-03T18:26:22+02:00https://git.panter.ch/open-source/aoz-003/-/merge_requests/622add new thanks for application submitted text2018-05-03T18:26:22+02:00Tugce Nur Tasadd new thanks for application submitted text[New text on volunteer signup screen](https://trello.com/c/CsQYANuP/119-05h-new-text-on-volunteer-signup-screen)[New text on volunteer signup screen](https://trello.com/c/CsQYANuP/119-05h-new-text-on-volunteer-signup-screen)https://git.panter.ch/open-source/aoz-003/-/merge_requests/610Allow editing login from navigation2018-05-04T18:27:34+02:00Markus Kollermarkus-koller@gmx.chAllow editing login from navigation- https://trello.com/c/rZnzJXoH/7-user-should-be-able-to-edit-its-password
- https://trello.com/c/jMGWLWQ1/121-05h-volunteer-should-be-able-to-edit-its-own-profile
Some notes:
- also exposes the `email` field, not sure if this shoul...- https://trello.com/c/rZnzJXoH/7-user-should-be-able-to-edit-its-password
- https://trello.com/c/jMGWLWQ1/121-05h-volunteer-should-be-able-to-edit-its-own-profile
Some notes:
- also exposes the `email` field, not sure if this should be editable for non-admins
- also removes the confusing "Login bearbeiten" button from `profiles#show` which always goes to the current userhttps://git.panter.ch/open-source/aoz-003/-/merge_requests/513Autocomplete Dropdown um Teilnehmer zu Veranstaltung hinzufügen2018-03-09T08:31:58+01:00Tugce Nur TasAutocomplete Dropdown um Teilnehmer zu Veranstaltung hinzufügen[Trello Story](https://trello.com/c/c4oowRtS/56-autocomplete-dropdown-um-teilnehmer-zu-veranstaltung-hinzuf%C3%BCgen)[Trello Story](https://trello.com/c/c4oowRtS/56-autocomplete-dropdown-um-teilnehmer-zu-veranstaltung-hinzuf%C3%BCgen)https://git.panter.ch/open-source/aoz-003/-/merge_requests/545changes involved_authority_assignments2018-03-23T18:50:11+01:00Emily Wanglerchanges involved_authority_assignmentsVereinbarung Tandems, Vereinbarung Einsätze → Fallführende Stelle im index anzeigen, anstatt "angemeldet von"
[Trello Story] (https://trello.com/c/4AafbAtL/101-fallf%C3%BChrende-stelle-anzeigen)Vereinbarung Tandems, Vereinbarung Einsätze → Fallführende Stelle im index anzeigen, anstatt "angemeldet von"
[Trello Story] (https://trello.com/c/4AafbAtL/101-fallf%C3%BChrende-stelle-anzeigen)https://git.panter.ch/open-source/aoz-003/-/merge_requests/608Changes to confirmation / reminder mailings2018-05-02T18:06:01+02:00Markus Kollermarkus-koller@gmx.chChanges to confirmation / reminder mailings- https://trello.com/c/ppqLgdro/56-confirmation-on-lastsubmittedhoursandfeedback
- https://trello.com/c/tWSshqpc/22-half-year-reminder-list-changes
- https://trello.com/c/sdfIJNyI/36-save-terminate-form-when-clicking-on-restliche-stund...- https://trello.com/c/ppqLgdro/56-confirmation-on-lastsubmittedhoursandfeedback
- https://trello.com/c/tWSshqpc/22-half-year-reminder-list-changes
- https://trello.com/c/sdfIJNyI/36-save-terminate-form-when-clicking-on-restliche-stunden-or-use-nested-fields
Reminder mailings:
![Selection_002](/uploads/2578eef34ddfdd63b09c95b2c44a36b8/Selection_002.png)
Assignment/GroupAssignment termination:
![Selection_001](/uploads/b4d9aeaf713dade27babf695d9f0ef89/Selection_001.png)https://git.panter.ch/open-source/aoz-003/-/merge_requests/600changes/ all controller actions redirect to edit volunteer2018-04-16T22:16:17+02:00Tugce Nur Taschanges/ all controller actions redirect to edit volunteer[Trello Story: Nach Editieren der Masken wieder Maske anzeigen](https://trello.com/c/nYDFSwxu/17-nach-editieren-der-masken-wieder-maske-anzeigen)
* [x] Freiwillige
* [x] Klienten
* [x] Prozesse Beendigung (aus Sicht Volunteer und...[Trello Story: Nach Editieren der Masken wieder Maske anzeigen](https://trello.com/c/nYDFSwxu/17-nach-editieren-der-masken-wieder-maske-anzeigen)
* [x] Freiwillige
* [x] Klienten
* [x] Prozesse Beendigung (aus Sicht Volunteer und Admin)
* [x] Begleitungen
* [x] Gruppenangebotehttps://git.panter.ch/open-source/aoz-003/-/merge_requests/518changes/ update invitation mail content2018-03-14T19:01:40+01:00Tugce Nur Taschanges/ update invitation mail content[Trello Story](https://trello.com/c/MdYFm1dz/29-einladungsmail-vorlage)
Einladungsmail gemäss Jeannine's neuer Vorlage anpassen:
> Liebe/r Freiwillige/r
> Herzlich willkommen! Wir freuen uns, dass Sie sich für einen freiwilligen Ein...[Trello Story](https://trello.com/c/MdYFm1dz/29-einladungsmail-vorlage)
Einladungsmail gemäss Jeannine's neuer Vorlage anpassen:
> Liebe/r Freiwillige/r
> Herzlich willkommen! Wir freuen uns, dass Sie sich für einen freiwilligen Einsatz bei der AOZ entschieden haben.
Bei Ihrer Erstregistrierung auf www.aoz-freiwillige.ch haben Sie folgende E-Mail Adresse angegeben: (Adresse des/der Freiwilligen)
> Bevor wir Ihr Freiwilligen-Profil auf unserer Onlineplattform freischalten können, müssen Sie Ihre E-Mail Adresse bestätigen und ein persönliches Passwort erstellen. Bitte klicken Sie dafür auf folgenden Link:
(Link Einladung annehmen)
> Sollten Sie Schwierigkeiten bei der Registrierung haben, kontaktieren Sie uns.
freiwillige@aoz.ch
oder
Telefon 044 415 67 35
> Freundliche Grüsse
AOZ Fachstelle Freiwilligenarbeithttps://git.panter.ch/open-source/aoz-003/-/merge_requests/651changes/ update mail sender and seeds2018-05-08T17:41:42+02:00Tugce Nur Taschanges/ update mail sender and seeds[Always use info@aoz-freiwillige.ch](https://trello.com/c/Lc3yOxRn/160-always-use-infoaoz-freiwilligech)
[Review Seed text: apply contextual email template seed text](https://trello.com/c/pQlZ9rmI/161-please-review-seed-texts)[Always use info@aoz-freiwillige.ch](https://trello.com/c/Lc3yOxRn/160-always-use-infoaoz-freiwilligech)
[Review Seed text: apply contextual email template seed text](https://trello.com/c/pQlZ9rmI/161-please-review-seed-texts)https://git.panter.ch/open-source/aoz-003/-/merge_requests/613changes/add additional info if available for involved authority2018-05-03T14:29:02+02:00Tugce Nur Taschanges/add additional info if available for involved authority[Trello Story: Assignments PDF: Fill "Fallführende Stelle" automatisch](https://trello.com/c/EcVLPVNO/104-0h-assignments-pdf-fill-fallf%C3%BChrende-stelle-automatisch)
added additional info about involved authority if available for
* [x...[Trello Story: Assignments PDF: Fill "Fallführende Stelle" automatisch](https://trello.com/c/EcVLPVNO/104-0h-assignments-pdf-fill-fallf%C3%BChrende-stelle-automatisch)
added additional info about involved authority if available for
* [x] profession
* [x] departmenthttps://git.panter.ch/open-source/aoz-003/-/merge_requests/689changes/add availability filter on find client2018-05-15T16:33:52+02:00Tugce Nur Taschanges/add availability filter on find client[New filter on find_clients: Availability (Verfügbarkeit)](https://trello.com/c/Vj9HW5w4/68-new-filter-on-findclients-availability-verf%C3%BCgbarkeit)[New filter on find_clients: Availability (Verfügbarkeit)](https://trello.com/c/Vj9HW5w4/68-new-filter-on-findclients-availability-verf%C3%BCgbarkeit)https://git.panter.ch/open-source/aoz-003/-/merge_requests/548changes/add creator_name and creator_function to certificate enable editing2018-03-22T20:34:55+01:00Tugce Nur Taschanges/add creator_name and creator_function to certificate enable editing[Trello Story](https://trello.com/c/Ckztdf3z/65-dossier-freiwillig-engagiert-anpassungen)
Name und Funktion des Superadmins/FW-Verantworlichen im Dokument Footer soll anpassbar sein[Trello Story](https://trello.com/c/Ckztdf3z/65-dossier-freiwillig-engagiert-anpassungen)
Name und Funktion des Superadmins/FW-Verantworlichen im Dokument Footer soll anpassbar seinhttps://git.panter.ch/open-source/aoz-003/-/merge_requests/550changes/add generated amount to billingexpenses pdf table2018-03-22T19:43:17+01:00Tugce Nur Taschanges/add generated amount to billingexpenses pdf table[Trello Story](https://trello.com/c/9CDwXRnK/62-spesenformular-pdf-anpassungen)
Automatisch in der Box ausgefüllt:
* [x] ~~Jahr(in welchem Jahr erstellt)~~ *bereits gewährleistet*
* [x] Betrag[Trello Story](https://trello.com/c/9CDwXRnK/62-spesenformular-pdf-anpassungen)
Automatisch in der Box ausgefüllt:
* [x] ~~Jahr(in welchem Jahr erstellt)~~ *bereits gewährleistet*
* [x] Betraghttps://git.panter.ch/open-source/aoz-003/-/merge_requests/695Changes/add linebreaks signupmail2018-05-15T19:10:49+02:00Tugce Nur TasChanges/add linebreaks signupmail[makre sure that emails contain linebreaks -> signup](https://trello.com/c/ipRh3Ah7/166-make-sure-that-emails-contain-line-breaks)[makre sure that emails contain linebreaks -> signup](https://trello.com/c/ipRh3Ah7/166-make-sure-that-emails-contain-line-breaks)https://git.panter.ch/open-source/aoz-003/-/merge_requests/697changes/add print button to volunteer show and edit2018-05-16T13:56:03+02:00Tugce Nur Taschanges/add print button to volunteer show and edit[add print buttons to volunteer show and edit](https://trello.com/c/wwWbaHGh/181-print-of-volunteers)[add print buttons to volunteer show and edit](https://trello.com/c/wwWbaHGh/181-print-of-volunteers)https://git.panter.ch/open-source/aoz-003/-/merge_requests/544Changes/affirmation and stati renaming2018-03-22T14:34:51+01:00Tugce Nur TasChanges/affirmation and stati renaming[Trello Story](https://trello.com/c/dg44K9lw/102-bessere-begriffe-affirmation-status-usw)
* [x] Affirmation -> Prozess
* [x] Status FW-Einsatzes -> FW-Nachfrage[Trello Story](https://trello.com/c/dg44K9lw/102-bessere-begriffe-affirmation-status-usw)
* [x] Affirmation -> Prozess
* [x] Status FW-Einsatzes -> FW-Nachfragehttps://git.panter.ch/open-source/aoz-003/-/merge_requests/659changes/Buttons on Group Offers edit&show2018-05-10T18:03:03+02:00Tugce Nur Taschanges/Buttons on Group Offers edit&show[1. Story: Buttons on Group Offers edit/show](https://trello.com/c/mjyGFA5c/179-buttons-on-group-offers-edit-show)
On group offers edit/show please add the following buttons:
* De/Activate Group offer (including warning)
* End Group Of...[1. Story: Buttons on Group Offers edit/show](https://trello.com/c/mjyGFA5c/179-buttons-on-group-offers-edit-show)
On group offers edit/show please add the following buttons:
* De/Activate Group offer (including warning)
* End Group Offer (including warning)
* [x] edit
* [x] de/activate
* [x] de/activate warning
* [x] terminate
* [x] terminate warning
* [x] print
* [x] show
* [x] de/activate
* [x] de/activate warning
* [x] terminate
* [x] terminate warning
* [x] print
[2. Story: GroupOffers#index Changes](https://trello.com/c/1o6JHHVd/178-groupoffersindex-changes)
* [x] Add a new Filter for Status Aktiv/Inaktiv (like for example on Volunteers)
* [x] Remove the terminate button
* [x] Remove the activate/deactivate button
* [x] Remove the download button
https://git.panter.ch/open-source/aoz-003/-/merge_requests/680changes/comment policies updates2018-05-14T18:51:28+02:00Tugce Nur Taschanges/comment policies updates* [x] [add Bemerkungen to GroupOffers](https://trello.com/c/mCi1s1Ph/113-group-offers-need-a-bemerkungen-field)
* [x] [Make sure that "Bemerkungen" are only visible to Superadmins and FW-Verantwortliche](https://trello.com/c/l5XjFmUu/1...* [x] [add Bemerkungen to GroupOffers](https://trello.com/c/mCi1s1Ph/113-group-offers-need-a-bemerkungen-field)
* [x] [Make sure that "Bemerkungen" are only visible to Superadmins and FW-Verantwortliche](https://trello.com/c/l5XjFmUu/169-make-sure-that-bemerkungen-are-only-visible-to-superadmins-and-fw-verantwortliche)
* [x] Clients
* [x] Volunteers
* [x] Assignements
* [x] Group Assignementshttps://git.panter.ch/open-source/aoz-003/-/merge_requests/543Changes/consistent pdf info2018-03-22T14:37:32+01:00Tugce Nur TasChanges/consistent pdf info[Trello Story](https://trello.com/c/hdPjo3kG/109-header-footer-von-pdfs-telefonnummer-usw)
Header / Footer von PDFs (Telefonnummer usw)
Immer dieselbe EMail Adresse im Kopf: freiwillige@aoz.ch
Immer: www.aoz.ch/freiwilligenarbei...[Trello Story](https://trello.com/c/hdPjo3kG/109-header-footer-von-pdfs-telefonnummer-usw)
Header / Footer von PDFs (Telefonnummer usw)
Immer dieselbe EMail Adresse im Kopf: freiwillige@aoz.ch
Immer: www.aoz.ch/freiwilligenarbeit
Telefonnummer: Nummer des Superadmins eintragen der das Dokument erstellt
* [x] Begleitung
* [x] Gruppenangebot
* [x] Dossier Freiwillig Engagiert
* [x] Spesenauszahlunghttps://git.panter.ch/open-source/aoz-003/-/merge_requests/696changes/Do not show Profile links to not accessible Volunteers for Freiwillig...2018-05-16T12:11:10+02:00Tugce Nur Taschanges/Do not show Profile links to not accessible Volunteers for Freiwilligenverantwortliche[Do not show Profile links to not accessible Volunteers for Freiwilligenverantwortliche](https://trello.com/c/fDgYpo3H/128-do-not-show-profile-links-to-not-accessible-volunteers-for-freiwilligenverantwortliche)[Do not show Profile links to not accessible Volunteers for Freiwilligenverantwortliche](https://trello.com/c/fDgYpo3H/128-do-not-show-profile-links-to-not-accessible-volunteers-for-freiwilligenverantwortliche)https://git.panter.ch/open-source/aoz-003/-/merge_requests/667Changes/group offer changes2018-05-14T11:31:30+02:00Tugce Nur TasChanges/group offer changes* [x] [On GroupOffers#index change the description of the Button "Anzeigen" to „Anzeigen/ Freiwillige hinzufügen“](https://trello.com/c/bgdKwjLY/173-on-groupoffersindex-change-the-description-of-the-button-anzeigen-to-anzeigen-freiwill...* [x] [On GroupOffers#index change the description of the Button "Anzeigen" to „Anzeigen/ Freiwillige hinzufügen“](https://trello.com/c/bgdKwjLY/173-on-groupoffersindex-change-the-description-of-the-button-anzeigen-to-anzeigen-freiwillige-hinzuf%C3%BCgen)
* [x] [Add "Intern/Extern" on GroupOffers#Index](https://trello.com/c/e45o07hT/107-add-inter-extern-on-groupoffersindex)
* [x] Intern/Extern filter
* [x] Intern/Extern as last row