From 0852c708913bef15c70b8f11420b946c44f7af4f Mon Sep 17 00:00:00 2001 From: hummypkg Date: Mon, 29 Aug 2011 22:34:26 +0000 Subject: [PATCH] improve scheduling screen git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@311 2a923420-c742-0410-a762-8d5b09965624 --- var/mongoose/cgi-bin/epg_info.jim | 9 +- var/mongoose/cgi-bin/sched_cancel.jim | 26 +++++ var/mongoose/cgi-bin/sched_info.jim | 123 +++++++++++++++++++++++ var/mongoose/html/img/add.png | Bin 0 -> 8165 bytes var/mongoose/html/img/close.png | Bin 0 -> 10834 bytes var/mongoose/include/sched.jim | 138 +++++++++++++++----------- var/mongoose/lib/rsv.class | 64 +++++++++++- 7 files changed, 295 insertions(+), 65 deletions(-) create mode 100755 var/mongoose/cgi-bin/sched_cancel.jim create mode 100755 var/mongoose/cgi-bin/sched_info.jim create mode 100644 var/mongoose/html/img/add.png create mode 100644 var/mongoose/html/img/close.png diff --git a/var/mongoose/cgi-bin/epg_info.jim b/var/mongoose/cgi-bin/epg_info.jim index 0b8dfeb..ff13d0a 100755 --- a/var/mongoose/cgi-bin/epg_info.jim +++ b/var/mongoose/cgi-bin/epg_info.jim @@ -10,15 +10,10 @@ puts "" cgi_input #cgi_dump -set service 0 -catch { set service [dict get $_cgi service] } -set event 0 -catch { set event [dict get $_cgi event] } +set service [cgi_get service 0] +set event [cgi_get event 0] if {! [dict exists $_cgi bare]} { header } -#set service 8448 -#set event 30843 - set record [lindex [epg fetch dump -service $service -event $event] 0] $record get_channel_info set others [$record othertimes] diff --git a/var/mongoose/cgi-bin/sched_cancel.jim b/var/mongoose/cgi-bin/sched_cancel.jim new file mode 100755 index 0000000..a63cfe1 --- /dev/null +++ b/var/mongoose/cgi-bin/sched_cancel.jim @@ -0,0 +1,26 @@ +#!/mod/bin/jimsh + +package require cgi +source /mod/var/mongoose/lib/setup +require rsv.class + +puts "Content-Type: text/html" +puts "" + +cgi_input +#cgi_dump + +set slot [cgi_get slot 0] +set table [cgi_get table TBL_RESERVATION] + +set event [rsv slot $table $slot] + +if {$table eq "pending"} { + $event remove_pending + exit +} + +$event clear_ulslot +$event set_delete +$event insert + diff --git a/var/mongoose/cgi-bin/sched_info.jim b/var/mongoose/cgi-bin/sched_info.jim new file mode 100755 index 0000000..2b838e2 --- /dev/null +++ b/var/mongoose/cgi-bin/sched_info.jim @@ -0,0 +1,123 @@ +#!/mod/bin/jimsh + +package require cgi +source /mod/var/mongoose/lib/setup +require rsv.class + +puts "Content-Type: text/html" +puts "" + +cgi_input +#cgi_dump + +set table [cgi_get table TBL_RESERVATION] +set slot [cgi_get slot 0] + +set event [rsv slot $table $slot] + +set rsvicon [$event icon] +if {$rsvicon ne ""} { + set rsvicon " +} + +set RKIcon [$event RKIcon] +if {$RKIcon ne ""} { + set RKIcon " +} + +if {[$event get ucRecKind] == 4} { + set series 1 +} else { + set series 0 +} + +puts " + + + + + + + + + + + + +" + +set s [$event get nsttime] +set d [$event get nduration] +set e $($s + $d) +set n [clock seconds] + +if { $n > $e } { + puts " + + + + +" + +set crid [join [lrange [split [$event get szCRID] /] 1 end]] +if {$crid != ""} { + puts "" +} +puts "" +puts "" +puts "
Event [$event get ulslot]$rsvicon $RKIcon
Channel +" +if {[$event get usLcn] ne ""} { + puts " + + - [$event get usLcn] - [$event channel_name] + " +} + +puts " +
Event Name[$event name]
Start" +} else { + puts "" +} +puts "[clock format $s -format "%a %d %b %Y"] + [clock format $s -format "%H:%M %Z"]" + +if {$d > 0 && $n > $s && $n < $e} { + puts "
" + set perc [expr [expr $n - $s] * 100 / $d] + puts "" + puts [progressbar $perc] +} + +puts " +
Duration[clock format [$event get nduration] -format %T]
" + if $series { puts "Series" } else { puts "Event" } + puts " CRID" + puts -nonewline " + + [$event get szCRID]" + puts "
Events" +set flag 0 +foreach ev [split [$event get szEventToRecord] "|"] { + if {$ev eq ""} { continue } + set ev [string range $ev 1 end] + if {$flag} { puts "
" } + incr flag + set crid [join [lrange [split $ev /] 1 end]] + puts -nonewline " + + $ev" + puts "" +} +puts "
Accepted" +if {[$event get aulEventToRecordInfo] != ""} { + puts "Yes" +} +puts "
" + diff --git a/var/mongoose/html/img/add.png b/var/mongoose/html/img/add.png new file mode 100644 index 0000000000000000000000000000000000000000..f91195e29abf4e6453befb130f04449f8c5108a7 GIT binary patch literal 8165 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 LNkvXXu0mjfugG+> literal 0 HcmV?d00001 diff --git a/var/mongoose/html/img/close.png b/var/mongoose/html/img/close.png new file mode 100644 index 0000000000000000000000000000000000000000..12beb9226c1dd899df10bc4417a69ef2a67b1d8a GIT binary patch literal 10834 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ɆjaAC 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 literal 0 HcmV?d00001 diff --git a/var/mongoose/include/sched.jim b/var/mongoose/include/sched.jim index 595898d..e508613 100755 --- a/var/mongoose/include/sched.jim +++ b/var/mongoose/include/sched.jim @@ -4,6 +4,7 @@ source /mod/var/mongoose/lib/setup require altrow rsv.class progressbar puts { +
} -proc eventheader {} { +proc eventheader {{table TBL_RESERVATION}} { puts { + } + + if {$table eq "pending" } { puts "" } + + puts { - - } } -proc eventrow {event} { +proc eventrow {event {table TBL_RESERVATION}} { set name [$event name] altrow - set rsvicon "" - switch [$event get ersvtype] { - 1 { set rsvicon "175_1_00_Reservation_Watch.png" } - 2 { set rsvicon "175_1_00_Reservation_Watch.png" } - 3 { set rsvicon "175_1_11_Reservation_Record.png" } - 5 { set rsvicon "745_1_10_Video_2Live.png" } - 6 { set rsvicon "745_1_11_Video_1REC.png" } - 7 { set rsvicon "345_6_08_ST_Ad_Hoc.png" } - } - - set series 0 + set rsvicon [$event icon] + set RKIcon [$event RKIcon] if {[$event get ucRecKind] == 4} { - set RKIcon "175_1_11_Series_Record.png" set series 1 } else { - switch [$event get erepeat] { - 1 {set RKIcon "521_1_00_RP_Daily_C.png"} - 2 {set RKIcon "521_1_00_RP_Weekly_C.png"} - 3 {set RKIcon "521_1_00_RP_Weekdays_C.png"} - 4 {set RKIcon "521_1_00_RP_Weekend_C.png"} - default {set RKIcon ""} - } + set series 0 } if {$rsvicon ne ""} { @@ -96,6 +133,16 @@ proc eventrow {event} { set RKIcon " } + if {$table eq "pending"} { + if {[$event get action] == 0} { + set icon "add" + } else { + set icon "close" + } + puts "" + } + puts "" if {[$event get usLcn] ne ""} { @@ -111,7 +158,10 @@ proc eventrow {event} { puts "" } - puts "" + puts "" set s [$event get nsttime] set d [$event get nduration] @@ -138,36 +188,12 @@ proc eventrow {event} { puts "" puts "" - puts "" - puts "" if {[$event get aulEventToRecordInfo] != ""} { - puts "" + puts "" + } else { + puts "" } puts "" } @@ -178,9 +204,9 @@ proc eventfooter {} { set events [rsv list pending] if {[llength $events] > 0} { - puts "

Pending Scheduled Events

" - eventheader - foreach event $events {eventrow $event} + puts "

Pending Schedule Events

" + eventheader pending + foreach event $events {eventrow $event pending} eventfooter puts { diff --git a/var/mongoose/lib/rsv.class b/var/mongoose/lib/rsv.class index da5f0ef..8eb64fb 100755 --- a/var/mongoose/lib/rsv.class +++ b/var/mongoose/lib/rsv.class @@ -12,6 +12,7 @@ if {![file exists /var/lib/humaxtv/rsvp.db]} { set tdb [sqlite3.open /var/lib/humaxtv/rsvp.db] $tdb query {drop table TBL_VERSION} $tdb query {alter table TBL_RESERVATION rename to pending} + $tdb query {alter table pending add column action int} $tdb query {delete from pending} $tdb close } @@ -47,6 +48,7 @@ class rsv { szSvcName {} usLcn 0 sort 0 + action 0 } rsv method clear_ulslot {} { @@ -75,6 +77,42 @@ rsv method channel_name {} { return [string range $szSvcName 1 end] } +rsv method icon {} { + set rsvicon "" + switch [$self get ersvtype] { + 1 { set rsvicon "175_1_00_Reservation_Watch.png" } + 2 { set rsvicon "175_1_00_Reservation_Watch.png" } + 3 { set rsvicon "175_1_11_Reservation_Record.png" } + 5 { set rsvicon "745_1_10_Video_2Live.png" } + 6 { set rsvicon "745_1_11_Video_1REC.png" } + 7 { set rsvicon "345_6_08_ST_Ad_Hoc.png" } + } + return $rsvicon +} + +rsv method RKIcon {} { + if {[$self get ucRecKind] == 4} { + set RKIcon "175_1_11_Series_Record.png" + } else { + switch [$self get erepeat] { + 1 {set RKIcon "521_1_00_RP_Daily_C.png"} + 2 {set RKIcon "521_1_00_RP_Weekly_C.png"} + 3 {set RKIcon "521_1_00_RP_Weekdays_C.png"} + 4 {set RKIcon "521_1_00_RP_Weekend_C.png"} + default {set RKIcon ""} + } + } + return $RKIcon +} + +rsv method set_delete {} { + set action 1 +} + +rsv method remove_pending {} { + $::rsvdb query "delete from pending where ulslot = [$self get ulslot]" +} + rsv method fix_hsvc {} { global rsvdb @@ -124,6 +162,11 @@ rsv method insert {{table pending}} { set fields [lreplace $fields $df $df] } + if {$table ne "pending"} { + set df [lsearch $fields "action"] + set fields [lreplace $fields $df $df] + } + set vals {} foreach field $fields { # Escape any quotes embedded in the data. @@ -194,6 +237,21 @@ proc {rsv entry} {{table TBL_RESERVATION} crid svc} { return 0 } +proc {rsv slot} {{table TBL_RESERVATION} slot} { + set res [$::rsvdb query " + select $table.*, + channel.TBL_SVC.szSvcName, channel.TBL_SVC.usLcn + from $table + left join channel.TBL_SVC + on $table.hSvc = channel.TBL_SVC.hSvc + where ulslot = %s" $slot] + + if {[llength $res] > 0} { + return [rsv new [lindex $res 0]] + } + return 0 +} + proc {rsv cleanup} {} { catch {$::rsvdb close} } @@ -201,8 +259,10 @@ proc {rsv cleanup} {} { proc {rsv commit} {} { $::rsvdb query {begin transaction} foreach rec [rsv list pending] { - $rec clear_ulslot - $rec insert TBL_RESERVATION + if {[$rec get action] == 0} { + $rec clear_ulslot + $rec insert TBL_RESERVATION + } } $::rsvdb query {delete from pending} $::rsvdb query {commit transaction}
Action  Channel Programme Start Time Duration ModeEvent/Series IDEvents
+ [$event get ulslot] 

 $name + $name + [clock format [$event get nduration] -format %T]$rsvicon $RKIcon" - set crid [join [lrange [split [$event get szCRID] /] 1 end]] - if {$crid != ""} { - puts -nonewline " - - [$event get szCRID]" - puts "" - } - puts "" - set flag 0 - foreach ev [split [$event get szEventToRecord] "|"] { - if {$ev eq ""} { continue } - set ev [string range $ev 1 end] - if {$flag} { puts "
" } - incr flag - set crid [join [lrange [split $ev /] 1 end]] - puts -nonewline " - - $ev" - puts "" - } - puts "		*\"Accepted