From 593b7dbb891eab568f3dae2976161546e3d651e4 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Mon, 19 Dec 2011 15:57:03 +0000 Subject: [PATCH] fix bugs, show AR/Pad status git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@572 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 2 +- var/mongoose/cgi-bin/sched_info.jim | 17 +++++++++++++--- var/mongoose/html/css/tsort.css | 10 +++++++++ var/mongoose/html/img/ar.png | Bin 0 -> 4677 bytes var/mongoose/html/img/pad.png | Bin 0 -> 4375 bytes var/mongoose/html/img/tsort/bgplain.png | Bin 0 -> 2167 bytes var/mongoose/include/sched.jim | 26 +++++++++++++++++------- var/mongoose/lib/rsv.class | 25 +++++++++++++++++++++-- 8 files changed, 67 insertions(+), 13 deletions(-) create mode 100644 var/mongoose/html/img/ar.png create mode 100644 var/mongoose/html/img/pad.png create mode 100644 var/mongoose/html/img/tsort/bgplain.png diff --git a/CONTROL/control b/CONTROL/control index 0b90d24..9763c34 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 0.8.7-1 +Version: 0.8.8 Architecture: mipsel Maintainer: af123@hummypkg.org.uk Depends: mongoose(>=3.0-2),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4-1),jim-oo,jim-pack,service-control,busybox(>=1.19.3-1),lsof,epg(>=1.0.8),hmt(>=1.1.2),ssmtp,anacron diff --git a/var/mongoose/cgi-bin/sched_info.jim b/var/mongoose/cgi-bin/sched_info.jim index 958254a..8b7eba7 100755 --- a/var/mongoose/cgi-bin/sched_info.jim +++ b/var/mongoose/cgi-bin/sched_info.jim @@ -17,12 +17,23 @@ set event [rsv slot $table $slot] set rsvicon [$event icon] if {$rsvicon ne ""} { - set rsvicon " + set rsvicon "" + if {[$event get ersvtype] == 3} { + if {[$event padded]} { + set padding "<- [expr [$event get ulPreOffset] / 60], [expr [$event get ulPostOffset] / 60] ->" + append rsvicon \ + "\"$padding\"" + } else { + append rsvicon \ + "" + } + } } set RKIcon [$event RKIcon] if {$RKIcon ne ""} { - set RKIcon " + set RKIcon "" } if {[$event get ucRecKind] == 4} { @@ -115,7 +126,7 @@ foreach ev [split [$event get szEventToRecord] "|"] { } puts "" puts "Accepted" -if {[$event get aulEventToRecordInfo] != ""} { +if {[$event get aulEventToRecordInfo] ne ""} { puts "Yes" } puts "" diff --git a/var/mongoose/html/css/tsort.css b/var/mongoose/html/css/tsort.css index 3a842a9..5c8b011 100644 --- a/var/mongoose/html/css/tsort.css +++ b/var/mongoose/html/css/tsort.css @@ -10,6 +10,16 @@ table.tablesorter .header { height: auto; } +table.tablesorter .headerplain { + background-image: url(/img/tsort/bgplain.png); + background-repeat: no-repeat; + border-left: 1px solid #FFF; + border-right: 1px solid #000; + border-top: 1px solid #FFF; + padding-top: 8px; + height: auto; +} + table.tablesorter .headerSortUp { background-image: url(/img/tsort/asc.png); background-repeat: no-repeat; diff --git a/var/mongoose/html/img/ar.png b/var/mongoose/html/img/ar.png new file mode 100644 index 0000000000000000000000000000000000000000..95f594a2c7e86f8bf4a965adc52b729fca74bbc4 GIT binary patch literal 4677 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 Hu0mjfy|wgw literal 0 HcmV?d00001 diff --git a/var/mongoose/html/img/pad.png b/var/mongoose/html/img/pad.png new file mode 100644 index 0000000000000000000000000000000000000000..b93180f17be6a75efb7e3ea7e4e1050951e0df67 GIT binary patch literal 4375 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 RV!Z$W002ovPDHLkV1jt^Cma9( literal 0 HcmV?d00001 diff --git a/var/mongoose/html/img/tsort/bgplain.png b/var/mongoose/html/img/tsort/bgplain.png new file mode 100644 index 0000000000000000000000000000000000000000..81306614a2a61104afd209d2178b4cc90999ed91 GIT binary patch literal 2167 zcmZvc3sh3+7RNEWm8Lz^tjuz9${v%|wd+i#W*Mmm!OXOjy5VYYwxr7{(rykqsGTY zySw_hqEIMzAO@X)LOHEK-WN`BM(&9iQXukhI-C$4iK=J%YEdX>R6I6uGvU=wot>TW z3_R&&b{p>@{#ESOu5AUc67em#il!@+&eTg)rw%r3Cfo@PZ{GmWJnVM6&1M@K8nRlg zTCKLNt!;RCI4dh_aBvWYVU`%j21h<7Ty3wn6a=FoD zv{N(ydmD z(P)D8Fa!yO5X9qh&1Q?qWaRS&W{X82;M*MzkO4|0QV}Fl$mMJ{XUI0BhhfB>!{%sp zI=+C9M4C({kq9!HOiGo?VzD|9S?o3#*30EGHiwM}#NlvcayhKmLn0B6%ah6EFl=x* z>;gW2Y;26nMdrAW5aRRsTrPLKMT22z$fl4hPN%b2EP6d`v6vYQ1`;QNpr~#f2r~7E!TJ=|z7*DOrBeArdtg{cL~7Gw zwOXy!YBKM}#MHYGnEMmKWZ;2Eao4_swLo0sB1i=7pe$#-X+%i zY`Hf(5lm}tZl=*_O-)Vr?%&_a*hTFiU>dx?ec}6E%e;^`tHV1s5SZx_@%X?s;ba4d z)OM56WE-*x1VRSLP^&d0W?p}PpUrN^(Wb>Swxx9J4(s?EiIc5COsm1sabmHUPG^Y4 z5(b@te}Ypg6ogJv+@nQ=Zo&`kA!>~#sy#BQJF>5@udVGhsV|Szmy4y7n7yk^P_t2}Vt3%#|5;=!S?Ch=W+lZVT5<3_F5EIw1D7tn^4`OsW@y!9R z6W~H*W4L6;q#Q<}rh1NFPN?fQ<{*=ke+F=yCqr(YZZrHoRXiR=p(cI;&>Iu?iQ(%X zw)p^FT_ams*XFx*FLXV7e8P!CE=5b1PBf!BzRd_D$POev`WJv@(8@t^H2j$ctqE_( zQl8`|a3d@fLzz)Ml9yyG!Dl$XIzTa?0>R$-w;s=Z<{Y*U`J#|C)6yF7?vw5&@$zL^ zIj-||#i3^}q!nHQf@ljU{@wK+vofd{&+?Kk|AKi7+NXBT`*CMzswZ`LRMjRd-CeXN z;O(3I}1vD z%RrEM!L={{{(c7FS)NqtkX4~Jy*`$! zF?)Twd#2-g=!FQwh5XS%R{CEH2WEN{VZI2qeB+UleGUKYzTRJ#vEtTyBBm^@_4%^Q zpk{3KPaCTf;AP#XzWc^!59KNlWHe`cA>Q}mV~M!T?ZMu?c8&h#ljs9`Zn!`rPnN_` zP5Mus0|2@Pdz)%*@CrOq@^kB?+jnn%Ox|Epl9$fG><*lGvZ9xll)XN@Wd`53-^7A~kVfJv<)3)3 z&idRtzxW6`^z-T3=gyRWjCvl`oj-pex-0bAkLZXTa(ob=3SV&kKQz@*!J5tqmS{qI z?T1l*r;Z<$nUfQIB#7(DQ`6!v1~x#D7_l~y^xe@potD;dwlU_?05Gjf}p zy0Vn@{$2KB*2~mf&R~JBqb?;)U;Q>=E$5zd%4XeZ+DXfTL zWj%p=ACI{S>>u@Yzf1RDG#^c#P@l-3l^S>28Kyh!SnC_p{95+F7hZX`J)o36D|y;4 zg-Jm`fVe$jq9EyZWZ

S_(J0RinA5G(PR%q*HV8D-H%;W5>;j$M^c2PE*1?uH>4p zFn?w9PCYQL$l4HB-vECTD^?Nml!C1Th79?WD>3UTB8k6MrYvklvEEI}AdkVJzxq9$ zfA3{IHzSPYXz~2K&HN!aqSfIzH@N-nqO!c{u`|bkpLh1o7nw7^-?^g{W?>%J;(sI8 zZKvGQ)wsC}GB+hXU0$-X{OtPeC4XG}fr~jr^xBOgzp_lhY(IR!lIU-I1vk-q&s_=R zoE+y~TwpwofWHm_|H^e__pUvCvbZkKa_QxZN9$I(=jWf})wQL)UqftUZm!K9|wvDT3#ZttC5r6Wg@BzRNq=yZS2tEmrtWLe1B Ohypgpq3a{lPW&4|aMAk! literal 0 HcmV?d00001 diff --git a/var/mongoose/include/sched.jim b/var/mongoose/include/sched.jim index e911199..8d85685 100755 --- a/var/mongoose/include/sched.jim +++ b/var/mongoose/include/sched.jim @@ -38,6 +38,8 @@ $(document).ready(function() { 7: { sorter: false } } }); + $('table.tablesorter thead th').filter('[class!=header]') + .addClass('headerplain'); }); $(document).ready(function() { @@ -133,10 +135,21 @@ proc eventrow {event {table TBL_RESERVATION}} { } if {$rsvicon ne ""} { - set rsvicon " + set rsvicon "" + if {[$event get ersvtype] == 3} { + if {[$event padded]} { + set padding "<- [expr [$event get ulPreOffset] / 60], [expr [$event get ulPostOffset] / 60] ->" + append rsvicon \ + "\"$padding\"" + } else { + append rsvicon \ + "" + } + } } if {$RKIcon ne ""} { - set RKIcon " + set RKIcon "" } if {$table eq "pending"} { @@ -196,14 +209,13 @@ proc eventrow {event {table TBL_RESERVATION}} { puts "[clock format [$event get nduration] -format %T]" } - puts "$rsvicon $RKIcon" + puts "$rsvicon $RKIcon" if {[$event get aulEventToRecordInfo] != ""} { - puts "\"Accepted" - } else { - puts " " + title=\"Accepted by Humax\">" } + puts ""; puts "" } diff --git a/var/mongoose/lib/rsv.class b/var/mongoose/lib/rsv.class index 48e8bb7..fb09a2d 100755 --- a/var/mongoose/lib/rsv.class +++ b/var/mongoose/lib/rsv.class @@ -1,7 +1,7 @@ source /mod/var/mongoose/lib/setup -if {![exists -proc class ]} { package require oo } -if {![exists -proc sqlite3.open ]} { package require sqlite3 } +if {![exists -proc class]} { package require oo } +if {![exists -proc sqlite3.open]} { package require sqlite3 } require settings.class system.class set rsvdb [sqlite3.open /var/lib/humaxtv/rsv.db] @@ -54,6 +54,17 @@ class rsv { action 0 } +rsv method aul {} { + if {![exists -proc binary]} { package require binary } + set aul {} + for {set i 0} {$i < [string length $aulEventToRecordInfo]} {incr i 16} { + binary scan [string range $aulEventToRecordInfo $i $($i + 15)] \ + iiii service start end event_id + lappend aul [list $service $start $end $event_id] + } + return $aul +} + rsv method clear_ulslot {} { set ulslot -1 } @@ -125,6 +136,16 @@ rsv method set_delete {} { set action 1 } +rsv method set_unpad {} { + set action 2 +} + +rsv method set_pad {{pre 60} {post 60}} { + set action 3 + set ulPreOffset $pre + set ulPostOffset $post +} + rsv method remove_pending {} { $::rsvdb query "delete from pending where ulslot = $ulslot" }