From 74f7ad7355c7820e0bc33443278d21ffcf899559 Mon Sep 17 00:00:00 2001
From: Nicolas Da Mutten
Date: Sat, 1 Oct 2022 12:44:18 +0200
Subject: [PATCH 013/114] fix: move all env() calls to config
This allows to cache the config, as the .env file is not loaded when
a cached config exists. See
https://laravel.com/docs/master/configuration#configuration-caching
---
app/Exceptions/Handler.php | 2 +-
app/Http/Controllers/ErrorReportController.php | 4 ++--
app/Http/Middleware/SecurityHeaders.php | 10 +++++-----
config/app.php | 18 ++++++++++++++++++
resources/views/auth/login.blade.php | 2 +-
resources/views/auth/register.blade.php | 2 +-
resources/views/errors/500.blade.php | 2 +-
resources/views/feedbackContent/edit.blade.php | 2 +-
resources/views/includes/footer.blade.php | 4 ++--
resources/views/layouts/master.blade.php | 2 +-
10 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index ed39bf58..ca16dee1 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -51,7 +51,7 @@ class Handler extends ExceptionHandler
* @throws Throwable
*/
public function report(Throwable $exception) {
- if (!env('APP_DEBUG') && app()->bound('sentry') && $this->shouldReport($exception)) {
+ if (!config('app.debug') && app()->bound('sentry') && $this->shouldReport($exception)) {
app('sentry')->captureException($exception);
}
diff --git a/app/Http/Controllers/ErrorReportController.php b/app/Http/Controllers/ErrorReportController.php
index de459ea5..85fd9ae3 100644
--- a/app/Http/Controllers/ErrorReportController.php
+++ b/app/Http/Controllers/ErrorReportController.php
@@ -21,8 +21,8 @@ public function submit(ErrorReportRequest $request) {
$params = $request->validated();
$request->session()->flash('previousUrl', $params['previousUrl']);
$client = app(GuzzleHttp\Client::class);
- $url = env('SENTRY_USER_FEEDBACK_URL');
- $dsn = env('SENTRY_LARAVEL_DSN', env('SENTRY_DSN'));
+ $url = config('app.sentry.user_feedback_url');
+ $dsn = config('sentry.dsn');
$client->post($url, [
'headers' => ['Authorization' => 'DSN ' . $dsn],
'form_params' => [
diff --git a/app/Http/Middleware/SecurityHeaders.php b/app/Http/Middleware/SecurityHeaders.php
index 685bcdd5..dd0c1f91 100644
--- a/app/Http/Middleware/SecurityHeaders.php
+++ b/app/Http/Middleware/SecurityHeaders.php
@@ -73,18 +73,18 @@ protected function getCSPImgSrc() {
}
protected function getCSPConnectSrc() {
- if (!env('COLLABORATION_ENABLED')) return '';
+ if (!config('app.collaboration.enabled')) return '';
$sentryUrl = '';
- if (env('MIX_SENTRY_VUE_DSN')) {
- $parsed = parse_url(env('MIX_SENTRY_VUE_DSN'));
+ if (config('app.sentry.mix.vue_dsn')) {
+ $parsed = parse_url(config('app.sentry.mix.vue_dsn'));
$sentryUrl = $parsed['scheme'] . '://' . $parsed['host'] . (isset($parsed['port']) ? ':' . $parsed['port'] : '');
}
- return "connect-src 'self' $sentryUrl " . env('COLLABORATION_SIGNALING_SERVERS');
+ return "connect-src 'self' $sentryUrl " . config('app.collaboration.signaling_servers');
}
protected function getCSPReportUri() {
- $reportUri = env('SENTRY_CSP_REPORT_URI', false);
+ $reportUri = config('app.sentry.csp_report_uri', false);
if ($reportUri) return "report-uri $reportUri&sentry_environment=" . App::environment();
return '';
}
diff --git a/config/app.php b/config/app.php
index 41d9e6f1..d99f8176 100644
--- a/config/app.php
+++ b/config/app.php
@@ -230,4 +230,22 @@
// 'ExampleClass' => App\Example\ExampleClass::class,
])->toArray(),
+ 'collaboration' => [
+ 'enabled' => (bool) env('COLLABORATION_ENABLED', false),
+ 'signaling_servers' => env('COLLABORATION_SIGNALING_SERVERS', false)
+ ],
+
+ 'contact' => [
+ 'link' => env('APP_CONTACT_LINK'),
+ 'text' => env('APP_CONTACT_TEXT'),
+ ],
+
+ 'sentry' => [
+ 'user_feedback_url' => env('SENTRY_USER_FEEDBACK_URL'),
+ 'mix' => [
+ 'vue_dsn' => env('MIX_SENTRY_VUE_DSN'),
+ ],
+ 'csp_report_uri' => env('sentry.csp_report_uri'),
+ ]
+
];
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 43307cee..54508b30 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -5,7 +5,7 @@
{{__('Login')}}
- @if (!empty(env('HITOBITO_BASE_URL')))
+ @if (!empty(config('services.hitobito.client_id')))
{{__('Register')}}
- @if (!empty(env('HITOBITO_BASE_URL')))
+ @if (!empty(config('services.hitobito.client_id')))
{{__('Server Error')}}
- @if(app()->bound('sentry') && app('sentry')->getLastEventId() && env('SENTRY_USER_FEEDBACK_URL'))
+ @if(app()->bound('sentry') && app('sentry')->getLastEventId() && config('app.sentry.user_feedback_url'))
diff --git a/resources/views/includes/footer.blade.php b/resources/views/includes/footer.blade.php
index 8bc23eca..8500e5a4 100644
--- a/resources/views/includes/footer.blade.php
+++ b/resources/views/includes/footer.blade.php
@@ -1,7 +1,7 @@
diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php
index 1fcbda41..62a9b75c 100644
--- a/resources/views/layouts/master.blade.php
+++ b/resources/views/layouts/master.blade.php
@@ -24,7 +24,7 @@
'routes' => collect(Route::getRoutes())->mapWithKeys(function (\Illuminate\Routing\Route $route) { return [$route->getName() => [ 'uri' => '/'.$route->uri(), 'method' => head($route->methods())]]; }),
'csrf' => csrf_token(),
'nonce' => app('csp-nonce'),
- 'signalingServers' => explode(' ', env('COLLABORATION_SIGNALING_SERVERS')),
+ 'signalingServers' => explode(' ', config('app.collaboration.signaling_servers')),
'username' => Auth::user() ? Auth::user()->name : null,
]) }}">
From 0cac933991718a7e6f8b7ade9603aa139d5936af Mon Sep 17 00:00:00 2001
From: Carlo Beltrame
Date: Sun, 2 Oct 2022 16:16:14 +0200
Subject: [PATCH 014/114] Replace another env call with cacheable config
---
resources/views/feedback/requirements-matrix.blade.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/resources/views/feedback/requirements-matrix.blade.php b/resources/views/feedback/requirements-matrix.blade.php
index c07055db..2da48bc8 100644
--- a/resources/views/feedback/requirements-matrix.blade.php
+++ b/resources/views/feedback/requirements-matrix.blade.php
@@ -17,7 +17,7 @@
:all-requirements="{{ json_encode($allRequirements) }}"
:all-participants="{{ json_encode($allParticipants) }}"
:requirement-statuses="{{ json_encode($course->requirement_statuses) }}"
- :collaboration-enabled="{{ json_encode(env('COLLABORATION_ENABLED')) }}">
+ :collaboration-enabled="{{ json_encode(config('app.collaboration.enabled')) }}">
@else
From b3401c1b9305c5afc5ec0ccc58a74f8e39911254 Mon Sep 17 00:00:00 2001
From: Carlo Beltrame
Date: Sun, 2 Oct 2022 16:32:25 +0200
Subject: [PATCH 015/114] Adjust test which relied on env
https://laravel.com/docs/9.x/mocking
---
tests/Feature/App/ReadWelcomePageTest.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/Feature/App/ReadWelcomePageTest.php b/tests/Feature/App/ReadWelcomePageTest.php
index 329a18c1..ae42f3ad 100644
--- a/tests/Feature/App/ReadWelcomePageTest.php
+++ b/tests/Feature/App/ReadWelcomePageTest.php
@@ -2,6 +2,7 @@
namespace Tests\Feature\App;
+use Illuminate\Support\Facades\Config;
use Tests\TestCaseWithBasicData;
class ReadWelcomePageTest extends TestCaseWithBasicData {
@@ -31,16 +32,17 @@ public function test_shouldDisplayWelcomePage() {
public function test_shouldDisplayContactWhenContactLinkSet(){
// given
- putenv("APP_CONTACT_LINK=mailto:test@test.ch");
+ Config::set('app.contact.link', 'mailto:test@test.ch');
// when
$response = $this->get('/course/' . $this->courseId);
//then
$response->assertOk();
$response->assertSee(env('APP_CONTACT_TEXT', __('t.footer.contact_text')));
}
+
public function test_shouldNotDisplayContactWhenContactLinkNotSet(){
// given
- putenv("APP_CONTACT_LINK=");
+ Config::set('app.contact.link', '');
// when
$response = $this->get('/course/' . $this->courseId);
//then
From 812f931e45118466d5312a5dcb5e5c1206ffd3f6 Mon Sep 17 00:00:00 2001
From: Carlo Beltrame
Date: Sun, 2 Oct 2022 16:33:03 +0200
Subject: [PATCH 016/114] Apply optimization on deployment
---
.github/actions/deploy/deploy.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.github/actions/deploy/deploy.sh b/.github/actions/deploy/deploy.sh
index 90c40d0a..4449579f 100755
--- a/.github/actions/deploy/deploy.sh
+++ b/.github/actions/deploy/deploy.sh
@@ -67,4 +67,8 @@ ssh -l $SSH_USERNAME -T $SSH_HOST <
Date: Sun, 2 Oct 2022 16:52:17 +0200
Subject: [PATCH 017/114] Fix config fallback
---
resources/views/includes/footer.blade.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/resources/views/includes/footer.blade.php b/resources/views/includes/footer.blade.php
index 8500e5a4..2b4c7d58 100644
--- a/resources/views/includes/footer.blade.php
+++ b/resources/views/includes/footer.blade.php
@@ -1,7 +1,7 @@
From 962335e2fdf999dc9d692fe3a3465c3b4abc525f Mon Sep 17 00:00:00 2001
From: Carlo Beltrame
Date: Mon, 3 Oct 2022 11:24:03 +0200
Subject: [PATCH 018/114] Keep the naming consistent
---
.../ParticipantDetailController.php | 4 ++--
app/Models/Course.php | 18 +++++++++---------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/app/Http/Controllers/ParticipantDetailController.php b/app/Http/Controllers/ParticipantDetailController.php
index 2d187ae5..917c76ca 100644
--- a/app/Http/Controllers/ParticipantDetailController.php
+++ b/app/Http/Controllers/ParticipantDetailController.php
@@ -18,8 +18,8 @@ class ParticipantDetailController extends Controller {
*/
public function index(Request $request, Course $course, Participant $participant) {
$observations = $participant->observations->values();
- $previousParticipant = $course->getPreviousCandidate($participant);
- $nextParticipant = $course->getNextCandidate($participant);
+ $previousParticipant = $course->getPreviousParticipant($participant);
+ $nextParticipant = $course->getNextParticipant($participant);
return view('participant-detail', [
'participant' => $participant,
diff --git a/app/Models/Course.php b/app/Models/Course.php
index 8c66bb54..3dbbe6ad 100644
--- a/app/Models/Course.php
+++ b/app/Models/Course.php
@@ -209,25 +209,25 @@ public function getDefaultRequirementStatusIdAttribute() {
/**
- * Get the previous Participant in alphabetic order.
- *
+ * Get the previous participant in alphabetic order.
+ *
* @param Participant $participant
*/
- public function getPreviousCandidate(Participant $participant) {
- $participants = collect($this->participants)->toArray();
+ public function getPreviousParticipant(Participant $participant) {
+ $participants = $this->participants->toArray();
$index = array_search($participant->id, array_column($participants, 'id'));
return $index <= 0 ? false : $participants[$index -1];
}
/**
- * Get the next Participant in alphabetic order.
- *
+ * Get the next participant in alphabetic order.
+ *
* @param Participant $participant
*/
- public function getNextCandidate(Participant $participant) {
- $participants = collect($this->participants)->toArray();
+ public function getNextParticipant(Participant $participant) {
+ $participants = $this->participants->toArray();
$index = array_search($participant->id, array_column($participants, 'id'));
$length = count($participants);
- return $index > $length-2 ? false : $participants[$index + 1];
+ return $index >= $length-1 ? false : $participants[$index + 1];
}
}
From 2274ddf6e4c2558401725a83645e0f746d59fd95 Mon Sep 17 00:00:00 2001
From: Carlo Beltrame
Date: Mon, 3 Oct 2022 11:24:18 +0200
Subject: [PATCH 019/114] Add tests for calculating next and previous
participants
---
tests/Unit/Models/CourseTest.php | 51 ++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/tests/Unit/Models/CourseTest.php b/tests/Unit/Models/CourseTest.php
index 7c5b2531..c6a4a265 100644
--- a/tests/Unit/Models/CourseTest.php
+++ b/tests/Unit/Models/CourseTest.php
@@ -87,4 +87,55 @@ public function test_defaultRequirementStatusId_isTheFirstRequirementStatusIdInT
// then
$this->assertEquals($expected, $defaultRequirementStatusId);
}
+
+ public function test_getNextParticipant_returnsSecondParticipantForFirst() {
+ // given
+ $course = Course::find($this->courseId);
+ $first = $course->participants->first();
+ $second = $course->participants->get(1);
+
+ // when
+ $next = $course->getNextParticipant($first);
+
+ // then
+ $this->assertEquals($second, $next);
+ }
+
+ public function test_getNextParticipant_returnsNoParticipantForLast() {
+ // given
+ $course = Course::find($this->courseId);
+ $last = $course->participants->last();
+
+ // when
+ $next = $course->getNextParticipant($last);
+
+ // then
+ $this->assertEquals(false, $next);
+ }
+
+ public function test_getPreviousParticipant_returnsSecondToLastParticipantForLast() {
+ // given
+ $course = Course::find($this->courseId);
+ $participants = $course->participants;
+ $last = $participants->last();
+ $secondToLast = $participants->get(count($participants) - 2);
+
+ // when
+ $previous = $course->getPreviousParticipant($last);
+
+ // then
+ $this->assertEquals($secondToLast, $previous);
+ }
+
+ public function test_getPreviousParticipant_returnsNoParticipantForFirst() {
+ // given
+ $course = Course::find($this->courseId);
+ $first = $course->participants->first();
+
+ // when
+ $previous = $course->getPreviousParticipant($first);
+
+ // then
+ $this->assertEquals(false, $previous);
+ }
}
From 7dc6cf03f35e88a8ba1f9e6bbed5427f51037af3 Mon Sep 17 00:00:00 2001
From: Carlo Beltrame
Date: Mon, 3 Oct 2022 11:39:52 +0200
Subject: [PATCH 020/114] Take care not to push the layout around more than
necessary
Also, use arrow icons instead of text.
Also, use a strict value check.
---
resources/sass/app.scss | 4 ++++
resources/views/participant-detail.blade.php | 7 ++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/resources/sass/app.scss b/resources/sass/app.scss
index 00196134..a449b34b 100644
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -187,3 +187,7 @@
.mh-1em {
min-height: 1em;
}
+
+.clear-both {
+ clear: both;
+}
diff --git a/resources/views/participant-detail.blade.php b/resources/views/participant-detail.blade.php
index 2affa128..300ddde8 100644
--- a/resources/views/participant-detail.blade.php
+++ b/resources/views/participant-detail.blade.php
@@ -6,11 +6,12 @@
- @if($previousParticipant != false) @endif
- @if($nextParticipant != false) @endif
{{__('t.views.participant_details.title')}}
-
{{__('t.views.error_form.it_looks_like_we_are_having_issues')}}
diff --git a/resources/views/feedbackContent/edit.blade.php b/resources/views/feedbackContent/edit.blade.php index 09802956..683ea391 100644 --- a/resources/views/feedbackContent/edit.blade.php +++ b/resources/views/feedbackContent/edit.blade.php @@ -21,7 +21,7 @@ :show-requirements="{{ $course->uses_requirements ? 'true' : 'false' }}" :show-categories="{{ $course->uses_categories ? 'true' : 'false' }}" :show-impression="{{ $course->uses_impressions ? 'true' : 'false' }}" - :collaboration-key="{{ json_encode(env('COLLABORATION_ENABLED') ? $feedback->collaborationKey : null) }}"> + :collaboration-key="{{ json_encode(config('app.collaboration.enabled') ? $feedback->collaborationKey : null) }}">
+ @if($previousParticipant !== false) @endif
+ @if($nextParticipant !== false) @endif
+
+
From 6df14877c00a0f5e80a2fb75ef4624a6580b211b Mon Sep 17 00:00:00 2001
From: Carlo Beltrame
Date: Mon, 3 Oct 2022 11:54:40 +0200
Subject: [PATCH 021/114] Add changelog entries
---
CHANGELOG.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ed1701b..ce785398 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
##### Oktober 2022
- Die Druckfunktion bei Rückmeldungen wurde überarbeitet. Es werden nun direkt fertige, konsistent gelayoutete PDF-Dateien heruntergeladen, anstatt dass man im Browser die PDF-Druck-Funktion verwenden muss. Da wir nun nicht mehr vom Verhalten unterschiedlicher Browser abhängig sind, konnten zudem die Seitenränder auf dem PDF verkleinert werden, um Papier zu sparen [#228](https://github.com/gloggi/qualix/issues/228)
+- Das Design des MiData-Login Buttons wurde ans neue PBS-Design angepasst. Merci @Sprudeel! [#265](https://github.com/gloggi/qualix/issues/265)
+- Neue Links zum einfachen Weiterspringen auf nächste und vorhergehende TN auf der TN-Detailansicht. Merci @Sprudeel! [#274](https://github.com/gloggi/qualix/issues/274)
+- Performance-Optimierungen für Qualix wurden ermöglicht. Merci @cleverer! [#44](https://github.com/gloggi/qualix/issues/44)
+- Bugfixes: Wenn ein Feature (konkret MiData-Login und WebRTC Synchronisierung) in einer Instanz von Qualix nicht konfiguriert ist, dann wird es komplett ausgeblendet / deaktiviert. Merci @cleverer! [#286](https://github.com/gloggi/qualix/pull/286) [#284](https://github.com/gloggi/qualix/pull/284)
##### September 2022
- Die Ansichten "Blöcke" und "Spick" wurden kombiniert. Beobachtungsaufträge sind nun unter "Blöcke" verfügbar [#165](https://github.com/gloggi/qualix/issues/165)
From 69f2821beda360450993d685fc1395a1d0e1455a Mon Sep 17 00:00:00 2001
From: Carlo Beltrame
Date: Mon, 3 Oct 2022 12:09:20 +0200
Subject: [PATCH 022/114] Call for help with french translations
---
lang/fr/t.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lang/fr/t.php b/lang/fr/t.php
index 39f67023..84998042 100644
--- a/lang/fr/t.php
+++ b/lang/fr/t.php
@@ -326,6 +326,8 @@
"edit_success" => "Les détails personnels ont été sauvegardés avec succès.",
),
"welcome" => array(
+ "changelog" => "Tu peux trouver une liste (en allemand) des derniers changements :here. S.t.p. aide-nous à traduire les nouvelles fonctionnalités en français ! Contacte l'équipe Qualix si tu veux aider.",
+ "here" => "ici",
"no_courses" => "Actuellement, tu n'es inscrit-e à aucun cours. Fais-toi inviter dans un cours ou crées-en un nouveau toi-même.",
"text" => "Qualix a pour objectif de t'aider à reduire la paperasse et à garder une vision d'ensemble des observations. Bien du plaisir à observer!",
"title" => "Bienvenue sur Qualix",
From 28d87c220d4e94eb1178a26419239df083d3e5d0 Mon Sep 17 00:00:00 2001
From: Carlo Beltrame
Date: Mon, 3 Oct 2022 12:18:17 +0200
Subject: [PATCH 023/114] Add instructions for how to apply for an OAuth
application entry in hitobito
---
README.md | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/README.md b/README.md
index 6675baff..2fd201a7 100644
--- a/README.md
+++ b/README.md
@@ -134,6 +134,7 @@ SENTRY_USER_FEEDBACK_URL=
SENTRY_CSP_REPORT_URI=
MIX_SENTRY_VUE_DSN=
```
+> Für die `HITOBITO_*` Einstellungen, siehe weiter unten.
3. **Backend-Dependencies installieren und `APP_KEY` generieren**: `docker-compose run --entrypoint "/bin/sh -c 'composer install --no-dev && php artisan key:generate'" qualix`
4. **Frontend-Code builden**: `docker-compose run --entrypoint "/bin/sh -c 'npm install && npm run prod'" node`
5. **Optimierung (optional)**: `docker-compose run --entrypoint "composer install --optimize-autoloader --no-dev" qualix`
@@ -142,3 +143,7 @@ MIX_SENTRY_VUE_DSN=
8. **Optimierung (optional)**: `php artisan config:cache && php artisan route:cache`
9. **Datenbank-Tabellen einrichten**: `php artisan migrate`
10. **Laravel Storage-Link einrichten**: `php artisan storage:link`
+
+### Hitobito / MiData Anbindung
+
+Um den Login via MiData (oder eine andere hitobito-Instanz) zu ermöglichen, muss man Qualix auf hitobito als erlaubte OAuth-Applikation registrieren. Dafür muss der jeweilige Dachverband kontaktiert werden. Bei der MiData stellt die PBS dafür ein [Antragsformular](https://forms.office.com/Pages/ResponsePage.aspx?id=iq6Fcs2Xq0m9ordFTZ0Fa8gnQG-i3p9KkbcKGL9nFhtUMEpMQkYwMzQxNUVEWEIxRTNWTDhPMDVEMS4u) zu Verfügung. Der Dachverband (z.B. die PBS) kann dann die Werte für die `HITOBITO_*` Variabeln in der .env-Datei liefern.
From a4dbf6f76265fa34bc2a3e417382075eb2e24882 Mon Sep 17 00:00:00 2001
From: Nicolas Da Mutten
Date: Sat, 1 Oct 2022 12:47:23 +0200
Subject: [PATCH 024/114] fix(readme): recommend full optimization
---
README.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 6675baff..3f59304e 100644
--- a/README.md
+++ b/README.md
@@ -137,8 +137,10 @@ MIX_SENTRY_VUE_DSN=
3. **Backend-Dependencies installieren und `APP_KEY` generieren**: `docker-compose run --entrypoint "/bin/sh -c 'composer install --no-dev && php artisan key:generate'" qualix`
4. **Frontend-Code builden**: `docker-compose run --entrypoint "/bin/sh -c 'npm install && npm run prod'" node`
5. **Optimierung (optional)**: `docker-compose run --entrypoint "composer install --optimize-autoloader --no-dev" qualix`
+ Siehe [hier](https://laravel.com/docs/9.x/deployment#optimization) für weitere Erklärungen.
6. **Auf den Webhost hochladen**: Z.B. mit FTP alles (Ordner und Dateien) ausser .git, cypress, node_modules und tests hochladen
7. **Mit SSH auf den Server einloggen**, da die folgenden Befehle in der finalen Umgebung ausgeführt werden müssen
-8. **Optimierung (optional)**: `php artisan config:cache && php artisan route:cache`
+8. **Optimierung (optional)**: `php artisan config:cache && php artisan route:cache && php artisan view:cache`
+ Siehe [hier](https://laravel.com/docs/9.x/deployment#optimization) für weitere Erklärungen.
9. **Datenbank-Tabellen einrichten**: `php artisan migrate`
10. **Laravel Storage-Link einrichten**: `php artisan storage:link`
From 47ce5d02b008de65f53977963fdbea311e1f1a65 Mon Sep 17 00:00:00 2001
From: Carlo Beltrame
Date: Fri, 21 Oct 2022 16:59:34 +0200
Subject: [PATCH 025/114] Fix deprecation warning in GitHub action
https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/
---
.github/workflows/ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 520c69e2..44452748 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,7 +78,7 @@ jobs:
environment: ${{ steps.extract.outputs.environment }}
steps:
- id: extract
- run: echo "::set-output name=environment::$(echo $GITHUB_REF | sed -e '/^refs\/heads\/deploy-\(.*\)$/!d;s//\1/')"
+ run: echo "environment=$(echo $GITHUB_REF | sed -e '/^refs\/heads\/deploy-\(.*\)$/!d;s//\1/')" >> $GITHUB_OUTPUT
- env:
EXTRACTED: ${{ steps.extract.outputs.environment }}
run: 'echo "Extracted environment name: $EXTRACTED"'
From 3b1ce3e1c4a5cb5177846772d1fb35780385a3b1 Mon Sep 17 00:00:00 2001
From: Carlo Beltrame
Date: Sat, 22 Oct 2022 12:34:53 +0200
Subject: [PATCH 026/114] Update actions/checkout to v3
---
.github/workflows/ci.yml | 8 ++++----
.github/workflows/nightly.yml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 44452748..96d37af3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- run: docker-compose up -d qualix db node mail
@@ -26,7 +26,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- run: docker-compose up -d qualix db node mail
@@ -39,7 +39,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- run: docker-compose up -d qualix db node mail e2e-mocks
@@ -95,7 +95,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- run: sudo apt-get update -y && sudo apt-get install -y lftp
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 4b3413da..a35632f1 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -10,7 +10,7 @@ jobs:
name: 'Sync current master to the deploy branch'
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
persist-credentials: false
- uses: repo-sync/github-sync@v2
From 95a80a1c10317e14d1528a940633360690bd46e3 Mon Sep 17 00:00:00 2001
From: Carlo Beltrame
Date: Mon, 24 Oct 2022 21:09:20 +0200
Subject: [PATCH 027/114] Fix newlines in observations in rendered PDF
---
.../js/components/print/feedback/FeedbackContents.jsx | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/resources/js/components/print/feedback/FeedbackContents.jsx b/resources/js/components/print/feedback/FeedbackContents.jsx
index bc235670..49609010 100644
--- a/resources/js/components/print/feedback/FeedbackContents.jsx
+++ b/resources/js/components/print/feedback/FeedbackContents.jsx
@@ -13,6 +13,13 @@ function ucfirst(text) {
return text.charAt(0).toUpperCase() + text.slice(1)
}
+function fixNewlines(text) {
+ // Remove \r characters, because they are rendered as crossed-out box into the PDF.
+ // This happens only in multiline observations for now, because the rest of the text
+ // is divided into paragraphs and should never contain newlines.
+ return text.replace(/(\r\n|\r|\n)/g, '\n')
+}
+
function FeedbackContents({feedbackContents, observations, requirements, statuses}) {
if (!feedbackContents) return
- {observation.participants.length > 1 ? {observation.participants.map(p => p.scout_name).join(' ')} :
+ {observation.participants.length > 1 ? {observation.participants.map(p => p.scout_name).join(' ')} :
{observation.block.name}, {new Date(observation.block.block_date).toLocaleDateString(document.documentElement.lang)}
}
From b04e23141a44fec9c3008ebd0931c069df2ed037 Mon Sep 17 00:00:00 2001
From: Carlo Beltrame
Date: Tue, 1 Nov 2022 12:31:05 +0100
Subject: [PATCH 028/114] Show user images on observation overview
---
resources/js/components/ResponsiveTable.vue | 4 +++-
.../components/TableObservationOverview.vue | 22 +++++++++++++++----
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/resources/js/components/ResponsiveTable.vue b/resources/js/components/ResponsiveTable.vue
index 36bb2c32..6b7123a7 100644
--- a/resources/js/components/ResponsiveTable.vue
+++ b/resources/js/components/ResponsiveTable.vue
@@ -5,7 +5,9 @@
v-bind="$attrs">
- {{ col.label }}
+
+ {{ col.label }}
+
diff --git a/resources/js/components/TableObservationOverview.vue b/resources/js/components/TableObservationOverview.vue
index d8d7bff8..9f3b747e 100644
--- a/resources/js/components/TableObservationOverview.vue
+++ b/resources/js/components/TableObservationOverview.vue
@@ -3,7 +3,11 @@
:data="participants"
:actions="actions"
:fields="fields"
+ :header-class="headerClass"
:cell-class="cellClass">
+
+ ![]()
{{ user.name }}
+
this.totalObservations(participant) }]
- const observationColumns = this.users.map(user => ({ label: user.name, value: participant => participant.observation_counts_by_user[user.id] || 0}))
+ const observationColumns = this.users.map(user => ({ label: user.name, headerSlot: this.headerSlotName(user), user: user, value: participant => participant.observation_counts_by_user[user.id] || 0}))
if (!this.multiple) {
return totalColumn.concat(observationColumns)
}
@@ -60,21 +64,31 @@ export default {
...observationColumns,
...feedbackColumn,
]
+ },
+ anyUserImages() {
+ return this.users.some(user => user.image_url)
}
},
methods: {
totalObservations(participant) {
return this.users.reduce((sum, user) => sum + (participant.observation_counts_by_user[user.id] || 0), 0)
},
+ headerClass({ col, colIdx }) {
+ if (colIdx === (this.multiple ? 1 : 0)) return ''
+ return 'text-lg-center'
+ },
cellClass({ cellValue, colIdx }) {
if (colIdx === (this.multiple ? 1 : 0)) return ''
- if (cellValue < this.redThreshold) return 'bg-danger-light'
- if (cellValue >= this.greenThreshold) return 'bg-success-light'
- return ''
+ if (cellValue < this.redThreshold) return 'text-lg-center bg-danger-light'
+ if (cellValue >= this.greenThreshold) return 'text-lg-center bg-success-light'
+ return 'text-lg-center'
},
feedbackFor({ id }) {
return this.feedbackData?.feedbacks?.find(feedback => feedback.participant_id === id)
},
+ headerSlotName(user) {
+ return 'user-' + user.id
+ },
},
}
From 5998d18020246dbe97987273a334645ae843a579 Mon Sep 17 00:00:00 2001
From: Carlo Beltrame
Date: Tue, 1 Nov 2022 12:35:55 +0100
Subject: [PATCH 029/114] Add changelog entry
---
CHANGELOG.md | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce785398..eee8e3e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
# Changelog
+##### November 2022
+- Auf dem Überblick werden jetzt die Bilder des Kursteams angezeigt, falls zumindest jemand ein Bild hochgeladen hat
+
##### Oktober 2022
- Die Druckfunktion bei Rückmeldungen wurde überarbeitet. Es werden nun direkt fertige, konsistent gelayoutete PDF-Dateien heruntergeladen, anstatt dass man im Browser die PDF-Druck-Funktion verwenden muss. Da wir nun nicht mehr vom Verhalten unterschiedlicher Browser abhängig sind, konnten zudem die Seitenränder auf dem PDF verkleinert werden, um Papier zu sparen [#228](https://github.com/gloggi/qualix/issues/228)
- Das Design des MiData-Login Buttons wurde ans neue PBS-Design angepasst. Merci @Sprudeel! [#265](https://github.com/gloggi/qualix/issues/265)
From c16992d0dd5c5b78e1edf9ef90f7ec4632729865 Mon Sep 17 00:00:00 2001
From: Carlo Beltrame
Date: Tue, 1 Nov 2022 14:40:58 +0100
Subject: [PATCH 030/114] Crop avatars instead of stretching them
Fixes #41
---
CHANGELOG.md | 1 +
resources/sass/app.scss | 7 +------
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eee8e3e9..b7585db7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
##### November 2022
- Auf dem Überblick werden jetzt die Bilder des Kursteams angezeigt, falls zumindest jemand ein Bild hochgeladen hat
+- Nicht-quadratische Avatar-Bilder von TN und Kursteam werden jetzt zugeschnitten statt zurechtgestaucht [#41](https://github.com/gloggi/qualix/issues/41)
##### Oktober 2022
- Die Druckfunktion bei Rückmeldungen wurde überarbeitet. Es werden nun direkt fertige, konsistent gelayoutete PDF-Dateien heruntergeladen, anstatt dass man im Browser die PDF-Druck-Funktion verwenden muss. Da wir nun nicht mehr vom Verhalten unterschiedlicher Browser abhängig sind, konnten zudem die Seitenränder auf dem PDF verkleinert werden, um Papier zu sparen [#228](https://github.com/gloggi/qualix/issues/228)
diff --git a/resources/sass/app.scss b/resources/sass/app.scss
index a449b34b..4793858e 100644
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -48,16 +48,11 @@
display: none
}
-.avatar {
- @extend .rounded-circle;
- width: 96px;
- height: 96px;
-}
-
.avatar-small {
@extend .rounded-circle;
width: 48px;
height: 48px;
+ object-fit: cover;
}
.card {
From c4e2b1a32caa36d196b656634c7de7a935f55a69 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Nov 2022 23:33:54 +0000
Subject: [PATCH 031/114] Bump loader-utils from 1.4.0 to 1.4.1
Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.1/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v1.4.0...v1.4.1)
---
updated-dependencies:
- dependency-name: loader-utils
dependency-type: indirect
...
Signed-off-by: dependabot[bot]
---
package-lock.json | 54 +++++++++++++++++++++++------------------------
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index eee60ba1..6bbbca43 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3771,9 +3771,9 @@
},
"dependencies": {
"loader-utils": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
- "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
+ "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
@@ -4170,9 +4170,9 @@
},
"dependencies": {
"loader-utils": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
- "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
+ "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
@@ -5346,9 +5346,9 @@
},
"dependencies": {
"loader-utils": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
- "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
+ "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
@@ -6289,9 +6289,9 @@
},
"dependencies": {
"loader-utils": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
- "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
+ "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
@@ -6789,9 +6789,9 @@
},
"dependencies": {
"loader-utils": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
- "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
+ "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
@@ -10589,9 +10589,9 @@
"dev": true
},
"loader-utils": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
- "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz",
+ "integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
@@ -10866,9 +10866,9 @@
},
"dependencies": {
"loader-utils": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
- "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
+ "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
@@ -12565,9 +12565,9 @@
},
"dependencies": {
"loader-utils": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
- "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
+ "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
@@ -13264,9 +13264,9 @@
},
"dependencies": {
"loader-utils": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
- "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
+ "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
From 5ea1e3398f480eab63843a4f116e956b2c37be20 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Nov 2022 00:42:37 +0000
Subject: [PATCH 032/114] Bump loader-utils from 1.4.1 to 1.4.2
Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v1.4.1...v1.4.2)
---
updated-dependencies:
- dependency-name: loader-utils
dependency-type: indirect
...
Signed-off-by: dependabot[bot]
---
package-lock.json | 54 +++++++++++++++++++++++------------------------
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 6bbbca43..963b1ff6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3771,9 +3771,9 @@
},
"dependencies": {
"loader-utils": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
- "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+ "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
@@ -4170,9 +4170,9 @@
},
"dependencies": {
"loader-utils": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
- "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+ "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
@@ -5346,9 +5346,9 @@
},
"dependencies": {
"loader-utils": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
- "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+ "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
@@ -6289,9 +6289,9 @@
},
"dependencies": {
"loader-utils": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
- "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+ "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
@@ -6789,9 +6789,9 @@
},
"dependencies": {
"loader-utils": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
- "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+ "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
@@ -10589,9 +10589,9 @@
"dev": true
},
"loader-utils": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz",
- "integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==",
+ "version": "1.4.2",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+ "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
@@ -10866,9 +10866,9 @@
},
"dependencies": {
"loader-utils": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
- "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+ "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
@@ -12565,9 +12565,9 @@
},
"dependencies": {
"loader-utils": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
- "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+ "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
@@ -13264,9 +13264,9 @@
},
"dependencies": {
"loader-utils": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
- "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+ "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
From 0553980065887f63f458c5c85c1a6bcca0a1e32a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 3 Dec 2022 02:27:09 +0000
Subject: [PATCH 033/114] Bump decode-uri-component from 0.2.0 to 0.2.2
Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2)
---
updated-dependencies:
- dependency-name: decode-uri-component
dependency-type: indirect
...
Signed-off-by: dependabot[bot]
---
package-lock.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 963b1ff6..6f72c821 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5571,9 +5571,9 @@
"dev": true
},
"decode-uri-component": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
- "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+ "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
"dev": true
},
"dedent": {
From 5087660dcde595c725797860e3330e11c023f050 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 4 Dec 2022 22:47:40 +0000
Subject: [PATCH 034/114] Bump minimatch from 3.0.4 to 3.1.2
Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2.
- [Release notes](https://github.com/isaacs/minimatch/releases)
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2)
---
updated-dependencies:
- dependency-name: minimatch
dependency-type: indirect
...
Signed-off-by: dependabot[bot]
---
package-lock.json | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 6f72c821..e2ca24af 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10415,15 +10415,6 @@
"yallist": "^4.0.0"
}
},
- "minimatch": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
- "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
- "dev": true,
- "requires": {
- "brace-expansion": "^1.1.7"
- }
- },
"node-releases": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
@@ -10902,9 +10893,9 @@
"dev": true
},
"minimatch": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
- "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
"dev": true,
"requires": {
"brace-expansion": "^1.1.7"
From a828083dd018e2643d402675de9323e6caf2bad8 Mon Sep 17 00:00:00 2001
From: Nicolas Da Mutten
Date: Tue, 13 Dec 2022 23:55:35 +0100
Subject: [PATCH 035/114] feat(ci): allow more configuration
Change deploy script and GH Action to conditionally handle some env vars
---
.github/actions/deploy/action.yml | 24 ++++++++++++++++++++++++
.github/actions/deploy/deploy.sh | 27 ++++++++++++++++++++++-----
.github/workflows/ci.yml | 4 ++++
3 files changed, 50 insertions(+), 5 deletions(-)
diff --git a/.github/actions/deploy/action.yml b/.github/actions/deploy/action.yml
index be84e2d7..1768fc8d 100644
--- a/.github/actions/deploy/action.yml
+++ b/.github/actions/deploy/action.yml
@@ -39,6 +39,11 @@ inputs:
required: false
default: ''
+ app-contact-text:
+ description: 'The text of the footer contact link'
+ required: false
+ default: ''
+
db-host:
description: 'The URL of the database server'
required: false
@@ -57,6 +62,11 @@ inputs:
description: 'The password that will be used to log in to the database'
required: true
+ mail-mailer:
+ description: 'The mailer to use'
+ required: false
+ default: smtp
+
mail-host:
description: 'The location of the SMTP server to send emails'
required: false
@@ -97,6 +107,16 @@ inputs:
description: 'The Secret of the hitobito OAuth application'
required: true
+ collaboration-enabled:
+ description: 'If collaboration features should be enabled'
+ required: false
+ default: 'true'
+
+ collaboration-signaling-servers:
+ description: 'The collaboration signaling servers to use'
+ required: false
+ default: '"wss://signaling.yjs.dev wss://y-webrtc-signaling-eu.herokuapp.com wss://y-webrtc-signaling-us.herokuapp.com"'
+
sentry-laravel-dsn:
description: 'DSN for reporting backend errors to sentry'
required: false
@@ -132,10 +152,12 @@ runs:
APP_DEBUG: ${{ inputs.app-debug }}
APP_URL: ${{ inputs.app-url }}
APP_CONTACT_LINK: ${{ inputs.app-contact-link }}
+ APP_CONTACT_TEXT: ${{ inputs.app-contact-text }}
DB_HOST: ${{ inputs.db-host }}
DB_DATABASE: ${{ inputs.db-database }}
DB_USERNAME: ${{ inputs.db-username }}
DB_PASSWORD: ${{ inputs.db-password }}
+ MAIL_MAILER: ${{ inputs.mail-mailer }}
MAIL_HOST: ${{ inputs.mail-host }}
MAIL_PORT: ${{ inputs.mail-port }}
MAIL_USERNAME: ${{ inputs.mail-username }}
@@ -145,6 +167,8 @@ runs:
HITOBITO_BASE_URL: ${{ inputs.hitobito-base-url }}
HITOBITO_CLIENT_UID: ${{ inputs.hitobito-client-uid }}
HITOBITO_CLIENT_SECRET: ${{ inputs.hitobito-client-secret }}
+ COLLABORATION_ENABLED: ${{ inputs.collaboration-enabled }}
+ COLLABORATION_SIGNALING_SERVERS: ${{ inputs.collaboration-signaling-servers }}
SENTRY_LARAVEL_DSN: ${{ inputs.sentry-laravel-dsn }}
SENTRY_USER_FEEDBACK_URL: ${{ inputs.sentry-user-feedback-url }}
SENTRY_CSP_REPORT_URI: ${{ inputs.sentry-csp-report-uri }}
diff --git a/.github/actions/deploy/deploy.sh b/.github/actions/deploy/deploy.sh
index 4449579f..ab19c8d1 100755
--- a/.github/actions/deploy/deploy.sh
+++ b/.github/actions/deploy/deploy.sh
@@ -10,6 +10,10 @@ sed -ri "s~^APP_DEBUG=.*$~APP_DEBUG=$APP_DEBUG~" .env
sed -ri "s~^APP_URL=.*$~APP_URL=$APP_URL~" .env
sed -ri "s~^APP_CONTACT_LINK=.*$~APP_CONTACT_LINK=$APP_CONTACT_LINK~" .env
+if [ "$APP_CONTACT_TEXT" != ""]; then
+ sed -ri "s~^#APP_CONTACT_TEXT=.*$~APP_CONTACT_TEXT=$APP_CONTACT_TEXT~" .env
+fi
+
sed -ri "s~^DB_HOST=.*$~DB_HOST=$DB_HOST~" .env
sed -ri "s~^DB_DATABASE=.*$~DB_DATABASE=$DB_DATABASE~" .env
sed -ri "s~^DB_USERNAME=.*$~DB_USERNAME=$DB_USERNAME~" .env
@@ -17,11 +21,21 @@ sed -ri "s~^DB_PASSWORD=.*$~DB_PASSWORD=$DB_PASSWORD~" .env
sed -ri "s~^SESSION_SECURE_COOKIE=.*$~SESSION_SECURE_COOKIE=true~" .env
-sed -ri "s~^MAIL_HOST=.*$~MAIL_HOST=$MAIL_HOST~" .env
-sed -ri "s~^MAIL_PORT=.*$~MAIL_PORT=$MAIL_PORT~" .env
-sed -ri "s~^MAIL_USERNAME=.*$~MAIL_USERNAME=$MAIL_USERNAME~" .env
-sed -ri "s~^MAIL_PASSWORD=.*$~MAIL_PASSWORD=$MAIL_PASSWORD~" .env
-sed -ri "s~^MAIL_ENCRYPTION=.*$~MAIL_ENCRYPTION=$MAIL_ENCRYPTION~" .env
+if [ "$MAIL_MAILER" = "sendmail" ]; then
+ sed -ri "s~^MAIL_MAILER=.*$~MAIL_MAILER=$MAIL_MAILER~" .env
+
+ sed -ri "s~^MAIL_HOST=.*$~~" .env
+ sed -ri "s~^MAIL_PORT=.*$~~" .env
+ sed -ri "s~^MAIL_USERNAME=.*$~~" .env
+ sed -ri "s~^MAIL_PASSWORD=.*$~~" .env
+ sed -ri "s~^MAIL_ENCRYPTION=.*$~~" .env
+else
+ sed -ri "s~^MAIL_HOST=.*$~MAIL_HOST=$MAIL_HOST~" .env
+ sed -ri "s~^MAIL_PORT=.*$~MAIL_PORT=$MAIL_PORT~" .env
+ sed -ri "s~^MAIL_USERNAME=.*$~MAIL_USERNAME=$MAIL_USERNAME~" .env
+ sed -ri "s~^MAIL_PASSWORD=.*$~MAIL_PASSWORD=$MAIL_PASSWORD~" .env
+ sed -ri "s~^MAIL_ENCRYPTION=.*$~MAIL_ENCRYPTION=$MAIL_ENCRYPTION~" .env
+fi
sed -ri "s~^MAIL_FROM_ADDRESS=.*$~MAIL_FROM_ADDRESS=$MAIL_FROM_ADDRESS~" .env
sed -ri "s~^HITOBITO_BASE_URL=.*$~HITOBITO_BASE_URL=$HITOBITO_BASE_URL~" .env
@@ -29,6 +43,9 @@ sed -ri "s~^HITOBITO_CLIENT_UID=.*$~HITOBITO_CLIENT_UID=$HITOBITO_CLIENT_UID~" .
sed -ri "s~^HITOBITO_CLIENT_SECRET=.*$~HITOBITO_CLIENT_SECRET=$HITOBITO_CLIENT_SECRET~" .env
sed -ri "s~^HITOBITO_CALLBACK_URI=.*$~HITOBITO_CALLBACK_URI=${APP_URL}/login/hitobito/callback~" .env
+sed -ri "s~^COLLABORATION_ENABLED=.*$~COLLABORATION_ENABLED=${COLLABORATION_ENABLED}~" .env
+sed -ri "s~^COLLABORATION_SIGNALING_SERVERS=.*$~COLLABORATION_SIGNALING_SERVERS=${COLLABORATION_SIGNALING_SERVERS}~" .env
+
sed -ri "s~^SENTRY_RELEASE=.*$~SENTRY_RELEASE=$(git rev-parse HEAD)~" .env
sed -ri "s~^SENTRY_LARAVEL_DSN=.*$~SENTRY_LARAVEL_DSN=$SENTRY_LARAVEL_DSN~" .env
sed -ri "s~^SENTRY_USER_FEEDBACK_URL=.*$~SENTRY_USER_FEEDBACK_URL=$SENTRY_USER_FEEDBACK_URL~" .env
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 96d37af3..46c45bec 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -114,10 +114,12 @@ jobs:
app-key: ${{ secrets.APP_KEY }}
app-url: ${{ secrets.APP_URL }}
app-contact-link: ${{ secrets.APP_CONTACT_LINK }}
+ app-contact-text: ${{ secrets.APP_CONTACT_TEXT }}
db-host: ${{ secrets.DB_HOST }}
db-database: ${{ secrets.DB_DATABASE }}
db-username: ${{ secrets.DB_USERNAME }}
db-password: ${{ secrets.DB_PASSWORD }}
+ mail-mailer: ${{ secrets.MAIL_MAILER }}
mail-host: ${{ secrets.MAIL_HOST }}
mail-port: ${{ secrets.MAIL_PORT }}
mail-username: ${{ secrets.MAIL_USERNAME }}
@@ -126,6 +128,8 @@ jobs:
hitobito-base-url: ${{ secrets.HITOBITO_BASE_URL }}
hitobito-client-uid: ${{ secrets.HITOBITO_CLIENT_UID }}
hitobito-client-secret: ${{ secrets.HITOBITO_CLIENT_SECRET }}
+ collaboration-enabled: ${{ secrets.COLLABORATION_ENABLED }}
+ collaboration-signaling-servers: ${{ secrets.COLLABORATION_SIGNALING_SERVERS }}
sentry-laravel-dsn: ${{ secrets.SENTRY_LARAVEL_DSN }}
sentry-user-feedback-url: ${{ secrets.SENTRY_USER_FEEDBACK_URL }}
sentry-csp-report-uri: ${{ secrets.SENTRY_CSP_REPORT_URI }}
From 5f7aa1a7379d97c69f76a9aa0a0f945bb694c45f Mon Sep 17 00:00:00 2001
From: Carlo Beltrame
Date: Mon, 19 Dec 2022 18:08:35 +0100
Subject: [PATCH 036/114] Remove observation assignments and participant groups
when archiving course
Fixes #298
---
CHANGELOG.md | 3 ++
app/Http/Controllers/CourseController.php | 2 ++
...rticipant_groups_from_archived_courses.php | 36 +++++++++++++++++++
lang/de/t.php | 6 ++--
package-lock.json | 2 +-
.../Admin/Course/ArchiveCourseTest.php | 16 +++++++++
6 files changed, 61 insertions(+), 4 deletions(-)
create mode 100644 database/migrations/2022_09_06_120000_delete_observation_assignments_and_participant_groups_from_archived_courses.php
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7585db7..259be46a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
# Changelog
+##### Dezember 2022
+- Wenn ein Kurs archiviert wird, werden jetzt auch alle TN-Gruppen und Beobachtungsaufträge gelöscht, da diese potenziell Namen von TN enthalten können, und durch Anonymisierung der Mehrwert bei späterer Einsicht verloren gehen würde [#298](https://github.com/gloggi/qualix/issues/298)
+
##### November 2022
- Auf dem Überblick werden jetzt die Bilder des Kursteams angezeigt, falls zumindest jemand ein Bild hochgeladen hat
- Nicht-quadratische Avatar-Bilder von TN und Kursteam werden jetzt zugeschnitten statt zurechtgestaucht [#41](https://github.com/gloggi/qualix/issues/41)
diff --git a/app/Http/Controllers/CourseController.php b/app/Http/Controllers/CourseController.php
index 9b0a4247..69866c55 100644
--- a/app/Http/Controllers/CourseController.php
+++ b/app/Http/Controllers/CourseController.php
@@ -115,6 +115,8 @@ public function archive(Request $request, Course $course) {
DB::transaction(function() use ($course) {
$course->participants()->delete();
$course->observations()->delete();
+ $course->observationAssignments()->delete();
+ $course->participantGroups()->delete();
$course->update(['archived' => true]);
});
// Perform the image deletion after database deletion, so that a failing image doesn't prevent the whole deletion operation.
diff --git a/database/migrations/2022_09_06_120000_delete_observation_assignments_and_participant_groups_from_archived_courses.php b/database/migrations/2022_09_06_120000_delete_observation_assignments_and_participant_groups_from_archived_courses.php
new file mode 100644
index 00000000..71a3faeb
--- /dev/null
+++ b/database/migrations/2022_09_06_120000_delete_observation_assignments_and_participant_groups_from_archived_courses.php
@@ -0,0 +1,36 @@
+whereIn('course_id', function ($query) {
+ $query->select('id')->from('courses')->where('archived', true);
+ })
+ ->delete();
+
+ DB::table('participant_groups')
+ ->whereIn('course_id', function ($query) {
+ $query->select('id')->from('courses')->where('archived', true);
+ })
+ ->delete();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down() {
+ // Not possible to restore deleted data
+ }
+}
diff --git a/lang/de/t.php b/lang/de/t.php
index 18399d2f..d60a5f82 100644
--- a/lang/de/t.php
+++ b/lang/de/t.php
@@ -227,16 +227,16 @@
"course_settings" => array(
"archive" => "Kurs archivieren…",
"archive_confirm" => "Definitiv archivieren",
- "archive_description" => "Dies wird alle TN, Beobachtungen und Rückmeldungen im Kurs komplett und dauerhaft löschen. Diese Aktion kann nicht rückgängig gemacht werden. Blöcke, Anforderungen, Kategorien und Equipenmitglieder bleiben zur späteren Einsicht bestehen.",
+ "archive_description" => "Dies wird alle TN, Beobachtungen, TN-Gruppen, Beobachtungsaufträge und Rückmeldungen im Kurs komplett und dauerhaft löschen. Diese Aktion kann nicht rückgängig gemacht werden. Blöcke, Anforderungen, Kategorien und Equipenmitglieder bleiben zur späteren Einsicht bestehen.",
"archive_or_delete" => "Kurs archivieren oder löschen",
"archive_success" => "Kurs \":name\" wurde archiviert.",
"archive_vs_delete" => array(
- "answer" => "Wenn du einen Kurs archivierst, werden alle personenbezogenen Daten (TN, Bilder, Beobachtungen, Rückmeldungen) dauerhaft gelöscht. So kannst du Datenschutz-Problemen entgegenwirken, aber für spätere Kurse trotzdem noch deine alten Anforderungen und Blöcke einsehen. Wenn du den Kurs hingegen ganz löschst wird alles was damit zu tun hat unwiderruflich entfernt.",
+ "answer" => "Wenn du einen Kurs archivierst, werden alle personenbezogenen Daten (TN, Bilder, Beobachtungen, TN-Gruppen, Beobachtungsaufträge, Rückmeldungen) dauerhaft gelöscht. So kannst du Datenschutz-Problemen entgegenwirken, aber für spätere Kurse trotzdem noch deine alten Anforderungen und Blöcke einsehen. Wenn du den Kurs hingegen ganz löschst wird alles was damit zu tun hat unwiderruflich entfernt.",
"question" => "Was ist der Unterschied?",
),
"delete" => "Kurs komplett löschen…",
"delete_confirm" => "Definitiv löschen",
- "delete_description" => "Dies wird den Kurs komplett und dauerhaft löschen, inklusive alle Blöcke, TN, Anforderungen, Kategorien, Rückmeldungen und Beobachtungen darin. Diese Aktion kann nicht rückgängig gemacht werden.",
+ "delete_description" => "Dies wird den Kurs komplett und dauerhaft löschen, inklusive alle Blöcke, TN, Anforderungen, Kategorien, TN-Gruppen, Beobachtungsaufträge, Rückmeldungen und Beobachtungen darin. Diese Aktion kann nicht rückgängig gemacht werden.",
"delete_success" => "Kurs \":name\" und alle damit verbundenen Daten wurden gelöscht.",
"edit" => "Kurseinstellungen :name",
"edit_success" => "Kursdetails erfolgreich gespeichert.",
diff --git a/package-lock.json b/package-lock.json
index e2ca24af..943c83c7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5542,7 +5542,7 @@
"de-indent": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
- "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=",
+ "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
"dev": true
},
"deasync": {
diff --git a/tests/Feature/Admin/Course/ArchiveCourseTest.php b/tests/Feature/Admin/Course/ArchiveCourseTest.php
index 11cf9161..4d3a6f20 100644
--- a/tests/Feature/Admin/Course/ArchiveCourseTest.php
+++ b/tests/Feature/Admin/Course/ArchiveCourseTest.php
@@ -7,7 +7,9 @@
use App\Models\Course;
use App\Models\Invitation;
use App\Models\Observation;
+use App\Models\ObservationAssignment;
use App\Models\Participant;
+use App\Models\ParticipantGroup;
use App\Models\Requirement;
use App\Models\RequirementDetail;
use App\Models\Trainer;
@@ -71,6 +73,8 @@ public function test_shouldDeleteRelatedData() {
$requirementId = $this->createRequirement();
Block::find($this->blockId)->requirements()->attach($requirementId);
$this->createObservation('Beobachtung', 1, $requirementId, $categoryId);
+ $this->createObservationAssignment();
+ $this->createParticipantGroup();
$this->post('/course/' . $this->courseId . '/admin/invitation', ['email' => 'invited@test.com']);
$numBlocks = Block::all()->count();
$numCategories = Category::all()->count();
@@ -80,10 +84,16 @@ public function test_shouldDeleteRelatedData() {
$numParticipants = Participant::all()->count();
$numRequirements = Requirement::all()->count();
$numRequirementDetails = RequirementDetail::all()->count();
+ $numObservationAssignments = ObservationAssignment::all()->count();
+ $numParticipantGroups = ParticipantGroup::all()->count();
$numTrainers = Trainer::all()->count();
$numBlocksRequirements = DB::table('blocks_requirements')->count();
$numObservationsCategories = DB::table('observations_categories')->count();
$numObservationsRequirements = DB::table('observations_requirements')->count();
+ $numObservationAssignmentBlocks = DB::table('observation_assignment_blocks')->count();
+ $numObservationAssignmentParticipants = DB::table('observation_assignment_participants')->count();
+ $numObservationAssignmentUsers = DB::table('observation_assignment_users')->count();
+ $numParticipantGroupsParticipants = DB::table('participant_groups_participants')->count();
// when
$this->post('/course/' . $this->courseId . '/admin/archive');
@@ -97,10 +107,16 @@ public function test_shouldDeleteRelatedData() {
$this->assertEquals($numParticipants - 1, Participant::all()->count(), 'All participants of course should have been removed from DB');
$this->assertEquals($numRequirements, Requirement::all()->count(), 'All requirements should have remained in course');
$this->assertEquals($numRequirementDetails, RequirementDetail::all()->count(), 'All requirement details should have remained in course');
+ $this->assertEquals($numObservationAssignments - 1, ObservationAssignment::all()->count(), 'All observation assignments should have been removed from DB');
+ $this->assertEquals($numParticipantGroups - 1, ParticipantGroup::all()->count(), 'All participant groups should have been removed from DB');
$this->assertEquals($numTrainers, Trainer::all()->count(), 'All trainers should have remained in course');
$this->assertEquals($numBlocksRequirements, DB::table('blocks_requirements')->count(), 'All blocks_requirements should have remained in course');
$this->assertEquals($numObservationsCategories - 1, DB::table('observations_categories')->count(), 'All observations_categories entries of course should have been removed from DB');
$this->assertEquals($numObservationsRequirements - 1, DB::table('observations_requirements')->count(), 'All observations_requirements entries of course should have been removed from DB');
+ $this->assertEquals($numObservationAssignmentBlocks - 1, DB::table('observation_assignment_blocks')->count(), 'All observation_assignment_blocks entries of course should have been removed from DB');
+ $this->assertEquals($numObservationAssignmentParticipants - 1, DB::table('observation_assignment_participants')->count(), 'All observation_assignment_participants entries of course should have been removed from DB');
+ $this->assertEquals($numObservationAssignmentUsers - 1, DB::table('observation_assignment_users')->count(), 'All observation_assignment_users entries of course should have been removed from DB');
+ $this->assertEquals($numParticipantGroupsParticipants - 1, DB::table('participant_groups_participants')->count(), 'All participant_groups_participants entries of course should have been removed from DB');
}
public function test_shouldDeleteImagesOfParticipantsFromStorage() {
From 2fa9383a9157d36185f97f3cc2098426e10abc3b Mon Sep 17 00:00:00 2001
From: Carlo Beltrame
Date: Mon, 19 Dec 2022 19:11:07 +0100
Subject: [PATCH 037/114] Don't allow to edit and create feedbacks in archived
courses
---
CHANGELOG.md | 1 +
.../views/admin/feedbacks/index.blade.php | 56 ++++++++++---------
routes/web.php | 14 +++--
.../Admin/Feedback/CreateFeedbackTest.php | 12 ++++
.../Admin/Feedback/DeleteFeedbackTest.php | 19 +++++++
.../Admin/Feedback/ReadFeedbackTest.php | 13 +++++
.../Admin/Feedback/UpdateFeedbackTest.php | 12 ++++
.../FeedbackList/ReadFeedbackListTest.php | 13 +++++
.../ReadRequirementsMatrixTest.php | 13 +++++
9 files changed, 121 insertions(+), 32 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 259be46a..84f2b08f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
##### Dezember 2022
- Wenn ein Kurs archiviert wird, werden jetzt auch alle TN-Gruppen und Beobachtungsaufträge gelöscht, da diese potenziell Namen von TN enthalten können, und durch Anonymisierung der Mehrwert bei späterer Einsicht verloren gehen würde [#298](https://github.com/gloggi/qualix/issues/298)
+- In archivierten Kursen können Rückmeldungen nicht mehr bearbeitet oder neu angelegt werden, weil in solchen Kursen sowieso keine TN mehr ausgewählt werden können.
##### November 2022
- Auf dem Überblick werden jetzt die Bilder des Kursteams angezeigt, falls zumindest jemand ein Bild hochgeladen hat
diff --git a/resources/views/admin/feedbacks/index.blade.php b/resources/views/admin/feedbacks/index.blade.php
index 93bb7d1a..343c12df 100644
--- a/resources/views/admin/feedbacks/index.blade.php
+++ b/resources/views/admin/feedbacks/index.blade.php
@@ -5,31 +5,33 @@
@section('content')
-
- {{__('t.views.admin.feedbacks.new')}}
-
-
-
-
-
- @component('components.help-text', ['id' => 'feedbackHelp', 'key' => 't.views.admin.feedbacks.what_are_feedbacks'])@endcomponent
-
-
-
-
-
-
+ @if(!$course->archived)
+
+ {{__('t.views.admin.feedbacks.new')}}
+
+
+
+
+
+ @component('components.help-text', ['id' => 'feedbackHelp', 'key' => 't.views.admin.feedbacks.what_are_feedbacks'])@endcomponent
+
+
+
+
+
+
+ @endif
{{__('t.views.admin.feedbacks.existing', ['courseName' => $course->name])}}
@@ -42,7 +44,9 @@
{ label: $t('t.models.feedback.name'), value: feedbackData => feedbackData.name },
]"
:actions="{
- edit: feedbackData => routeUri('admin.feedbacks.edit', {course: {{ $course->id }}, feedback_data: feedbackData.id}),
+ @if(!$course->archived)
+ edit: feedbackData => routeUri('admin.feedbacks.edit', {course: {{ $course->id }}, feedback_data: feedbackData.id}),
+ @endif
delete: feedbackData => ({
text: $t('t.views.admin.feedbacks.really_delete', feedbackData),
route: ['admin.feedbacks.delete', {course: {{ $course->id }}, feedback_data: feedbackData.id}]
diff --git a/routes/web.php b/routes/web.php
index b182c1dd..00569746 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -45,11 +45,11 @@
Route::get('/course/{course}', [HomeController::class, 'index'])->name('index');
Route::get('/course/{course}/crib/{user?}', [BlockListController::class, 'crib'])->name('crib');
- Route::get('/course/{course}/feedbacks', [FeedbackListController::class, 'index'])->name('feedbacks');
- Route::get('/course/{course}/feedbacks/{feedback_data}', [FeedbackListController::class, 'progressOverview'])->name('feedback.requirementMatrix');
- Route::post('/course/{course}/feedbacks/{feedback_data}/{participant}/{requirement}', [FeedbackListController::class, 'updateRequirementStatus'])->name('feedback.updateRequirementStatus');
Route::middleware('courseNotArchived')->group(function () {
+ Route::get('/course/{course}/feedbacks', [FeedbackListController::class, 'index'])->name('feedbacks');
+ Route::get('/course/{course}/feedbacks/{feedback_data}', [FeedbackListController::class, 'progressOverview'])->name('feedback.requirementMatrix');
+ Route::post('/course/{course}/feedbacks/{feedback_data}/{participant}/{requirement}', [FeedbackListController::class, 'updateRequirementStatus'])->name('feedback.updateRequirementStatus');
Route::get('/course/{course}/participants', [ParticipantListController::class, 'index'])->name('participants');
Route::get('/course/{course}/participants/{participant}', [ParticipantDetailController::class, 'index'])->name('participants.detail');
@@ -129,9 +129,11 @@
Route::delete('/course/{course}/admin/category/{category}', [CategoryController::class, 'destroy'])->name('admin.categories.delete');
Route::get('/course/{course}/admin/feedbacks', [FeedbackController::class, 'index'])->name('admin.feedbacks');
- Route::post('/course/{course}/admin/feedbacks', [FeedbackController::class, 'store'])->name('admin.feedbacks.store');
- Route::get('/course/{course}/admin/feedbacks/{feedback_data}', [FeedbackController::class, 'edit'])->name('admin.feedbacks.edit');
- Route::post('/course/{course}/admin/feedbacks/{feedback_data}', [FeedbackController::class, 'update'])->name('admin.feedbacks.update');
+ Route::middleware('courseNotArchived')->group(function() {
+ Route::post('/course/{course}/admin/feedbacks', [FeedbackController::class, 'store'])->name('admin.feedbacks.store');
+ Route::get('/course/{course}/admin/feedbacks/{feedback_data}', [FeedbackController::class, 'edit'])->name('admin.feedbacks.edit');
+ Route::post('/course/{course}/admin/feedbacks/{feedback_data}', [FeedbackController::class, 'update'])->name('admin.feedbacks.update');
+ });
Route::delete('/course/{course}/admin/feedbacks/{feedback_data}', [FeedbackController::class, 'destroy'])->name('admin.feedbacks.delete');
Route::get('/newcourse', [CourseController::class, 'create'])->name('admin.newcourse');
diff --git a/tests/Feature/Admin/Feedback/CreateFeedbackTest.php b/tests/Feature/Admin/Feedback/CreateFeedbackTest.php
index c360f12a..b8c3ae86 100644
--- a/tests/Feature/Admin/Feedback/CreateFeedbackTest.php
+++ b/tests/Feature/Admin/Feedback/CreateFeedbackTest.php
@@ -41,6 +41,18 @@ public function test_shouldRequireLogin() {
$response->assertRedirect('/login');
}
+ public function test_shouldRequireNonArchivedCourse() {
+ // given
+ Course::find($this->courseId)->update(['archived' => true]);
+
+ // when
+ $response = $this->post('/course/' . $this->courseId . '/admin/feedbacks', $this->payload);
+
+ // then
+ $response->assertStatus(302);
+ $response->assertRedirect(route('admin.course', ['course' => $this->courseId]));
+ }
+
public function test_shouldCreateAndDisplayFeedback() {
// given
diff --git a/tests/Feature/Admin/Feedback/DeleteFeedbackTest.php b/tests/Feature/Admin/Feedback/DeleteFeedbackTest.php
index 5e88c78e..7ae175d9 100644
--- a/tests/Feature/Admin/Feedback/DeleteFeedbackTest.php
+++ b/tests/Feature/Admin/Feedback/DeleteFeedbackTest.php
@@ -2,6 +2,7 @@
namespace Tests\Feature\Admin\Feedback;
+use App\Models\Course;
use App\Models\Feedback;
use Illuminate\Testing\TestResponse;
use Tests\TestCaseWithBasicData;
@@ -46,6 +47,24 @@ public function test_shouldDeleteFeedback() {
$response->assertDontSee('Zwischenquali');
}
+ public function test_shouldWorkInArchivedCourse() {
+ // given
+ Course::find($this->courseId)->update(['archived' => true]);
+
+ // when
+ $response = $this->delete('/course/' . $this->courseId . '/admin/feedbacks/' . $this->feedbackDataId);
+
+ // then
+ $response->assertStatus(302);
+ $response->assertRedirect('/course/' . $this->courseId . '/admin/feedbacks');
+ /** @var TestResponse $response */
+ $response = $response->followRedirects();
+ $response->assertSee('Die Rückmeldung "Zwischenquali" wurde erfolgreich gelöscht.');
+
+ $response = $this->get('/course/' . $this->courseId . '/admin/feedbacks');
+ $response->assertDontSee('Zwischenquali');
+ }
+
public function test_shouldValidateDeletedFeedbackUrl_wrongId() {
// given
diff --git a/tests/Feature/Admin/Feedback/ReadFeedbackTest.php b/tests/Feature/Admin/Feedback/ReadFeedbackTest.php
index 728f2689..5584f4a9 100644
--- a/tests/Feature/Admin/Feedback/ReadFeedbackTest.php
+++ b/tests/Feature/Admin/Feedback/ReadFeedbackTest.php
@@ -2,6 +2,7 @@
namespace Tests\Feature\Admin\Feedback;
+use App\Models\Course;
use App\Models\Feedback;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Tests\TestCaseWithBasicData;
@@ -29,6 +30,18 @@ public function test_shouldRequireLogin() {
$response->assertRedirect('/login');
}
+ public function test_shouldRequireNonArchivedCourse() {
+ // given
+ Course::find($this->courseId)->update(['archived' => true]);
+
+ // when
+ $response = $this->get('/course/' . $this->courseId . '/admin/feedbacks/' . $this->feedbackDataId);
+
+ // then
+ $response->assertStatus(302);
+ $response->assertRedirect(route('admin.course', ['course' => $this->courseId]));
+ }
+
public function test_shouldDisplayFeedbackData() {
// given
diff --git a/tests/Feature/Admin/Feedback/UpdateFeedbackTest.php b/tests/Feature/Admin/Feedback/UpdateFeedbackTest.php
index 9d04686a..3f7775cb 100644
--- a/tests/Feature/Admin/Feedback/UpdateFeedbackTest.php
+++ b/tests/Feature/Admin/Feedback/UpdateFeedbackTest.php
@@ -45,6 +45,18 @@ public function test_shouldRequireLogin() {
$response->assertRedirect('/login');
}
+ public function test_shouldRequireNonArchivedCourse() {
+ // given
+ Course::find($this->courseId)->update(['archived' => true]);
+
+ // when
+ $response = $this->post('/course/' . $this->courseId . '/admin/feedbacks/' . $this->feedbackDataId, $this->payload);
+
+ // then
+ $response->assertStatus(302);
+ $response->assertRedirect(route('admin.course', ['course' => $this->courseId]));
+ }
+
public function test_shouldUpdateAndDisplayFeedback() {
// given
diff --git a/tests/Feature/FeedbackList/ReadFeedbackListTest.php b/tests/Feature/FeedbackList/ReadFeedbackListTest.php
index 6af617c7..e4be32e4 100644
--- a/tests/Feature/FeedbackList/ReadFeedbackListTest.php
+++ b/tests/Feature/FeedbackList/ReadFeedbackListTest.php
@@ -2,6 +2,7 @@
namespace Tests\Feature\FeedbackList;
+use App\Models\Course;
use App\Models\Feedback;
use App\Models\Participant;
use Tests\TestCaseWithBasicData;
@@ -38,6 +39,18 @@ public function test_shouldRequireLogin() {
$response->assertRedirect('/login');
}
+ public function test_shouldRequireNonArchivedCourse() {
+ // given
+ Course::find($this->courseId)->update(['archived' => true]);
+
+ // when
+ $response = $this->get('/course/' . $this->courseId . '/feedbacks');
+
+ // then
+ $response->assertStatus(302);
+ $response->assertRedirect(route('admin.course', ['course' => $this->courseId]));
+ }
+
public function test_shouldWork() {
// given
diff --git a/tests/Feature/FeedbackList/ReadRequirementsMatrixTest.php b/tests/Feature/FeedbackList/ReadRequirementsMatrixTest.php
index 61d15e1a..2ed97006 100644
--- a/tests/Feature/FeedbackList/ReadRequirementsMatrixTest.php
+++ b/tests/Feature/FeedbackList/ReadRequirementsMatrixTest.php
@@ -2,6 +2,7 @@
namespace Tests\Feature\FeedbackList;
+use App\Models\Course;
use App\Models\Feedback;
use App\Models\FeedbackData;
use App\Models\Participant;
@@ -40,6 +41,18 @@ public function test_shouldRequireLogin() {
$response->assertRedirect('/login');
}
+ public function test_shouldRequireNonArchivedCourse() {
+ // given
+ Course::find($this->courseId)->update(['archived' => true]);
+
+ // when
+ $response = $this->get('/course/' . $this->courseId . '/feedbacks/' . $this->feedbackDataId);
+
+ // then
+ $response->assertStatus(302);
+ $response->assertRedirect(route('admin.course', ['course' => $this->courseId]));
+ }
+
public function test_shouldWork() {
// given
From b7dc718456502d964341faab271ddd6b1ae6f048 Mon Sep 17 00:00:00 2001
From: Carlo Beltrame
Date: Thu, 22 Dec 2022 16:16:51 +0100
Subject: [PATCH 038/114] Add fake participant images to e2e:scenario generated
courses
---
app/Console/Commands/E2EScenario.php | 6 +++++-
database/factories/ParticipantFactory.php | 24 +++++++++++++++++++++++
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/app/Console/Commands/E2EScenario.php b/app/Console/Commands/E2EScenario.php
index 56898cf2..b9ba1493 100644
--- a/app/Console/Commands/E2EScenario.php
+++ b/app/Console/Commands/E2EScenario.php
@@ -7,6 +7,7 @@
use App\Models\Feedback;
use App\Models\FeedbackData;
use App\Models\Observation;
+use App\Models\Participant;
use App\Models\User;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\App;
@@ -61,7 +62,10 @@ public function handle()
->hasUsers(3)
->hasRequirements(4)
->hasRequirementStatuses(3)
- ->hasParticipants(10)
+ ->has(Participant::factory()
+ ->count(10)
+ ->withImage()
+ )
->has(Block::factory()
->count(10)
->has(Observation::factory()
diff --git a/database/factories/ParticipantFactory.php b/database/factories/ParticipantFactory.php
index 8ebf931a..d9258e31 100644
--- a/database/factories/ParticipantFactory.php
+++ b/database/factories/ParticipantFactory.php
@@ -4,6 +4,8 @@
use App\Models\Participant;
use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Storage;
class ParticipantFactory extends Factory {
/**
@@ -24,4 +26,26 @@ public function definition() {
'group' => $this->faker->parse('{{lastName}} {{city}}'),
];
}
+
+ public function withImage() {
+ return $this->state(function (array $state) {
+ // Download metadata about the image
+ $response = Http::get('https://fakeface.rest/face/json?minimum_age=17&maximum_age=24')->json();
+ $filename = $response['filename'];
+ $imageUrl = $response['image_url'];
+
+ // Download the actual image into a temp file
+ $stream = @fopen($imageUrl, 'r');
+ $tempFile = tempnam(sys_get_temp_dir(), 'url-file-');
+ file_put_contents($tempFile, $stream);
+
+ // Store the image into laravel storage
+ $stored = Storage::putFileAs('public/images', $tempFile, $filename);
+
+ return [
+ 'image_url' => $stored,
+ ];
+ });
+ }
+
}
From 29a6b3405b29f8fb547e38386c1c38fb21ee35a3 Mon Sep 17 00:00:00 2001
From: Carlo Beltrame
Date: Thu, 22 Dec 2022 17:21:23 +0100
Subject: [PATCH 039/114] Update documentation comments on Course
---
app/Models/Course.php | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/app/Models/Course.php b/app/Models/Course.php
index 3dbbe6ad..71c61b12 100644
--- a/app/Models/Course.php
+++ b/app/Models/Course.php
@@ -19,6 +19,8 @@
* @property Invitation[] $invitations
* @property User[] $users
* @property Requirement[] $requirements
+ * @property ParticipantGroup[] $participantGroups
+ * @property ObservationAssignment[] $observationAssignments
* @property Category[] $categories
* @property Observation[] $observations
* @property Collection $participants
@@ -61,6 +63,7 @@ public function users() {
public function requirements() {
return $this->hasMany('App\Models\Requirement', 'course_id');
}
+
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
@@ -68,6 +71,7 @@ public function participantGroups()
{
return $this->hasMany('App\Models\ParticipantGroup', 'course_id');
}
+
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
From 11a0bc46273b7627a3ee98aa2c7e56cf3e4584e6 Mon Sep 17 00:00:00 2001
From: Carlo Beltrame
Date: Thu, 22 Dec 2022 17:22:34 +0100
Subject: [PATCH 040/114] POC participant group generator, refs #301
---
.../ParticipantGroupController.php | 33 ++++
.../Requests/MultiParticipantGroupRequest.php | 25 +++
lang/de/t.php | 10 ++
resources/js/components/form/ButtonSubmit.vue | 3 +-
.../participantGroups/ParticipantAvatar.vue | 21 +++
.../ParticipantGroupGenerator.vue | 134 +++++++++++++++
.../participantGroups/geneticGolferSolver.js | 159 ++++++++++++++++++
.../participantGroups/index.worker.js | 10 ++
.../sass/_participant-group-generator.scss | 19 +++
resources/sass/app.scss | 1 +
.../participantGroups/generate.blade.php | 20 +++
.../admin/participantGroups/index.blade.php | 6 +-
routes/web.php | 2 +
13 files changed, 441 insertions(+), 2 deletions(-)
create mode 100644 app/Http/Requests/MultiParticipantGroupRequest.php
create mode 100644 resources/js/components/participantGroups/ParticipantAvatar.vue
create mode 100644 resources/js/components/participantGroups/ParticipantGroupGenerator.vue
create mode 100644 resources/js/components/participantGroups/geneticGolferSolver.js
create mode 100644 resources/js/components/participantGroups/index.worker.js
create mode 100644 resources/sass/_participant-group-generator.scss
create mode 100644 resources/views/admin/participantGroups/generate.blade.php
diff --git a/app/Http/Controllers/ParticipantGroupController.php b/app/Http/Controllers/ParticipantGroupController.php
index d0ca06e9..791de929 100644
--- a/app/Http/Controllers/ParticipantGroupController.php
+++ b/app/Http/Controllers/ParticipantGroupController.php
@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
+use App\Http\Requests\MultiParticipantGroupRequest;
use App\Http\Requests\ParticipantGroupRequest;
use App\Models\Course;
use App\Models\ParticipantGroup;
@@ -42,6 +43,38 @@ public function store(ParticipantGroupRequest $request, Course $course)
return Redirect::route('admin.participantGroups', ['course' => $course->id]);
}
+ /**
+ * Display a UI for generating participant groups.
+ *
+ * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ */
+ public function generate()
+ {
+ return view('admin.participantGroups.generate');
+ }
+
+ /**
+ * Store multiple newly created resources in storage.
+ *
+ * @param MultiParticipantGroupRequest $request
+ * @param Course $course
+
+ * @return RedirectResponse
+ */
+ public function storeMany(MultiParticipantGroupRequest $request, Course $course)
+ {
+ DB::transaction(function() use ($request, $course){
+ $data = $request->validated();
+ foreach($data['participantGroups'] as $groupData) {
+ $participantGroup = ParticipantGroup::create(array_merge($groupData, ['course_id' => $course->id]));
+ $participantGroup->participants()->sync(array_filter(explode(',', $groupData['participants'])));
+ }
+ $request->session()->flash('alert-success', __('t.views.admin.participant_groups.create_many_success'));
+ });
+
+ return Redirect::route('admin.participantGroups', ['course' => $course->id]);
+ }
+
/**
* Show the form for editing the specified resource.
*
diff --git a/app/Http/Requests/MultiParticipantGroupRequest.php b/app/Http/Requests/MultiParticipantGroupRequest.php
new file mode 100644
index 00000000..a7215c15
--- /dev/null
+++ b/app/Http/Requests/MultiParticipantGroupRequest.php
@@ -0,0 +1,25 @@
+mapWithKeys(function ($item, $key) {
+ return ["participantGroups.*.$key" => $item];
+ })->all();
+ }
+
+ public function attributes() {
+ return collect(parent::attributes())->mapWithKeys(function ($item, $key) {
+ return ["participantGroups.*.$key" => $item];
+ })->all();
+ }
+}
diff --git a/lang/de/t.php b/lang/de/t.php
index d60a5f82..5f646dc6 100644
--- a/lang/de/t.php
+++ b/lang/de/t.php
@@ -340,10 +340,12 @@
"question" => "Muss ich TN-Gruppen für meinen Kurs erfassen?",
),
"create_success" => "TN-Gruppe wurde erfolgreich erstellt.",
+ "create_many_success" => "TN-Gruppen wurden erfolgreich erstellt.",
"delete_success" => "TN-Gruppe wurde erfolgreich gelöscht.",
"edit" => "TN-Gruppe bearbeiten",
"edit_success" => "TN-Gruppe wurde erfolgreich gespeichert.",
"existing" => "TN-Gruppen :courseName",
+ "generate" => "TN-Gruppen-Generator",
"menu_name" => "TN-Gruppen",
"new" => "Neue TN-Gruppe",
"no_participant_group" => "Bisher sind keine TN-Gruppen erfasst.",
@@ -355,6 +357,14 @@
"question" => "Was sind TN-Gruppen?",
),
),
+ "participant_group_generator" => array(
+ "generate" => "Gruppen generieren",
+ "no_participant_group" => "Bisher sind keine TN-Gruppen erfasst.",
+ "page_title" => "TN-Gruppen verwalten",
+ "participants" => "Zu gruppierende TN",
+ "participant_groups" => "Überschneidungen mit bestehenden TN-Gruppen vermeiden",
+ "select_all" => "Alle auswählen"
+ ),
"feedbacks" => array(
"create" => "Erstellen",
"go_back_to_feedback_list" => "Abbrechen",
diff --git a/resources/js/components/form/ButtonSubmit.vue b/resources/js/components/form/ButtonSubmit.vue
index a9542bab..48446eb2 100644
--- a/resources/js/components/form/ButtonSubmit.vue
+++ b/resources/js/components/form/ButtonSubmit.vue
@@ -1,7 +1,7 @@
-