Clean up code a bit and remove old implementation
This commit is contained in:
@@ -6,28 +6,27 @@
|
||||
{{- $listSchedule := partialCached "tsc/calendar/list" . }}
|
||||
<div class="calendar-schedule calendar-grid-{{ $numDays }}-days">
|
||||
<div class="header">
|
||||
<div class="first-row"></div>
|
||||
<div class="times-left"></div>
|
||||
{{ range $days }}
|
||||
<div class="first-row">{{ . }}</div>
|
||||
<div class="main-column">{{ . }}</div>
|
||||
{{ end }}
|
||||
<div class="first-row"></div>
|
||||
<div class="second-row"></div>
|
||||
<div class="times-right"></div>
|
||||
<div class="times-left"></div>
|
||||
{{ range $days }}
|
||||
<div class="rooms second-row">
|
||||
<div class="rooms main-column">
|
||||
<div>Vorne</div>
|
||||
<div>Mitte</div>
|
||||
<div>Hinten</div>
|
||||
</div>
|
||||
{{ end }}
|
||||
<div class="second-row"></div>
|
||||
<div class="times-right"></div>
|
||||
</div>
|
||||
{{ range (seq $start $end) }}
|
||||
{{- $currentHour := string . -}}
|
||||
{{- $addClass := "" -}}
|
||||
{{- $firstRow := eq . $start -}}
|
||||
{{- if eq . $start }}{{ $addClass = "first-main-row"}}{{ end -}}
|
||||
{{ warnf "Current hour: %s (%T)" $currentHour $currentHour }}
|
||||
<div class="table-row">{{ printf "%2d:00" . }}</div>
|
||||
<div class="table-row times-left">{{ printf "%2d:00" . }}</div>
|
||||
{{- range $id, $day := $days }}
|
||||
<div class="table-row main-entry">
|
||||
{{- range $listSchedule }}
|
||||
@@ -37,10 +36,6 @@
|
||||
{{- if ne $currentHour $evHour }}{{ continue }}{{ end -}}
|
||||
{{- $hours := int ($sTime.Format "15") -}}
|
||||
{{- $minutes := int ($sTime.Format "4") -}}
|
||||
{{/* warnf "%T" $hours */}}
|
||||
{{/* $hours = add $hours (sub 0 $start) (div $minutes 60.0) */}}
|
||||
{{/* print $hours */}}
|
||||
{{/* $hours = $hours - 0 + ($minutes / 60.0) */}}
|
||||
{{- $style := printf "--duration: %d; --minutes: %d;" .duration $minutes -}}
|
||||
{{/* warnf "%s" $style */}}
|
||||
<div class="event room-{{ .roomId }}" style="{{ $style | safeCSS }}">
|
||||
@@ -51,35 +46,6 @@
|
||||
{{ end -}}
|
||||
</div>
|
||||
{{ end -}}
|
||||
<div class="table-row">{{ printf "%2d:00" . }}</div>
|
||||
<div class="table-row times-right">{{ printf "%2d:00" . }}</div>
|
||||
{{ end }}
|
||||
<!--<div class="times">
|
||||
{{ range (seq $start $end) }}
|
||||
<div>{{ printf "%2d:00" . }}</div>
|
||||
<div>{{ printf "%2d:00" . }}</div>
|
||||
{{ end }}
|
||||
</div>
|
||||
{{ range $id, $day := $days }}
|
||||
<div class="cal-main-content day-{{$id}}">
|
||||
{{ range $listSchedule }}
|
||||
{{- if ne .day $day }}{{ continue }}{{ end }}
|
||||
{{- $sTime := time.AsTime (printf "2025-01-02T%s:00" .start) -}}
|
||||
{{- $hours := int ($sTime.Format "15") -}}
|
||||
{{- $minutes := int ($sTime.Format "4") -}}
|
||||
{{/* warnf "%T" $hours */}}
|
||||
{{ $hours = add $hours (sub 0 $start) (div $minutes 60.0) }}
|
||||
{{/* print $hours */}}
|
||||
{{/* $hours = $hours - 0 + ($minutes / 60.0) */}}
|
||||
{{- $top := mul $hours 60 -}}
|
||||
{{- $height := mul (div .duration 60.0) 60 -}}
|
||||
{{- $style := printf "top: %1.0fpx; height: %1.0fpx;" $top $height -}}
|
||||
{{/* warnf "%s" $style */}}
|
||||
<div class="event room-{{ .roomId }}" style="{{ $style | safeCSS }}">
|
||||
<div>
|
||||
{{ .title }}
|
||||
</div>
|
||||
</div>
|
||||
{{ end }}
|
||||
</div>
|
||||
{{ end }}-->
|
||||
</div>
|
||||
|
||||
@@ -1,64 +0,0 @@
|
||||
{{ $start := .Get 0 }}
|
||||
{{ $end := .Get 1}}
|
||||
{{ $days := after 2 .Params }}
|
||||
{{ $calendar := $.Site.Data.calendar.calendar }}
|
||||
<table class="calendar-manual">
|
||||
<tr>
|
||||
<th></th>
|
||||
{{ range $days }}
|
||||
<th colspan="3" class="day-title">{{ . }}</th>
|
||||
{{ end }}
|
||||
<th></th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th></th>
|
||||
{{ range $days }}
|
||||
<th class="first-col-of-room">vorne</th>
|
||||
<th>mitte</th>
|
||||
<th>hinten</th>
|
||||
{{ end }}
|
||||
<th></th>
|
||||
</tr>
|
||||
{{ range seq $start $end }}
|
||||
{{ $hour := . }}
|
||||
{{ range seq 0 15 45 }}
|
||||
{{ $firstMin := "" }}
|
||||
{{ if eq . 0 }}
|
||||
{{ $firstMin = "first-min" }}
|
||||
{{ end }}
|
||||
<tr class="{{ $firstMin }}">
|
||||
{{ $time := printf "%2d:%02d" $hour . }}
|
||||
{{ if or (eq . 0) (eq . 30) }}
|
||||
<td rowspan="2" class="time">{{ $time }}</td>
|
||||
{{ end }}
|
||||
{{ range $days }}
|
||||
{{ $day := . }}
|
||||
{{ $firstRoom := true }}
|
||||
{{ range slice "vorne" "mitte" "hinten" }}
|
||||
{{ $room := . }}
|
||||
{{ $addClass := "" }}
|
||||
{{ if $firstRoom }}
|
||||
{{ $addClass = "first-col-of-room" }}
|
||||
{{ $firstRoom = false }}
|
||||
{{ end }}
|
||||
{{ with index (index (index $calendar .) $day) $time }}
|
||||
<td class="calendar-block {{ $addClass }}">
|
||||
<div class="calendar-block-entity height-{{ .slots }}">
|
||||
<div class="room-block room-{{ $room }}">
|
||||
{{ .title }}
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
{{ else }}
|
||||
<td class="{{ $addClass }}"></td>
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
{{ if or (eq . 0) (eq . 30) }}
|
||||
{{ $time := printf "%2d.%02d" $hour . }}
|
||||
<td rowspan="2" class="time">{{ $time }}</td>
|
||||
{{ end }}
|
||||
</tr>
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
</table>
|
||||
Reference in New Issue
Block a user