X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=courses%2Fwidgets.sh;h=d4ce22ac6a7d0e7e456b22a98399c8a730eb558b;hp=9e4fdd0d3119884657b9c032b22e2a2009d08320;hb=c0302919c54331fc9fe3785f7d2a44e639e1bba0;hpb=9a13e82c7e9d0f29ab18df4407c04d0eafdb0aa6;ds=sidebyside diff --git a/courses/widgets.sh b/courses/widgets.sh index 9e4fdd0..d4ce22a 100755 --- a/courses/widgets.sh +++ b/courses/widgets.sh @@ -1,4 +1,4 @@ -# Copyright 2014, 2019 Paul Hänsch +# Copyright 2014, 2019, 2020 Paul Hänsch # # This file is part of Confetti. # @@ -122,44 +122,75 @@ edit_item(){ local mstart="${dtstart#*-}"; mstart="${mstart%%-*}" local dstart="${dtstart##*-}"; dstart="${dstart%% *}" local hhstart="${dtstart##* }"; hhstart="${hhstart%%:*}" - local mmstart="${dtstart##*:}"; + local mmstart="${dtstart##* }"; mmstart="${mmstart#*:}"; mmstart="${mmstart%:*}" local m mn cdow d - printf '[div .section .DTSTART][h3 %s]' "$(l10n DTSTART)" - printf '[select .DTSYEAR name="DTSYEAR" onchange="this.form.submit();"\n' - seq $((ystart - 50)) $((ystart + 50)) |while read y; do - printf '[option value="%i" %s %i]\n' $y "$([ $y -eq $ystart ] && printf selected)" $y - done - printf ']' - printf '[select .DTSMONTH name="DTSMONTH" onchange="this.form.submit();"\n' - m=1; for mn in $(l10n January February March April May June July August September October November December); do - printf '[option value="%i" %s . %s]\n' $m "$(selected $m $mstart)" "$mn" - m=$((m+1)) - done - printf '][submit "DTS" "update" .DTS %s]\n' "$(l10n edit_dtscal)" - printf '[table .dtscalt [tr' - printf '[th . %s]' $(l10n Mon Tue Wed Thu Fri Sat Sun) - printf ']\n[tr ' - cdow="$(date -d ${ystart}-${mstart}-1 +%u)" - seq 2 $cdow |xargs -n1 printf '[td .padding .%s]' - d=1; while [ "$d" -lt 29 ] || [ "$(date -d ${ystart}-${mstart}-${d} +%m)" -eq "$mstart" ]; do - [ $cdow -eq 1 -a $d -ne 1 ] && printf ']\n[tr ' - printf '[td [input .DTSCAL type="radio" name="DTSDAY" #DTSCAL_%i value="%i" %s][label .DTSCAL for="DTSCAL_%i" %i]]' \ - $d $d "$(checked $d $dstart)" $d $d - d=$((d + 1)); cdow=$(((cdow + 1) % 7)) - done 2>/dev/null - printf ']]\n' - printf '[span .DTSTIME %s:][select .DTSTIME name="DTSHOUR"' "$(l10n time)" - seq 00 23 |while read h; do - printf '[option value="%i" %s %02i]' $h "$(selected "$h" "$hhstart")" $h - done - printf ']:[select .DTSTIME name="DTSMINUTE"' - seq 00 5 55 |while read m; do - printf '[option value="%i" %s %02i]' $m "$(selected "$m" "$mmstart")" $m - done - printf ']' + cat <<-EOF + [h3 . $(l10n DTSTART)] + [input type="number" name="DTS_YEAR" value="${ystart}" placeholder="$(l10n YYYY)"] + [select name="DTS_MONTH" onchange="this.form.submit();" + $(m=1; for mn in $(l10n January February March April May June July August September October November December); do + printf ' [option value="%02i" %s . %s]\n' $m "$(selected $m $mstart)" "$mn" + m=$((m+1)) + done) + ][submit "DTS" "update" . $(l10n edit_dtscal)] + [table .dtscalt + [tr $(printf '[th . %s]' $(l10n Mon Tue Wed Thu Fri Sat Sun))] + [tr $( + local cdow d + cdow="$(date -d ${ystart}-${mstart}-1 +%u)" + seq 2 $cdow |xargs -n1 printf '[td .padding .%s]' + d=1; while [ "$d" -lt 29 ] || [ "$(date -d ${ystart}-${mstart}-${d} +%m)" -eq "$mstart" ]; do + [ $cdow -eq 1 -a $d -ne 1 ] && printf ']\n [tr ' + printf '[td [input type="radio" name="DTS_DAY" #DTSCAL_%i value="%02i" %s][label for="DTSCAL_%i" %i]]' \ + $d $d "$(checked $d $dstart)" $d $d + d=$((d + 1)); cdow=$(((cdow + 1) % 7)) + done 2>/dev/null + )] + ] + [span .DTSTIME $(l10n time):] + [input type="number" name="DTS_HOUR" value="$hhstart" min="0" max="23"]:[input type="number" name="DTS_MINUTE" value="$mmstart" min="0" max="59"] + EOF ;; RRULE) + local dtstart="$(pdi_value "$course" DTSTART |cal_date)" + local ystart="${dtstart%%-*}"; ystart="${ystart##* }" + local mstart="${dtstart#*-}"; mstart="${mstart%%-*}" + local dstart="${dtstart##*-}"; dstart="${dstart%% *}" + + local rrule="$(pdi_value "$course" RRULE)" + local rr_int="$(printf %s "$rrule" |sed -rn 's;^(.*\;[ ]*)?INTERVAL=([0-9]+)(\;.*)?$;\2;p')" + local rr_count="$(printf %s "$rrule" |sed -rn 's;^(.*\;[ ]*)?COUNT=([0-9]+)(\;.*)?$;\2;p')" + local rr_freq="$(printf %s "$rrule" |sed -rn 's;^(.*\;[ ]*)?FREQ=(DAILY|WEEKLY|MONTHLY|YEARLY)(\;.*)?$;\2;p')" + local rr_until="$(printf %s "$rrule" |sed -rn 's;^(.*\;[ ]*)?UNTIL=([0-9]{8}T[0-9]{6}Z)(\;.*)?$;\2;p')" + local rr_uyear="${rr_until%????T??????Z}" + local rr_umonth=${rr_until#????}; rr_umonth="${rr_umonth%??T??????Z}" + local rr_uday=${rr_until#??????}; rr_uday="${rr_uday%T??????Z}" + local rr_limit="ETERN" + [ "$rr_count" ] && [ "$rr_count" -ge 0 ] && rr_limit="COUNT" + [ "$rr_uyear" ] && [ "$rr_uyear" -ge 0 ] && rr_limit="UNTIL" + + cat <<-EOF + [h3 . $(l10n "$item")] + [span .item . $(l10n t_every) + [input type="number" .RRULE .INTERVAL name="RRULE_INTERVAL" placeholder="#N" value="${rr_int:-1}" min="1"] + [select .RRULE .FREQ name="RRULE_FREQ" + $(for f in DAILY WEEKLY MONTHLY YEARLY; do + printf ' [option value="%s" %s . %s]\n' "$f" "$(selected $f "$rr_freq")" "$(l10n $f)" + done) + ]] + [span .item [input type="radio" name="RRULE_LIMIT" value="ETERN" $(checked "$rr_limit" ETERN) . $(l10n t_eternal)][br]] + [span .item + [input type="radio" name="RRULE_LIMIT" value="COUNT" $(checked "$rr_limit" COUNT)] + [input type="number" .RRULE .COUNT name="RRULE_COUNT" placeholder="#N" value="${rr_count:-1}" min="1"] $(l10n t_times) + ] + [span .item + [input type="radio" name="RRULE_LIMIT" value="UNTIL" $(checked "$rr_limit" UNTIL) . $(l10n t_until)] + [input type="number" .RRULE .UYEAR name="RRULE_UYEAR" placeholder="$(l10n YYYY)" value="${rr_uyear:-$ystart}" min="$ystart"] + [input type="number" .RRULE .UMONTH name="RRULE_UMONTH" placeholder="$(l10n MM)" value="${rr_umonth:-$mstart}" min="1" max="12"] + [input type="number" .RRULE .UDAY name="RRULE_UDAY" placeholder="$(l10n DD)" value="${rr_uday:-$dstart}" min="1" max="31"] + ] + EOF ;; COMMENT) printf '[h3 %s]' "$(l10n "$item")" @@ -171,8 +202,25 @@ edit_item(){ done printf '[button type="submit" name="action" value="addfield %s" %s ]' "$item" "$(l10n edit_addfield)" ;; - attendance);; - SUMMARY|*)printf '[h3 %s]' "$(l10n "$item")" + attendance) + printf '[h3 %s]' "$(l10n course_attendance)" + for vcf in "$_DATA"/vcard/*.vcf; do + fn="$(pdi_value "$(pdi_load "$vcf")" FN)" + printf '%s/%s\n' "${vcf##*/}" "$fn" + done \ + | sort -t/ -k2 \ + | while IFS=/ read -r vcf fn; do + printf '[label [input type="checkbox" .item name="attendance" value="%s" %s] %s]' \ + "$vcf" "$(grep -qxF "${coursefile##*/} $vcf" "$_DATA/mappings/attendance" && printf 'checked="checked"')" "$fn" + done + ;; + SUMMARY) + printf '[h3 %s]' "$(l10n "$item")" + printf '[input .item .%s name="%s" value="%s" placeholder="%s"]' \ + "$item" "$item" "$(pdi_value "$course" "$item" |unescape |HTML)" "$(l10n "$item")" + ;; + *) + printf '[h3 %s]' "$(l10n "$item")" seq 1 $cnt |while read c; do printf '[checkbox "%s_delete_%i" "true" .delete #%s_delete_%i][label for="%s_delete_%i" %s]' \ "$item" $c "$item" $c "$item" $c "$(l10n delete)"