implement rec10webg3 colored type.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@862 4e526526-5e11-4fc0-8910-f8fd03428081

diff --git a/Rec10WEBG3/trunk/rec10webg3.htm b/Rec10WEBG3/trunk/rec10webg3.htm
index 7e0a8e4..e749ea7 100644 (file)
--- a/Rec10WEBG3/trunk/rec10webg3.htm
+++ b/Rec10WEBG3/trunk/rec10webg3.htm
@@ -8,10 +8,10 @@
             body, html { font-family:helvetica,arial,sans-serif; font-size:90%; }\r
         </style>\r
         <style type="text/css">\r
-            html, body { width: 100%; height: 100%; margin: 0; overflow:hidden; }\r
-            #borderContainerTwo { width: 100%; height: 100%; }\r
+               html, body { width: 100%; height: 100%; margin: 0; overflow:hidden; }\r
+               #borderContainerTwo { width: 100%; height: 100%; }\r
         </style>\r
-               <title>Rec10Suite 0.0.2</title>\r
+               <title>Rec10Suite 0.0.3</title>\r
                <script src="http://ajax.googleapis.com/ajax/libs/dojo/1.6/dojo/dojo.xd.js" type="text/javascript" djConfig="parseOnLoad : true, isDebug : true"></script>\r
                <!--<script src="./dojo-release-1.5.0/dojo/dojo.js" type="text/javascript" djConfig="parseOnLoad : true, isDebug : true"></script>-->\r
                <script type="text/javascript">\r
@@ -35,7 +35,7 @@
                        var getime="";\r
                        var reserve_grid_structure= [{cells:[\r
                                {name:"ID",field:"id",width:"4em"},\r
-                               {name:"タイプ",field:"type",width:"5em"},\r
+                               {name:"タイプ",field:"type",width:"5em",formatter:gridTypeFormatter},\r
                                {name:"チャンネル",field:"chtxt",width:"5em"},\r
                                {name:"開始",field:"btime",width:"6em"},\r
                                {name:"終了",field:"etime",width:"3em"},\r
@@ -44,7 +44,6 @@
                                {name:"dt",field:"deltatime",width:"3em"},\r
                                {name:"dd",field:"deltaday",width:"3em"}\r
                        ]}];\r
-                       \r
                        function readCh(){\r
                                var chlistPaneTE=dojo.byId("progTableTE");\r
                                var chlistPaneBS=dojo.byId("progTableBS");\r
@@ -252,6 +251,30 @@
                                        i=i+30;\r
                                        nbt=dojo.date.add(nbt,"minute",30);\r
                                }\r
+                       }
+                       function gridTypeFormatter(type){
+                               switch(type){
+                               case "reserve_flexible":return "<span style='color:skyblue'>未確定予約</span>";
+                               case "reserve_fixed":return "<span style='color:blue'>確定予約</span>";
+                               case "convert_ts_mp4_network":return "<span style='color:black'>ネット変換予約</span>";
+                               case "convert_ts_mp4_running":return "<span style='color:orange'>動画圧縮中</span>";
+                               case "convert_ts_mp4":return "<span style='color:yellow'>圧縮予約</span>";
+                               case "convert_avi_mp4_miss":return "<span style='color:'></span>";
+                               case "search_today":return "<span style='color:skyblue'>当日予約</span>";
+                               case "search_everyday":return "<span style='color:purple'>隔日予約</span>";
+                               case "convert_ts_mp4_finished":return "<span style='color:gray'>圧縮終了</span>";
+                               case "convert_b25_ts_miss":return "<blink><span style='color:red'>解読失敗</span></blink>";
+                               case "convert_b25_ts":return "<span style='color:green'>解読予約</span>";
+                               case "convert_b25_ts_running":return "<span style='color:yellowgreen'>解読中</span>";
+                               case "reserve_running":return "<span style='color:orange'>録画中</span>";
+                               case "convert_mkv_mp4_runnings":return "<span style='color:'></span>";
+                               case "convert_avi_mkv":return "<span style='color:'></span>";
+                               case "convert_avi_mp4":return "<span style='color:'></span>";
+                               case "convert_mkv_mp4":return "<span style='color:'></span>";
+                               case "move_end":return "<span style='color:gray'>移動終了</span>";
+                               
+                               default : return type;
+                               }
                        }\r
                        dojo.addOnLoad\r
                        (\r
@@ -315,7 +338,7 @@
                        <div dojoType="dojo.data.ItemFileReadStore" jsId="reserveStore"\r
                                                url="rec10webg3.py?mode=timeline"></div>\r
                         <table dojoType="dojox.grid.DataGrid" id="grid_reserve_list_time" structure="reserve_grid_structure"\r
-                                                store="reserveStore"></table>\r
+                                                store="reserveStore" style="font-size:1.4em;"></table>\r
                     </div>\r
                     <div dojoType="dijit.layout.ContentPane" id="tab_newreserve" title="新規予約">\r
                                <h2>新規予約</h2><br>\r

diff --git a/Rec10WEBG3/trunk/rec10webg3.py b/Rec10WEBG3/trunk/rec10webg3.py
index 18afbb8..f075b02 100644 (file)
--- a/Rec10WEBG3/trunk/rec10webg3.py
+++ b/Rec10WEBG3/trunk/rec10webg3.py
@@ -308,4 +308,4 @@ if mode=="epg-timeline":
                                   "category":dbi["category"]})
         print jsonHeader
         #print htmlHeader
-        print json.dumps({"data":tlll},encoding="utf-8")
\ No newline at end of file
+        print json.dumps({"data":tlll},encoding="utf-8")