aoz-003 merge requestshttps://git.panter.ch/open-source/aoz-003/-/merge_requests2018-07-19T13:32:04+02:00https://git.panter.ch/open-source/aoz-003/-/merge_requests/803fix wrong date between scope for with_billable_hours and hours semester scopes2018-07-19T13:32:04+02:00Kaspar Vollenweidervok@panter.chfix wrong date between scope for with_billable_hours and hours semester scopes- they where useing date_between instead of date_between_inclusion
https://trello.com/c/ifCA8Ou4/213-bug-semester-scopes-are-useing-datebetween-instead-of-datebetweeninclusion- they where useing date_between instead of date_between_inclusion
https://trello.com/c/ifCA8Ou4/213-bug-semester-scopes-are-useing-datebetween-instead-of-datebetweeninclusionKaspar Vollenweidervok@panter.chKaspar Vollenweidervok@panter.chhttps://git.panter.ch/open-source/aoz-003/-/merge_requests/801fix scope for responsibles filter generation for develop2018-07-17T19:35:28+02:00Kaspar Vollenweidervok@panter.chfix scope for responsibles filter generation for developparallel MR into develop with same commit as with https://git.panter.ch/open-source/aoz-003/merge_requests/800
This is for having the same change in development and avoid conflicts until next real deploy is doneparallel MR into develop with same commit as with https://git.panter.ch/open-source/aoz-003/merge_requests/800
This is for having the same change in development and avoid conflicts until next real deploy is doneKaspar Vollenweidervok@panter.chKaspar Vollenweidervok@panter.chhttps://git.panter.ch/open-source/aoz-003/-/merge_requests/800fix scope for responsibles filter generation2018-07-17T19:34:52+02:00Kaspar Vollenweidervok@panter.chfix scope for responsibles filter generationFF direct to master branch MR, so this bug fix can be deployed earlierFF direct to master branch MR, so this bug fix can be deployed earlierKaspar Vollenweidervok@panter.chKaspar Vollenweidervok@panter.chhttps://git.panter.ch/open-source/aoz-003/-/merge_requests/798Resolve "reminder_mailing show crashes if reminder mailing has no reminder_ma...2018-07-16T13:40:06+02:00Kaspar Vollenweidervok@panter.chResolve "reminder_mailing show crashes if reminder mailing has no reminder_mailing_volunteer records"Closes #438
https://trello.com/c/HlvqxO8L/197-bug-remindermailing-show-crashes-if-reminder-mailing-has-no-remindermailingvolunteer-records
https://aoz-freiwillige.ch/reminder_mailings/8
View crashes because it tries to run metho...Closes #438
https://trello.com/c/HlvqxO8L/197-bug-remindermailing-show-crashes-if-reminder-mailing-has-no-remindermailingvolunteer-records
https://aoz-freiwillige.ch/reminder_mailings/8
View crashes because it tries to run method on nil here:
```
@reminder_mailing.reminder_mailing_volunteers.select(&:picked?).sample.process_template
```
[show.html.slim Line 20](https://git.panter.ch/open-source/aoz-003/blob/develop/app/views/reminder_mailings/show.html.slim#L20)
```
I, [2018-07-06T18:25:58.880003 #23560] INFO -- : [28c90307-e98f-4843-9591-7dd26281ad9a] Rendered reminder_mailings/show.html.slim within layouts/application (6.3ms)
I, [2018-07-06T18:25:58.880348 #23560] INFO -- : [28c90307-e98f-4843-9591-7dd26281ad9a] Completed 500 Internal Server Error in 21ms (ActiveRecord: 2.7ms)
F, [2018-07-06T18:25:58.881603 #23560] FATAL -- : [28c90307-e98f-4843-9591-7dd26281ad9a]
F, [2018-07-06T18:25:58.881755 #23560] FATAL -- : [28c90307-e98f-4843-9591-7dd26281ad9a] ActionView::Template::Error (undefined method `process_template' for nil:NilClass):
F, [2018-07-06T18:25:58.882066 #23560] FATAL -- : [28c90307-e98f-4843-9591-7dd26281ad9a] 17: hr
[28c90307-e98f-4843-9591-7dd26281ad9a] 18:
[28c90307-e98f-4843-9591-7dd26281ad9a] 19: h3 Email Beispiel
[28c90307-e98f-4843-9591-7dd26281ad9a] 20: - example = @reminder_mailing.reminder_mailing_volunteers.select(&:picked?).sample.process_template
[28c90307-e98f-4843-9591-7dd26281ad9a] 21: h4 Betreff
[28c90307-e98f-4843-9591-7dd26281ad9a] 22: .mailing-body-preview= example[:subject]
[28c90307-e98f-4843-9591-7dd26281ad9a] 23: h4 Text
F, [2018-07-06T18:25:58.882265 #23560] FATAL -- : [28c90307-e98f-4843-9591-7dd26281ad9a]
F, [2018-07-06T18:25:58.882402 #23560] FATAL -- : [28c90307-e98f-4843-9591-7dd26281ad9a] app/views/reminder_mailings/show.html.slim:20:in `_app_views_reminder_mailings_show_html_slim___2746330942469394029_70322003135560'
```Kaspar Vollenweidervok@panter.chKaspar Vollenweidervok@panter.chhttps://git.panter.ch/open-source/aoz-003/-/merge_requests/796Resolve "FW soll feedback welches von einem superadmin erfasst wurde bearbeit...2018-07-16T09:22:51+02:00Kaspar Vollenweidervok@panter.chResolve "FW soll feedback welches von einem superadmin erfasst wurde bearbeiten können auf last_submitted_hours_and_feedbacks"Closes #437
https://trello.com/c/bSN77Yst/200-bug-fw-soll-feedback-welches-von-einem-superadmin-erfasst-wurde-bearbeiten-können-auf-lastsubmittedhoursandfeedbacks
https://staging.aoz-freiwillige.ch/assignments/215/last_submitted_ho...Closes #437
https://trello.com/c/bSN77Yst/200-bug-fw-soll-feedback-welches-von-einem-superadmin-erfasst-wurde-bearbeiten-können-auf-lastsubmittedhoursandfeedbacks
https://staging.aoz-freiwillige.ch/assignments/215/last_submitted_hours_and_feedbacksKaspar Vollenweidervok@panter.chKaspar Vollenweidervok@panter.chhttps://git.panter.ch/open-source/aoz-003/-/merge_requests/790Resolve "FW fehlt Berechtigung seine eigene Beendigungsfeedback Link einzusehen"2018-07-09T15:59:39+02:00Kaspar Vollenweidervok@panter.chResolve "FW fehlt Berechtigung seine eigene Beendigungsfeedback Link einzusehen"Closes #432
https://trello.com/c/U4TTEQ3v/193-bug-fw-fehlt-berechtigung-seine-eigene-beendigungsfeedback-link-einzusehenCloses #432
https://trello.com/c/U4TTEQ3v/193-bug-fw-fehlt-berechtigung-seine-eigene-beendigungsfeedback-link-einzusehenKaspar Vollenweidervok@panter.chKaspar Vollenweidervok@panter.chhttps://git.panter.ch/open-source/aoz-003/-/merge_requests/786Fix/some browser will only trigger on change on checkbox and not input2018-07-05T19:56:39+02:00Kaspar Vollenweidervok@panter.chFix/some browser will only trigger on change on checkbox and not inputKaspar Vollenweidervok@panter.chKaspar Vollenweidervok@panter.chhttps://git.panter.ch/open-source/aoz-003/-/merge_requests/779Resolve "Same billing expense is shown twice"2018-07-04T11:51:34+02:00Kaspar Vollenweidervok@panter.chResolve "Same billing expense is shown twice"Closes #426
https://trello.com/c/YR4gI8O2/164-same-billing-expense-is-shown-twiceCloses #426
https://trello.com/c/YR4gI8O2/164-same-billing-expense-is-shown-twiceKaspar Vollenweidervok@panter.chKaspar Vollenweidervok@panter.chhttps://git.panter.ch/open-source/aoz-003/-/merge_requests/778Resolve "Als Admin und FW möchte ich bisher erfasstes Feedback auf der last_s...2018-07-04T11:54:50+02:00Kaspar Vollenweidervok@panter.chResolve "Als Admin und FW möchte ich bisher erfasstes Feedback auf der last_submitted_hours_and_feedback einsehen"Closes #425
https://trello.com/c/50MqBglQ
https://staging.aoz-freiwillige.ch/assignments/213/last_submitted_hours_and_feedbacks?redirect_to=%2Freminder_mailings%2F7Closes #425
https://trello.com/c/50MqBglQ
https://staging.aoz-freiwillige.ch/assignments/213/last_submitted_hours_and_feedbacks?redirect_to=%2Freminder_mailings%2F7Kaspar Vollenweidervok@panter.chKaspar Vollenweidervok@panter.chhttps://git.panter.ch/open-source/aoz-003/-/merge_requests/777Resolve "waive may be set to nil after last_submitted_hours_and_feedback"2018-07-05T17:55:08+02:00Kaspar Vollenweidervok@panter.chResolve "waive may be set to nil after last_submitted_hours_and_feedback"Closes #424
https://trello.com/c/EvpZ9MU2
```
I, [2018-07-03T10:18:15.880412 #14392] INFO -- : [d4a1e460-4d7d-4708-b9d1-7203f0902bbb] Started PUT "/assignments/213/update_submitted_at" for 212.51.155.234 at 2018-07-03 10:18:15 +0...Closes #424
https://trello.com/c/EvpZ9MU2
```
I, [2018-07-03T10:18:15.880412 #14392] INFO -- : [d4a1e460-4d7d-4708-b9d1-7203f0902bbb] Started PUT "/assignments/213/update_submitted_at" for 212.51.155.234 at 2018-07-03 10:18:15 +0200
I, [2018-07-03T10:18:15.881749 #14392] INFO -- : [d4a1e460-4d7d-4708-b9d1-7203f0902bbb] Processing by AssignmentsController#update_submitted_at as HTML
I, [2018-07-03T10:18:15.881863 #14392] INFO -- : [d4a1e460-4d7d-4708-b9d1-7203f0902bbb] Parameters: {"utf8"=>"✓", "authenticity_token"=>"vWCBPlfSSIxwyP469sodAipgQk/gB5DC2bBk4lzVV4fSn8UU19FRhzjNsspn/KmblIwahTgYcclD36GaSSDTEg==", "assignment"=>{"volunteer_attributes"=>{"waive"=>"", "iban"=>"CH123 123", "bank"=>"ABS", "id"=>"302"}}, "commit"=>"Bestätigen", "id"=>"213"}
D, [2018-07-03T10:18:15.885432 #14392] DEBUG -- : [d4a1e460-4d7d-4708-b9d1-7203f0902bbb] User Load (0.6ms) SELECT "users".* FROM "users" WHERE "users"."deleted_at" IS NULL AND "users"."id" = $1 ORDER BY "users"."id" ASC LIMIT $2 [["id", 57], ["LIMIT", 1]]
D, [2018-07-03T10:18:15.887764 #14392] DEBUG -- : [d4a1e460-4d7d-4708-b9d1-7203f0902bbb] Assignment Load (0.5ms) SELECT "assignments".* FROM "assignments" WHERE "assignments"."deleted_at" IS NULL AND "assignments"."id" = $1 LIMIT $2 [["id", 213], ["LIMIT", 1]]
D, [2018-07-03T10:18:15.891482 #14392] DEBUG -- : [d4a1e460-4d7d-4708-b9d1-7203f0902bbb] Volunteer Load (0.6ms) SELECT "volunteers".* FROM "volunteers" WHERE "volunteers"."deleted_at" IS NULL AND "volunteers"."id" = $1 LIMIT $2 [["id", 302], ["LIMIT", 1]]
D, [2018-07-03T10:18:15.895028 #14392] DEBUG -- : [d4a1e460-4d7d-4708-b9d1-7203f0902bbb] Contact Load (0.5ms) SELECT "contacts".* FROM "contacts" WHERE "contacts"."deleted_at" IS NULL AND "contacts"."contactable_id" = $1 AND "contacts"."contactable_type" = $2 LIMIT $3 [["contactable_id", 302], ["contactable_type", "Volunteer"], ["LIMIT", 1]]
D, [2018-07-03T10:18:15.897012 #14392] DEBUG -- : [d4a1e460-4d7d-4708-b9d1-7203f0902bbb] (0.1ms) BEGIN
D, [2018-07-03T10:18:15.899985 #14392] DEBUG -- : [d4a1e460-4d7d-4708-b9d1-7203f0902bbb] Contact Exists (0.6ms) SELECT 1 AS one FROM "contacts" WHERE "contacts"."primary_email" = $1 AND "contacts"."deleted_at" IS NULL AND ("contacts"."id" != $2) LIMIT $3 [["primary_email", "seb+08082018@panter.ch"], ["id", 1139], ["LIMIT", 1]]
D, [2018-07-03T10:18:15.903847 #14392] DEBUG -- : [d4a1e460-4d7d-4708-b9d1-7203f0902bbb] Client Load (0.5ms) SELECT "clients".* FROM "clients" WHERE "clients"."deleted_at" IS NULL AND "clients"."id" = $1 LIMIT $2 [["id", 228], ["LIMIT", 1]]
D, [2018-07-03T10:18:15.907079 #14392] DEBUG -- : [d4a1e460-4d7d-4708-b9d1-7203f0902bbb] Contact Load (0.4ms) SELECT "contacts".* FROM "contacts" WHERE "contacts"."deleted_at" IS NULL AND "contacts"."contactable_id" = $1 AND "contacts"."contactable_type" = $2 LIMIT $3 [["contactable_id", 228], ["contactable_type", "Client"], ["LIMIT", 1]]
D, [2018-07-03T10:18:15.910309 #14392] DEBUG -- : [d4a1e460-4d7d-4708-b9d1-7203f0902bbb] User Load (0.4ms) SELECT "users".* FROM "users" WHERE "users"."id" = $1 LIMIT $2 [["id", 7], ["LIMIT", 1]]
D, [2018-07-03T10:18:15.913851 #14392] DEBUG -- : [d4a1e460-4d7d-4708-b9d1-7203f0902bbb] Assignment Exists (0.4ms) SELECT 1 AS one FROM "assignments" WHERE "assignments"."deleted_at" IS NULL AND "assignments"."client_id" = $1 AND "assignments"."termination_verified_by_id" IS NULL LIMIT $2 [["client_id", 228], ["LIMIT", 1]]
D, [2018-07-03T10:18:15.915900 #14392] DEBUG -- : [d4a1e460-4d7d-4708-b9d1-7203f0902bbb] CACHE User Load (0.0ms) SELECT "users".* FROM "users" WHERE "users"."id" = $1 LIMIT $2 [["id", 7], ["LIMIT", 1]]
D, [2018-07-03T10:18:15.917711 #14392] DEBUG -- : [d4a1e460-4d7d-4708-b9d1-7203f0902bbb] Assignment Exists (0.4ms) SELECT 1 AS one FROM "assignments" WHERE "assignments"."client_id" = $1 AND "assignments"."deleted_at" IS NULL AND ("assignments"."id" != $2) AND "assignments"."volunteer_id" = $3 LIMIT $4 [["client_id", 228], ["id", 213], ["volunteer_id", 302], ["LIMIT", 1]]
D, [2018-07-03T10:18:15.921389 #14392] DEBUG -- : [d4a1e460-4d7d-4708-b9d1-7203f0902bbb] SQL (0.6ms) UPDATE "assignments" SET "submitted_at" = $1, "updated_at" = $2 WHERE "assignments"."id" = $3 [["submitted_at", "2018-07-03 08:18:15.896602"], ["updated_at", "2018-07-03 08:18:15.919481"], ["id", 213]]
D, [2018-07-03T10:18:15.928616 #14392] DEBUG -- : [d4a1e460-4d7d-4708-b9d1-7203f0902bbb] (6.1ms) COMMIT
I, [2018-07-03T10:18:15.929190 #14392] INFO -- : [d4a1e460-4d7d-4708-b9d1-7203f0902bbb] Redirected to https://staging.aoz-freiwillige.ch/assignments/hours_and_feedbacks_submitted
I, [2018-07-03T10:18:15.929453 #14392] INFO -- : [d4a1e460-4d7d-4708-b9d1-7203f0902bbb] Completed 302 Found in 47ms (ActiveRecord: 11.8ms)
```Kaspar Vollenweidervok@panter.chKaspar Vollenweidervok@panter.chhttps://git.panter.ch/open-source/aoz-003/-/merge_requests/740Fix/imported volunteer invitation2018-06-13T16:39:59+02:00Kaspar Vollenweidervok@panter.chFix/imported volunteer invitationhttps://trello.com/c/KlEATF8G/134-bug-when-inviting-volunteers-and-changing-emailhttps://trello.com/c/KlEATF8G/134-bug-when-inviting-volunteers-and-changing-emailKaspar Vollenweidervok@panter.chKaspar Vollenweidervok@panter.chhttps://git.panter.ch/open-source/aoz-003/-/merge_requests/734Resolve "Strange absence of Redcarpet::Render::StripDown in mailer plaintext"2018-06-01T16:18:25+02:00Kaspar Vollenweidervok@panter.chResolve "Strange absence of Redcarpet::Render::StripDown in mailer plaintext"Closes #422Closes #422Kaspar Vollenweidervok@panter.chKaspar Vollenweidervok@panter.chhttps://git.panter.ch/open-source/aoz-003/-/merge_requests/726Fix user/volunteer factories2018-05-28T14:57:47+02:00Markus Kollermarkus-koller@gmx.chFix user/volunteer factoriesFixes https://git.panter.ch/open-source/aoz-003/issues/418Fixes https://git.panter.ch/open-source/aoz-003/issues/418https://git.panter.ch/open-source/aoz-003/-/merge_requests/722Fix flappy tests2018-05-24T13:19:39+02:00Markus Kollermarkus-koller@gmx.chFix flappy testshttps://trello.com/c/kKbu5XKq/261-fix-failing-tests
The first commit hopefully fixes the flappy tests in `test/system/billing_expenses_test.rb` and `test/system/client_notifications_test.rb`
Not sure yet about `test/system/clients_...https://trello.com/c/kKbu5XKq/261-fix-failing-tests
The first commit hopefully fixes the flappy tests in `test/system/billing_expenses_test.rb` and `test/system/client_notifications_test.rb`
Not sure yet about `test/system/clients_filter_dropdowns_test.rb` and `test/system/group_offers_test.rb`, with these it looks like the clicks aren't applied correctly, e.g. in this screenshot the "Freiwillige/n hinzufügen" button is still pressed:
![failures_test_add_volunteers_on_show](/uploads/aa3bf0cc156be52b9f3b5441df7438d3/failures_test_add_volunteers_on_show.png)https://git.panter.ch/open-source/aoz-003/-/merge_requests/721fix/show only offer type as text on edit to handle missing value on edit2018-05-24T14:54:17+02:00Tugce Nur Tasfix/show only offer type as text on edit to handle missing value on edit[Trello Story: DepartementManagers cannot update existing group offers](https://trello.com/c/8K8qETKu/260-departementmanagers-cannot-update-existing-group-offers)
Departementmanagers cannot update existing group offers anymore. The inte...[Trello Story: DepartementManagers cannot update existing group offers](https://trello.com/c/8K8qETKu/260-departementmanagers-cannot-update-existing-group-offers)
Departementmanagers cannot update existing group offers anymore. The intern/external button is disable and leads to a validation when the field is submitted.
This should be fixed by just displaying this field read-only or even as a text field and submitting the value as a hidden field.https://git.panter.ch/open-source/aoz-003/-/merge_requests/720Fix working_percent migration error2018-05-22T19:41:05+02:00Zsolt BenkeFix working_percent migration errorhttps://trello.com/c/lLQIZ2yJ/243-micro-bug-stellenprozent-is-double-if-users-enters-in-formhttps://trello.com/c/lLQIZ2yJ/243-micro-bug-stellenprozent-is-double-if-users-enters-in-formZsolt BenkeZsolt Benkehttps://git.panter.ch/open-source/aoz-003/-/merge_requests/715fixes/assignment form tweaks-22018-05-18T11:44:28+02:00Tugce Nur Tasfixes/assignment form tweaks-2[layout assignment#edit changes](https://trello.com/c/japabWlX/105-layout-assignmentsedit)
* [x] swap client <-> volunteer
* [x] Rename "Freiwillige/n" to "Freiwillige/r"
* [x] make the table columns for Volunteer and Client[layout assignment#edit changes](https://trello.com/c/japabWlX/105-layout-assignmentsedit)
* [x] swap client <-> volunteer
* [x] Rename "Freiwillige/n" to "Freiwillige/r"
* [x] make the table columns for Volunteer and Clienthttps://git.panter.ch/open-source/aoz-003/-/merge_requests/711Fix/department managers can create external GroupOffers2018-05-17T16:26:14+02:00Tugce Nur TasFix/department managers can create external GroupOffers* [x] [Department Managers can create external GroupOffers](https://trello.com/c/TBY9b806/247-departmentmanagers-cant-create-external-groupoffers)
* [x] [GroupOfferType can't be changed if it has active GroupAssignments](https://trello...* [x] [Department Managers can create external GroupOffers](https://trello.com/c/TBY9b806/247-departmentmanagers-cant-create-external-groupoffers)
* [x] [GroupOfferType can't be changed if it has active GroupAssignments](https://trello.com/c/Mf82m01A/250-bug-groupoffertype-cant-be-changed-if-it-has-active-groupassignments)https://git.panter.ch/open-source/aoz-003/-/merge_requests/707Fix bug in GroupAssignmentPolicy2018-05-17T11:11:34+02:00Markus Kollermarkus-koller@gmx.chFix bug in GroupAssignmentPolicyPart of [this story](https://trello.com/c/W8R8Nljd/246-dont-show-beendete-eins%C3%A4tze-button-for-department-manager) (which isn't fully defined yet)
Fixes `/group_assignments/terminated_index` when logged in as department manager.Part of [this story](https://trello.com/c/W8R8Nljd/246-dont-show-beendete-eins%C3%A4tze-button-for-department-manager) (which isn't fully defined yet)
Fixes `/group_assignments/terminated_index` when logged in as department manager.https://git.panter.ch/open-source/aoz-003/-/merge_requests/706Resolve "Volunteer who's acceptance is changed to accepted doesn't get account"2018-05-23T14:29:07+02:00Kaspar Vollenweidervok@panter.chResolve "Volunteer who's acceptance is changed to accepted doesn't get account"Closes #410
https://trello.com/c/V4H9X1rx/242-bug-freiwilliger-der-akzeptiert-wird-erh%C3%A4lt-keine-account-einladung-mehr
Wird ein Volunteer nicht direkt von `:undecided` auf `:accepted` geändert, erhält der Volunteer keinen Acc...Closes #410
https://trello.com/c/V4H9X1rx/242-bug-freiwilliger-der-akzeptiert-wird-erh%C3%A4lt-keine-account-einladung-mehr
Wird ein Volunteer nicht direkt von `:undecided` auf `:accepted` geändert, erhält der Volunteer keinen Account und keine einladungs email:
```ruby
@volunteer.undecided? # => true
@volunteer.invited!
@volunteer.accepted! # Keine email, und kein account
@volunteer.undecided? # => true
@volunteer.accepted! # Email wird versendet, account erstellt
```
```
irb(main):030:0> Volunteer.find(281)
=> nil
```Kaspar Vollenweidervok@panter.chKaspar Vollenweidervok@panter.ch