Bugfix radioprogrammas niet op hele uren

This commit is contained in:
2020-01-21 00:06:51 +01:00
parent ab00033312
commit a740bdfe96
2 changed files with 8 additions and 3 deletions

View File

@@ -14,7 +14,7 @@
@php($now = new \DateTime("now")) @php($now = new \DateTime("now"))
@foreach($schedule as $item) @foreach($schedule as $item)
@php($diff = $item['endtime']->diff($item['starttime'])) @php($diff = $item['endtime']->diff($item['starttime']))
@php($duration = $diff->d * 24 + $diff->h + $diff->m / 60) @php($duration = $diff->d * 24 + $diff->h + $diff->i / 60)
@php($isCurrent = ($now >= $item['starttime']) && ($now <= $item['endtime'])) @php($isCurrent = ($now >= $item['starttime']) && ($now <= $item['endtime']))
@php($class = ($item['program']->priority < 2 ? ' special' : '') @php($class = ($item['program']->priority < 2 ? ' special' : '')
. ($item['program']->nonstop || $item['program']->rerun ? ' non-stop' : '') . ($item['program']->nonstop || $item['program']->rerun ? ' non-stop' : '')
@@ -37,7 +37,7 @@
<div class="program-title">{{$item['program']->name}}</div> <div class="program-title">{{$item['program']->name}}</div>
@if($isCurrent) <div class="current-marker"><span>Nu op NH Gooi</span></div> @endif @if($isCurrent) <div class="current-marker"><span>Nu op NH Gooi</span></div> @endif
<div class="program-content"> <div class="program-content">
<div class="program-times">{{$item['starttime']->format('H:i')}} &ndash; {{$item['endtime']->format('H:i')}} uur.</div> <div class="program-times"><span class="fa fa-clock"></span> {{$item['starttime']->format('H:i')}} &ndash; {{$item['endtime']->format('H:i')}} uur.</div>
<div>{{Formatter::excerpt($item['program']->description, 150)}}</div> <div>{{Formatter::excerpt($item['program']->description, 150)}}</div>
</div> </div>
</a> </a>

View File

@@ -144,8 +144,13 @@
} }
.schedule .program.non-stop { .schedule .program.non-stop {
color: #6c757d; border-color: #6C757D;
color: #6C757D;
} }
.schedule .program.non-stop .program-title {
background-color: #8F9BA6;
}
.schedule .program.special { .schedule .program.special {
color: #03A6E0; color: #03A6E0;