Index: trunk/FACT++/www/schedule/config.template.php =================================================================== --- trunk/FACT++/www/schedule/config.template.php (revision 17701) +++ trunk/FACT++/www/schedule/config.template.php (revision 17701) @@ -0,0 +1,9 @@ + Index: trunk/FACT++/www/schedule/index.css =================================================================== --- trunk/FACT++/www/schedule/index.css (revision 17701) +++ trunk/FACT++/www/schedule/index.css (revision 17701) @@ -0,0 +1,546 @@ +.DynarchCalendar-titleCont +{ + width:100%; +} + +.highlight +{ + color: #0f0 !important; + font-weight: bold; +} + +.selected +{ + color: #006 !important; + font-weight: bold; +} + +.overlay +{ + background-color: rgba(0, 0, 0, 0.5); + color: #333; + position: fixed; + z-index: 400; + width: 100%; + height: 100%; + top: 0px; + left: 0px; + display:none; + overflow:auto; + border:1px solid gray; +} + +.close +{ + width: 13px; + height: 18px; + background-color: blue; + color:black; +} +/* +table.myTable +{ + width:100%; +} + +.myTable td +{ + border: solid 1px #cecece; +} + +.myTable td.first +{ + width:190px; +} + +.myTable td.last +{ + width:50px; +} +*/ +*{ + margin: 0px; + padding: 0px; +} + +img, fieldset +{ + padding: 0px; + border: none; + margin: 0px; + line-height: 0px; +} + +a +{ + color: #ffffff; + text-decoration: none; + font-weight: bold; +} + +a:hover +{ + text-decoration: none; + color: #0870d7; +} +/* +h2 +{ + font: 24px Arial, Helvetica, sans-serif; + font-weight: normal; + color: #0870d7; + padding: 30px 0px 10px 40px; +}*/ + +/*h3{ + background: url(images/title.png) no-repeat top left; + font: 18px Arial, Helvetica, sans-serif; + color: #ffffff; + height: 43px; + width: 265px; + text-align: center; + line-height: 43px; + font-weight: normal; + +}*/ + +body +{ + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height: 18px; + color: #ffffff; + background: #000 url(images/bg.jpg) no-repeat center 87px; + +} + +#bg2 +{ + background: url(images/bg2.png) repeat-x top; + height: 87px; + position: absolute; + width: 100%; +} + +#wrapper1 +{ + position: relative; + width:900px; + margin: 0 auto; +} + +.clear +{ + clear: both; +} + +/* + menu +*/ + +#header2 +{ + height: 91px; + width: 900px; + margin: 0 93px; +} + +#header2 ul +{ + padding-left: 0px; + list-style: none; + width: 800px; + margin: 0 auto; +} + +#header2 ul li li2 +{ + display: inline; +} + +#header2 ul li a +{ + font: 24px Arial, Helvetica, sans-serif; + color: #ffffff; + text-align: center; + font-weight: normal; + text-decoration: none; + display: block; + float: left; + width: 620px; + height: 120px; + line-height: 91px; + font-family:broadway; + font-size: 3em; +} + +#header2 ul li2 +{ + font-size: .6em; + font-family:broadway; + color: #ffffff; + width: 620px; + height: 120px; + line-height: 91px; +} + +#header2 ul li li2 a:hover, #menu ul li .active +{ + color: #FF0; +} + + +/*logo*/ +/* +#logo{ + width: 1032px; + margin: 0 auto; + height: 112px; + padding-top: 50px; + padding-left: 60px; + +} + +#logo h1 a{ + font: 14px Arial, Helvetica, sans-serif; + color: #ffffff; + font-weight: bold; + text-decoration: none; +} + +#logo a small{ + font: 12px Arial, Helvetica, sans-serif; + color: #ffffff; + font-weight: normal; + text-decoration: none; +} + +#prew_img{ + background: url(images/img_prew.png) no-repeat top left; + height: 297px; + width: 1054px; + margin: 0 auto; +} +*/ + +/* + Content +*/ +#content_bg_top +{ + background: url(images/content_top.png) no-repeat top left; + height: 10px; +} +/* +#content_bg_bot +{ + background: url(images/content_bot.png) no-repeat bottom left; + height: 10px; +}*/ + +#content_box +{ + background: url(images/content_repeat.png); + padding:0px 12px; +} + +/* +header +*/ +/* +#header { + background: url(images/header.jpg) no-repeat left top; + height: 326px; + width: 876px; +} +*/ + +/* +download_box +*/ +/* +#download_box{ + + width: 876px; + height: 112px; + +} + +#download_box p { + color: #303030; + font: 12px Arial, Helvetica, sans-serif; + font-weight: normal; +} +#download_box p a { + color: #303030; + font: 12px Arial, Helvetica, sans-serif; + font-weight: bold; + +} +#download_box p a:hover { + color: #0870d7; +} +#download_left { + padding: 25px 0px 10px 25px; + float:left; + width: 638px; +} + +#download_right a{ + font: 18px Arial, Helvetica, sans-serif; + font-weight: bold; + text-align: center; + line-height: 56px; + width: 195px; + height: 56px; + text-transform: uppercase; + background: url(images/download_button.png) no-repeat top left; + display: block; + float: right; + margin: 38px 15px 0px 0px; +} + +#download_right a:hover{ + color: #ffffff; +} +*/ +/* +column_box +*/ +#column_box +{ + padding-left: 15px; + padding-bottom: 30px; +} + +#column_box a +{ + color: #666666; +} + +#column_box a:hover +{ + color: #ffffff; +} + +#column_box p +{ + color: #666666; + padding-top: 5px; +} + +#column1 +{ + float: left; + width: 280px; +} + +#column2 +{ + float: left; + width: 260px; +} + +#column3 +{ + float: left; + width: 580px; +} + +#column2 +{ + margin: 0px 40px; +} +/* + footer_top +*/ + + + +/* +#footer_top{ + padding-top: 35px; +} + + +#footer_top a{ + color: #ffffff; + font-weight: bold; +} + +#footer_top a:hover{ + color: #0870d7; +} + +#footer_top p{ + color: #ffffff; + line-height: 20px; +} + +#footer_column1, #footer_column2, #footer_column3{ + width: 265px; + float: left; +} + +.footer_text{ + background: url(images/footer_top_border.png) no-repeat top left; + padding: 10px 0px 10px 20px; +} + +#footer_column2{ + padding: 0px 38px 0px 31px; +} + +.foot_pad{ + padding-left: 45px; + padding-top: 10px; +} + + +.ls{ + list-style: none; + padding-left: 0px; +} + +.ls li{ + background: url(images/ls1.gif) no-repeat 0px 6px; + margin-bottom: 8px; + padding-left: 15px; +} +*/ +/* + footer_bot +*/ + +#footer_bot +{ + padding: 25px; + text-align: center; +} + +.button +{ + cursor:pointer; + border-top: 1px solid #96d1f8; + background: #65a9d7; + background: -webkit-gradient(linear, left top, left bottom, from(#3e779d), to(#65a9d7)); + background: -webkit-linear-gradient(top, #3e779d, #65a9d7); + background: -moz-linear-gradient(top, #3e779d, #65a9d7); + background: -ms-linear-gradient(top, #3e779d, #65a9d7); + background: -o-linear-gradient(top, #3e779d, #65a9d7); + padding: 3px 6px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: rgba(0,0,0,1) 0 1px 0; + -moz-box-shadow: rgba(0,0,0,1) 0 1px 0; + box-shadow: rgba(0,0,0,1) 0 1px 0; + text-shadow: rgba(0,0,0,.4) 0 1px 0; + color: white; + font-size: 14px; + font-family: 'Lucida Grande', Helvetica, Arial, Sans-Serif; + text-decoration: none; + vertical-align: middle; +} + +.button:hover +{ + border-top-color: #28597a; + background: #28597a; + color: #ccc; +} + +.button:active +{ + border-top-color: #b6c5cf; + background: #b6c5cf; +} + +#button +{ + border-top: 1px solid #96d1f8; + background: #65a9d7; + background: -webkit-gradient(linear, left top, left bottom, from(#3e779d), to(#65a9d7)); + background: -webkit-linear-gradient(top, #3e779d, #65a9d7); + background: -moz-linear-gradient(top, #3e779d, #65a9d7); + background: -ms-linear-gradient(top, #3e779d, #65a9d7); + background: -o-linear-gradient(top, #3e779d, #65a9d7); + padding: 3px 6px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: rgba(0,0,0,1) 0 1px 0; + -moz-box-shadow: rgba(0,0,0,1) 0 1px 0; + box-shadow: rgba(0,0,0,1) 0 1px 0; + text-shadow: rgba(0,0,0,.4) 0 1px 0; + color: white; + font-size: 12px; + font-family: 'Lucida Grande', Helvetica, Arial, Sans-Serif; + text-decoration: none; + vertical-align: middle; +} + +#button:hover +{ + border-top-color: #28597a; + background: #28597a; + color: #ccc; +} + +#button:active +{ + border-top-color: #b6c5cf; + background: #b6c5cf; +} +/* + .buttonc { + cursor:pointer; + border-top: 1px solid #96d1f8; + + padding: -1px 6px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: rgba(0,0,0,1) 0 1px 0; + -moz-box-shadow: rgba(0,0,0,1) 0 1px 0; + box-shadow: rgba(0,0,0,1) 0 1px 0; + text-shadow: rgba(0,0,0,.4) 0 1px 0; + color: black; + font-size: 14px; + font-family: 'Lucida Grande', Helvetica, Arial, Sans-Serif; + text-decoration: none; + vertical-align: middle; + } + + #buttonc { + border-top: 1px solid #96d1f8; + background: #65a9d7; + background: -webkit-gradient(linear, left top, left bottom, from(#3e779d), to(#65a9d7)); + background: -webkit-linear-gradient(top, #3e779d, #65a9d7); + background: -moz-linear-gradient(top, #3e779d, #65a9d7); + background: -ms-linear-gradient(top, #3e779d, #65a9d7); + background: -o-linear-gradient(top, #3e779d, #65a9d7); + padding: 3px 6px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: rgba(0,0,0,1) 0 1px 0; + -moz-box-shadow: rgba(0,0,0,1) 0 1px 0; + box-shadow: rgba(0,0,0,1) 0 1px 0; + text-shadow: rgba(0,0,0,.4) 0 1px 0; + color: white; + font-size: 12px; + font-family: 'Lucida Grande', Helvetica, Arial, Sans-Serif; + text-decoration: none; + vertical-align: middle; + } +#buttonc:hover { + border-top-color: #28597a; + background: #28597a; + color: #ccc; + } +#buttonc:active { + border-top-color: #b6c5cf; + background: #b6c5cf; + } + */ Index: trunk/FACT++/www/schedule/index.html =================================================================== --- trunk/FACT++/www/schedule/index.html (revision 17701) +++ trunk/FACT++/www/schedule/index.html (revision 17701) @@ -0,0 +1,136 @@ + + + + + FACT Scheduling + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ +
+
+
+
+
+
+
+ + + + +
+
+
+
+
+
+
+
+
+ + + + + + +
TIME:   + +    + +    + +
+
+
+ + + + + + + +
MeasurementSourceValue
+
+ + +
+
+
+
+
+
+
X To close click here or press Esc.
+
+ +

HELP

+
+ +

Loading a schedule

+ To load a schedule click on the corresponding date in the calendar. If + you click on SAVE the schedule will be saved to the date shown in the box close to the + SAVE button. It is always identical with the last calender date you clicked. +

+ +

Replacing a schedule

+ You can overwrite a schedule with the schedule from a different date by entering the + date in the box close to Load Night and either pressing Enter or the Load Night + button. +

+ +

Disabled entries

+ Entries which are at the time the schedule is loaded already in the past, are + disabled and cannot be changed. This is because they might already have been processed + by the scheduler and are currently executed. + +

Color of times

+ For the current night, entries which are before the current time are + displayed in red, entries which are later, are displayed in green. Colors are updated + interactively. + +

Scheduling

+ Note that the last entry display in red will most probably the first one + executed by the scheduler. If the scheduling is running, it will just replace + the next entry in the schedule and be executed completely. If the scheduler is not + running, still the last red entry will be the first one to be executed, but since + it is the first one executed by the script, the script assumes that it failed and + was restarted. Therefore, only the last of its observations (usually data + is executed. + +

Options

+ Options are ecoded as JSON object (search google for details). The meaning of + their properties is defined by the task to be executed. The starting and + closing brace must be omitted. Note that for a correct JSON object, the property + names must be enclosed in double quotation marks ("..."). +
+
+
+
+ + + + Index: trunk/FACT++/www/schedule/index.js =================================================================== --- trunk/FACT++/www/schedule/index.js (revision 17701) +++ trunk/FACT++/www/schedule/index.js (revision 17701) @@ -0,0 +1,744 @@ +'use strict'; + +function pad(n) +{ + return (n<10) ? '0' + n : n; +} + +function getYMD(d) +{ + return d.getUTCFullYear()+'-'+pad(d.getUTCMonth()+1)+'-'+pad(d.getUTCDate()); +} + +function updateClock() +{ + var now = new Date(); + var s = getYMD(now)+' '+pad(now.getUTCHours())+':'+pad(now.getUTCMinutes())+' UTC'; + $('#clock').html(s); + + var table = document.getElementById("TableHolder"); + + if (!table.isTonight) + return; + + var rows = table.childNodes; + + for (var i=2; it0 ? "color:darkgreen" : "color:darkred"); + } +}; + +function addEmptyRow(prev, start) +{ + var empty = + { + fStart: "0000/00/00 "+(start?start:""), + fMeasurementTypeKey:0, + fMeasurementID:0, + fSourceKEY:0, + }; + + addRow(empty, false, prev); +} + +function debug(txt) +{ + var dbg = document.getElementById("debug"); + dbg.appendChild(document.createTextNode(txt)); + dbg.appendChild(document.createElement("br")); +} + +function addRow(row, disabled, prev) +{ + var table = document.getElementById("TableHolder"); + + var sources = table.sources; + var measurements = table.measurements; + + var tr = document.createElement("tr"); + tr.setAttribute("width", "100%"); + + if (!prev) + table.appendChild(tr); + else + table.insertBefore(tr, prev.nextSibling); + + // ---------- column 1 ---------- + + var input1t = document.createElement("input"); + input1t.setAttribute("type","time"); + input1t.setAttribute("size","10"); + input1t.setAttribute("autofocus","true"); + if (row.fMeasurementID!=0) + input1t.setAttribute("hidden", "true"); + input1t.setAttribute("value", row.fStart.substr(11)); + if (disabled) + input1t.setAttribute("disabled", "true"); + + /* + input1t.onblur = function() + { + var prevRow = tr.previousSibling; + while (prevRow && prevRow.firstChild.firstChild.hidden) + prevRow = prevRow.previousSibling; + + var nextRow = tr.nextSibling; + while (nextRow && nextRow.firstChild.firstChild.hidden) + nextRow = nextRow.nextSibling; + + var prevEl = prevRow ? prevRow.firstChild : undefined; + var nextEl = nextRow ? nextRow.firstChild : undefined; + + var prevTime = ""; + if (prevEl && prevEl.firstChild.constructor.name=="HTMLInputElement") + prevTime = prevEl.firstChild.value; + + var nextTime = ""; + if (nextEl && nextEl.firstChild.constructor.name=="HTMLInputElement") + nextTime = nextEl.firstChild.value; + + alert(prevTime+"/"+input1t.value+"/"+nextTime); + }*/ + + var td1 = document.createElement("td"); + td1.setAttribute("style","white-space:nowrap"); + td1.setAttribute("align","center"); + td1.appendChild(input1t); + + // Check if this is the transition from disabled to enabled. + // In this case enable all previous [+] + if (tr.previousSibling && tr.previousSibling.firstChild.firstChild.disabled && !disabled) + { + var prevRow = tr.previousSibling; + + var tm = prevRow.firstChild.firstChild.value; + while (1) + { + prevRow.firstChild.childNodes[1].removeAttribute("disabled"); + prevRow = prevRow.previousSibling; + if (prevRow.firstChild.firstChild.value!=tm) + break; + } + } + + var input1p = document.createElement("input"); + input1p.setAttribute("style","width:20px"); + input1p.setAttribute("type","button"); + input1p.setAttribute("value","+"); + if (row.fMeasurementID!=0) + input1p.setAttribute("hidden", "true"); + // FIXME: Enable if this is the last "+" in tonight + if (disabled) + input1p.setAttribute("disabled", "true"); + input1p.onclick = function() + { + // FiXME: Do not allow deleting of last line + var nextRow = tr; + while (nextRow.nextSibling) + { + if (!nextRow.nextSibling.firstChild.firstChild.hidden) + break; + + nextRow = nextRow.nextSibling; + } + + addEmptyRow(nextRow, input1t.value); + } + td1.appendChild(input1p); + + var input1m = document.createElement("input"); + input1m.setAttribute("style","width:20px"); + input1m.setAttribute("type","button"); + input1m.setAttribute("value","-"); + if (row.fMeasurementID!=0) + input1m.setAttribute("hidden", "true"); + if (disabled) + input1m.setAttribute("disabled", "true"); + input1m.onclick = function() + { + //if (table.childNodes.length==3) + // return; + + var nextRow = tr.nextSibling; + table.removeChild(tr); + + while (nextRow) + { + var inp = nextRow.firstChild.firstChild; + if (!inp.hidden) + break; + + var xx = nextRow; + nextRow = nextRow.nextSibling; + table.removeChild(xx); + } + + if (table.childNodes.length==2) + addEmptyRow(); + } + td1.appendChild(input1m); + + tr.appendChild(td1); + + // ---------- column 2 ----------- + + var select2 = document.createElement("select"); + // select2.setAttribute("style", "width:100px"); + select2.setAttribute("class", "measurement"); + if (disabled) + select2.setAttribute("disabled", "true"); + + for (var i=0; itable.loadTime) + { + save.removeAttribute("disabled"); + load.removeAttribute("disabled"); + ldate.removeAttribute("disabled"); + + + // If this is a dayin the future, but no schedule is in the db, + // create an empty one + if (schedule.length==0) + addEmptyRow(); + } + else + { + save.setAttribute("disabled", "true"); + load.setAttribute("disabled", "true"); + ldate.setAttribute("disabled", "true"); + } + + // Update the header of the date/time column + var tm = document.getElementById("time"); + while (tm.firstChild) + tm.removeChild(tm.firstChild); + + var nxt = new Date(day.getTime()+24*3600*1000); + + var d1 = pad(day.getUTCMonth()+1)+'-'+pad(day.getUTCDate()); + var d2 = pad(nxt.getUTCMonth()+1)+'-'+pad(nxt.getUTCDate()); + + tm.appendChild(document.createTextNode(d1+ " / "+d2)); + + var offset = new Date(table.loadedDay).getTime(); + + // other day loaded and tonight + + if (!table.isTonight || !table.loadedDay) + table.cutTime = "12:00:00"; + + // Now loop over all rows and add them oine by one to the table + for (var i=0; i2) + { + var cols = table.lastChild.childNodes; + var time = cols[0].firstChild; + + if (time.disabled) + { + debug("disabled="+time.value); + + cut = time.value; + if (dateToLoad) + break; + } + + count++; + table.removeChild(table.lastChild); + } + + debug(count+" lines removed "); + + document.getElementById("savedate").value = date; + + // it helps to know if this is tonight or not + var now = new Date(); + var day = new Date(date); + var night = getYMD(new Date(now.getTime()-12*3600*1000)); + + table.isTonight = date==night; + table.currentDay = date; + table.loadedDay = dateToLoad; + table.loadTime = now.getTime(); + + if (!table.isTonight || !table.loadedDay) + table.cutTime = undefined; + + // remember the currently displayed day (FIXME: Move to table property?) + table.prevDay = getYMD(new Date(day.getTime()-24*3600*1000)); + table.nextDay = getYMD(new Date(day.getTime()+24*3600*1000)); + + debug("day="+date+"|"+date.length); + debug("dayToLoad="+table.loadedDay); + debug("cut="+cut); + + var data = "n="+(dateToLoad?dateToLoad:date); + if (cut && (!table.isTonight || table.loadedDay)) + data += "&t="+cut; + + debug("data="+data); + + // request data from the datanbase and on reception, display the data + $.ajax({ + type: "POST", + cache: false, + url: "load.php", + data: data, + success: onDataReceived, + error: function(xhr) { if (xhr.status==0) alert("ERROR[0] - Request failed!"); else alert("ERROR[0] - "+xhr.statusText+" ["+xhr.status+"]"); } + }); +} + +function onLoad() +{ + /*--------------------------------------------------------------------------------------------- + Prevent any user interaction during AJAX requests + ----------------------------------------------------------------------------------------------*/ + + $(document).ajaxStart(function() { $('#wait').fadeIn(); }).ajaxStop(function() { $('#wait').fadeOut(200); }); + + /*--------------------------------------------------------------------------------------------- + Check if a dedicated day was requested, if not start with the current day. + Load the data from the database and display the calendar and the data. + ----------------------------------------------------------------------------------------------*/ + + var reg = /^\?day=(20[123][0-9]-[01][0-9]-[0123][0-9])/; + var res = reg.exec(location.search); + + var day; + if (!res) + { + var now = new Date(); + + if (now.getUTCHours()<12) + now = new Date(now.getTime()-12*3600*1000); + + day = getYMD(now); + } + else + day = res[1]; + + loadDay(day); + + /*--------------------------------------------------------------------------------------------- + Start updating the clock + ----------------------------------------------------------------------------------------------*/ + + updateClock(); + setInterval(updateClock, 1000); + + /*--------------------------------------------------------------------------------------------- + Loading of previous data. Get the previous date with existing data through PreviousData.php + Same Shedule.ph passed to load on the controls with extra parameter 'prev' to indicate that + data is from previous schedule. + ----------------------------------------------------------------------------------------------*/ + + // FIXME: Do not overwrite the disabled part of the schedule if it is TONIGHT!!!! + + function onLoad() + { + var cd = document.getElementById("TableHolder"); + var dt = document.getElementById("loaddate"); + loadDay(cd.currentDay, dt.value); + } + + $('#load').click(onLoad); + $('#loaddate').keypress(function(event) { if (event.which==13) { onLoad(); } event.preventDefault(); }); + + /*--------------------------------------------------------------------------------------------- + Savng and updating of schedule. Data array is generated from the current table to be submitted + to saveSchedule.php for the execution of queries. + ----------------------------------------------------------------------------------------------*/ + + function onSaveClick() + { + var table = document.getElementById("TableHolder"); + + var rows = table.childNodes; + + var schedule = []; + + // cutTime is the last time of a measurement which is past + // and should not be updated. This assumes that all + // time values are sequential. + //var cutTime = "12:00:00"; + //var prevTime = new Date(currentDay+" 12:00:00"); + + // FIXME: Make sure dates are sequentiel + + for (var i=2; i