Details des Tickets
Beschreibung,Kommentare und Anhänge
| assigned to @gabrielg |
Sascha Immig |
2022-07-18T09:01:25.053Z |
added 84 commits
- 5b9c1e37...22bfaeb1 - 83 commits from branch
develop - bf523586 - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…
Compare with previous version |
Gregor Gabriel |
2022-07-18T13:27:37.741Z |
| wir benötigen hier
`min-date="{{ now()->addDays(1)->endOfDay() }}"` |
Gregor Gabriel |
2022-07-18T13:57:27.954Z |
| wir benötigen hier
`min-date="{{ now()->addDays(1)->endOfDay() }}"` |
Gregor Gabriel |
2022-07-18T13:57:47.937Z |
| Hatte im Task vorgeschlagen: `min-date="{{ min($trainingAssignment->available_until, now()->addDays(1)->endOfDay) }}` - also min, nicht max...
Macht das Sinn? Sonst würde eine Anpassung immer minimal bis morgen gelten. (Ich weiß jetzt nicht, warum ich eine Abgelaufene Order auf ein anderes, vergangenes Datum ändern sollte, aber gut...) Bitte hier nochmal kurz zu dritt drüber quatschen. |
Sascha Immig |
2022-07-20T09:49:35.301Z |
| siehe oben - im Task war `min-date="{{ min($trainingAssignment->available_until, now()->addDays(1)->endOfDay) }}` vorgeschlagen... |
Sascha Immig |
2022-07-20T09:50:03.070Z |
| ich dachte erst, wir benötigen hier
`min-date="{{ now()->addDays(1)->endOfDay() }}"`
aber der End-Termin darf natürlich nicht vor dem Start-Termin liegen ! |
Gregor Gabriel |
2022-07-25T07:29:14.778Z |
| Tatsächlich ist Markus' Ansatz der richtige. Denn in jedem Fall darf das End-Datum nicht vor dem Start-Datum liegen |
Gregor Gabriel |
2022-07-25T07:31:30.000Z |
| changed this line in version 3 of the diff |
Gregor Gabriel |
2022-07-25T08:14:21.520Z |
| changed this line in version 3 of the diff |
Gregor Gabriel |
2022-07-25T08:14:21.656Z |
| changed this line in version 3 of the diff |
Gregor Gabriel |
2022-07-25T08:14:21.824Z |
| resolved all discussions |
Gregor Gabriel |
2022-07-25T08:14:22.409Z |
added 1 commit
- 73358098 - + fixed insufficient valdation on server side
Compare with previous version |
Gregor Gabriel |
2022-07-25T08:14:22.612Z |
| ```php
if (Carbon::parse($trainingAssignment->available_until)->gt($available_until)) {
return ['error' => 'new end date must be later than present end date'];
}
```
sollte durch
```php
if ($available_until->lt(carbon($trainingAssignment->available_at)->addDay()->endOfDay())) {
return ['error' => 'new end date must be a after start date'];
}
if ($available_until->lt(now()->addDay()->endOfDay())) {
return ['error' => 'new end date must be a future date'];
}
``` |
Gregor Gabriel |
2022-07-25T08:18:01.164Z |
| ```php
if (carbon($order->available_until)->gt($available_until)) {
return ['error' => 'new end date must be later than present end date'];
}
```
sollte durch
```php
if ($available_until->lt(carbon($order->available_at)->addDay()->endOfDay())) {
return ['error' => 'new end date must be a after start date'];
}
if ($available_until->lt(now()->addDay()->endOfDay())) {
return ['error' => 'new end date must be a future date'];
}
``` |
Gregor Gabriel |
2022-07-25T08:19:25.790Z |
| ```php
if (carbon($order->available_until)->gt($available_until)) {
return ['error' => 'new end date must be later than present end date'];
}
```
sollte durch
```php
if ($available_until->lt(carbon($order->available_at)->addDay()->endOfDay())) {
return ['error' => 'new end date must be a after start date'];
}
if ($available_until->lt(now()->addDay()->endOfDay())) {
return ['error' => 'new end date must be a future date'];
}
``` |
Gregor Gabriel |
2022-07-25T08:20:15.300Z |
| changed this line in version 4 of the diff |
Gregor Gabriel |
2022-07-25T10:27:14.833Z |
| resolved all discussions |
Gregor Gabriel |
2022-07-25T10:27:14.909Z |
added 58 commits
- 73358098...31beb686 - 57 commits from branch
develop - cd39e5a4 - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…
Compare with previous version |
Gregor Gabriel |
2022-07-25T10:27:15.114Z |
| resolved all discussions |
Gregor Gabriel |
2022-07-25T11:02:28.829Z |
added 4 commits
- cd39e5a4...eaf6394b - 3 commits from branch
develop - 6c3a49c0 - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…
Compare with previous version |
Gregor Gabriel |
2022-07-25T11:02:29.139Z |
| enabled an automatic merge when the pipeline for 6c3a49c0d6efb162ceb702ec1958720e8f7ef3b5 succeeds |
Gregor Gabriel |
2022-07-25T11:09:51.940Z |
| merged |
Gregor Gabriel |
2022-07-25T11:12:09.469Z |
| mentioned in commit 542ada307924a7ef299bbe3d50eb0541d7d72e75 |
Gregor Gabriel |
2022-07-25T11:12:09.556Z |
| Title |
Id |
Author |
Created at |
Message |
| Now the date can be selected independently of the end date. With the condition… |
5b9c1e37e0d990ee15be1443619db34614d7044a |
markusgerlach |
2022-06-24T06:56:57.000Z |
Now the date can be selected independently of the end date. With the condition that it is one day later than the start date.
|
| Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… |
6c3a49c0d6efb162ceb702ec1958720e8f7ef3b5 |
TUV\gabrielg |
2022-07-25T11:02:05.000Z |
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-1203-shortening-of-booked-instructions
|
| + fixed insufficient valdation on server side |
73358098ff6708719e5f259e474fb4e7dd34b197 |
TUV\gabrielg |
2022-07-25T08:14:15.000Z |
+ fixed insufficient valdation on server side
+ removed unnecessary UTC vs CEST fix
|
| Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… |
bf5235867a017644299beaabe6fb6c8addb8488f |
TUV\gabrielg |
2022-07-18T13:27:32.000Z |
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-1203-shortening-of-booked-instructions
# Conflicts:
# resources/views/admin/groups/assignment/orders/table.blade.php
# resources/views/admin/organizationUnits/orders/table.blade.php
|
| Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… |
cd39e5a41ffc2f26d300e26427ddebd9507ae3f1 |
TUV\gabrielg |
2022-07-25T10:27:06.000Z |
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-1203-shortening-of-booked-instructions
# Conflicts:
# resources/views/admin/users/includes/trainings.blade.php
|