Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix - Fix displayed time of the presentation in programme #597

Merged
merged 2 commits into from
Nov 14, 2024
Merged

Hotfix - Fix displayed time of the presentation in programme #597

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efe66cb
Remove timeslot from the start time reference
IGORnvk Nov 9, 2024
3e104d7
Merge branch 'development' into hotfix/programme
IGORnvk Nov 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions resources/views/programme/show.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ class="text-yellow-500 flex transititext-primary text-primary transition duratio
Place and time
</h2>
<p>Room: {{$presentation->room->name}}</p>
<p>Time: {{Carbon::parse($presentation->timeslot->start)->format('H:i')}}
- {{(Carbon::parse($presentation->timeslot->start)->addMinutes($presentation->duration))->format('H:i')}}</p>
<p>Time: {{Carbon::parse($presentation->start)->format('H:i')}}
- {{(Carbon::parse($presentation->start)->addMinutes($presentation->duration))->format('H:i')}}</p>
</div>
@if(Auth::user())
@can('enroll', $presentation)
Expand Down
Loading