From 8bdb1233e81d27056a10e6e8e47f3160cbda6450 Mon Sep 17 00:00:00 2001 From: df Date: Thu, 18 Feb 2021 13:57:33 +0000 Subject: [PATCH] Display raw programme times, not clipped to the display period. --- webif/html/xepg/index.jim | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/webif/html/xepg/index.jim b/webif/html/xepg/index.jim index a136046..fef0fd5 100755 --- a/webif/html/xepg/index.jim +++ b/webif/html/xepg/index.jim @@ -263,6 +263,15 @@ foreach e $records { if {$es < $le} continue + set perc [$e percent] + set showing 0 + if {$perc > 0 && $perc < 100} { set showing 1 } + + set txt [list [cgi_quote_html [$e get name]] "([\ + clock format $es -format "%H:%M"] - [\ + clock format $ee -format "%H:%M"])[\ + expr {$showing? " ($perc%)": ""}]"] + if {$es < $stt} { set es $stt } if {$ee > $ett} { set ee $ett } @@ -292,21 +301,6 @@ foreach e $records { set recopts 1 if {[$e get series_crid] ne ""} { set recopts 2 } - set perc [$e percent] - set showing 0 - if {$perc > 0 && $perc < 100} { set showing 1 } - - set txt "[cgi_quote_html [$e get name]] ([\ - clock format $es -format "%H:%M"] - [\ - clock format $ee -format "%H:%M"])" - if {$showing} { append txt " ($perc%)" } - append txt "" - - set htxt "[cgi_quote_html [$e get name]] ([\ - clock format $es -format "%H:%M"] - [\ - clock format $ee -format "%H:%M"])" - if {$showing} { append hxt " ($perc%)" } - set lbg $bg # Set backround if scheduled. 1 1-off, 2 series, 3 recorded, 4 skipped switch -- [$e scheduled] { @@ -318,11 +312,11 @@ foreach e $records { } puts "
+ style=\"width: [expr $px - 4]px;\" title=\"[join $txt]\"> " - puts $txt + puts [format "%s %s" {*}$txt] puts "" puts "
" }