now you can add a timer from the epg and edit it at the same time.

diff --git a/webinterface/src/web-data/objects.js b/webinterface/src/web-data/objects.js
index 69f685d..32ae182 100644 (file)
--- a/webinterface/src/web-data/objects.js
+++ b/webinterface/src/web-data/objects.js
@@ -1,3 +1,4 @@
+
 // store all objects here
 
 //START class EPGList
@@ -88,17 +89,18 @@ function EPGEvent(xml){
                return wday+". "+day+"."+month+"."+year;
        }
        this.getTimeBegin = function(){
-               return this.timebegin;
+               return this.getTimeStart().getTime()/1000
        }
        this.getTimeEnd = function ()
        {
                var date = new Date((parseInt(this.startTime)+parseInt(this.duration))*1000);
-               return date;
+               return date.getTime()/1000
        }
        this.getTimeEndString = function ()
        {
-               var h = this.getTimeEnd().getHours();
-               var m = this.getTimeEnd().getMinutes();
+               var date = new Date((parseInt(this.startTime)+parseInt(this.duration))*1000);
+               var h = date.getHours();
+               var m = date.getMinutes();
                if (m < 10){
                        m="0"+m;
                }

diff --git a/webinterface/src/web-data/templates.js b/webinterface/src/web-data/templates.js
index 82055b4..56c7592 100644 (file)
--- a/webinterface/src/web-data/templates.js
+++ b/webinterface/src/web-data/templates.js
@@ -21,7 +21,8 @@ var tplEPGListItem  = '<tr style="background-color: #DDDDDD;">';
        
        tplEPGListItem +='<tr style="background-color: #DDDDDD;"><td>';
        tplEPGListItem +='<a target="_blank" ><img src="/webdata/gfx/timer.png" title="add to Timers" border="0" onclick="addTimerByID(\'%(servicereference)\',\'%(eventid)\',\'False\');"></a>&nbsp;&nbsp;';
-       tplEPGListItem +='<a target="_blank" ><img src="/webdata/gfx/zap.png" title="add zap to Timers" border="0" onclick="addTimerByID(\'%(servicereference)\',\'%(eventid)\',\'True\');"></a><br/>';
+       tplEPGListItem +='<a target="_blank" ><img src="/webdata/gfx/zap.png" title="add zap to Timers" border="0" onclick="addTimerByID(\'%(servicereference)\',\'%(eventid)\',\'True\');"></a>&nbsp;&nbsp;';
+       tplEPGListItem +='<a target="_blank" ><img src="/webdata/gfx/edit.gif" title="edit and add timer" border="0" onclick="loadTimerFormSeconds(0,\'%(start)\',\'%(end)\',0,\'%(servicereference)\',\'%(title)\',\'%(description)\',\'0\',0);"></a><br/>';
        tplEPGListItem +='<a target="_blank" href="/web/epgsearch.rss?search=%(title)" ><img src="/webdata/gfx/feed.png" title="RSS-Feed for this Title" border="0"></a><br/>';
        tplEPGListItem +='<a target="_blank" href="http://www.imdb.com/find?s=all&amp;q=%(titleESC)" ><img src="/webdata/gfx/world.png" title="search IMDb" border="0"></a><br/>';
        tplEPGListItem +='</td></tr>';

diff --git a/webinterface/src/web-data/tools.js b/webinterface/src/web-data/tools.js
index aa70f67..9c4a810 100644 (file)
--- a/webinterface/src/web-data/tools.js
+++ b/webinterface/src/web-data/tools.js
@@ -327,10 +327,13 @@ function incomingEPGrequest(request){
                                                        'endtime': item.getTimeEndString(), 
                                                        'extdescription': item.getDescriptionExtended(),
                                                        'number': String(i),
-                                                       'extdescriptionSmall': extdescriptionSmall(item.getDescriptionExtended(),String(i))
+                                                       'extdescriptionSmall': extdescriptionSmall(item.getDescriptionExtended(),String(i)),
+                                                       'start': item.getTimeBegin(),
+                                                       'end': item.getTimeEnd()
                                                };
                                        //Fill template with data and add id to our result
                                        html += RND(tplEPGListItem, namespace);
+//                                     alert(RND(tplEPGListItem, namespace));
                                } catch (blubb) { debug("Error rendering: "+blubb);     }
                        }               
                        html += tplEPGListFooter;
@@ -829,7 +832,7 @@ function loadTimerFormNow() {
 }
 
 function loadTimerFormSeconds(justplay,begin,end,repeated,channel,name,description,afterEvent,deleteOldOnSave) {
-
+       debug('justplay:'+justplay+' begin:'+begin+' end:'+end+' repeated:'+repeated+' channel:'+channel+' name:'+name+' description:'+description+' afterEvent:'+afterEvent+' deleteOldOnSave:'+deleteOldOnSave);
        var start = new Date(Number(begin)*1000);
        addTimerEditFormObject["syear"] = start.getFullYear();
        addTimerEditFormObject["smonth"] = start.getMonth() + 1;