diff --git a/.version b/.version index 37108ad..1285f81 100644 --- a/.version +++ b/.version @@ -1,2 +1,2 @@ -2.10.1 +2.10.2 2014-07-14 diff --git a/public/css/min.css.gz b/public/css/min.css.gz index fad22fa..9386602 100644 Binary files a/public/css/min.css.gz and b/public/css/min.css.gz differ diff --git a/public/js/chart.min.js b/public/js/chart.min.js index 8de62b5..a8b3874 100644 --- a/public/js/chart.min.js +++ b/public/js/chart.min.js @@ -1 +1 @@ -function presentation(t){this.v=2,this.axis=1,this.type=defaults.line.type,this.consumption=!1,this.style="Solid",this.width=defaults.line.width,this.color=defaults.line.color,this.colorusediff=0,this.colordiff=defaults.line.color,this.threshold=0,this.min=!1,this.max=!1,this.last=!1,this.all=!1,this.time1="00:00",this.time2="24:00",this.legend=!0,this.position=0;try{t=JSON.parse(t),"undefined"==typeof t.v&&("1"===t.coloruseneg?t.colorusediff=-1:"0"===t.coloruseneg&&(t.colorusediff=0),t.colordiff=t.colorneg),delete t.coloruseneg,delete t.colorneg,$.extend(this,t)}catch(i){}this.toString=function(){return JSON.stringify(this)}}function setExtremes(){var t,i,e,r=[],a=[],o=100,l=-100;for(t=0;t=l?a[t]=1&&(r[t].min-=(a[t]-o)*r[t].height),r[t].min=Math.round(100*r[t].min)/100,r[t].max=Math.round(100*r[t].max)/100,r[t].min<-.001&&(r[t].min-=.05*(r[t].max-r[t].min)),r[t].max>.001&&(r[t].max+=.05*(r[t].max-r[t].min)),chart.yAxis[t].setExtremes(r[t].min,r[t].max,!1);chart.redraw()}function setMinMax(t,i){var e={min:Number.MAX_VALUE,max:-Number.MAX_VALUE},r={id:null,x:null,y:Number.MAX_VALUE},a={id:null,x:null,y:-Number.MAX_VALUE},o=1==t.colorDiff?t.negativeColor:t.color;$.each(t.data,function(t,o){e.min=Math.min(e.min,o.x),i.min&&o.ya.y&&(a={id:t,x:o.x,y:o.y})}),null!=r.id&&(t.data[r.id].marker={enabled:!0,symbol:"triangle-down",fillColor:o},t.data[r.id].dataLabels={enabled:!0,formatter:function(){return Highcharts.numberFormat(+this.y,t.decimals)},color:o,style:{fontWeight:"bold"},borderRadius:3,backgroundColor:"rgba(252, 255, 197, 0.7)",borderWidth:1,borderColor:"#AAA",align:e.min+(e.max-e.min)/2-r.x>0?"left":"right",y:26},$("#min"+t.id).html(Highcharts.numberFormat(r.y,t.decimals)+" "+t.unit)),null!=a.id&&(t.data[a.id].marker={enabled:!0,symbol:"triangle",fillColor:o},t.data[a.id].dataLabels={enabled:!0,formatter:function(){return Highcharts.numberFormat(+this.y,t.decimals)},color:o,style:{fontWeight:"bold"},borderRadius:3,backgroundColor:"rgba(252, 255, 197, 0.7)",borderWidth:1,borderColor:"#AAA",align:e.min+(e.max-e.min)/2-a.x>0?"left":"right",y:-7},$("#max"+t.id).html(Highcharts.numberFormat(a.y,t.decimals)+" "+t.unit));var l=t.data.length-1;return i.last&&l!=a.id&&l!=r.id&&l>=0&&(t.data[l].marker={enabled:!0,symbol:"circle",fillColor:o},t.data[l].dataLabels={enabled:!0,formatter:function(){return Highcharts.numberFormat(+this.y,t.decimals)},color:o,style:{fontWeight:"bold"},borderRadius:3,backgroundColor:"rgba(252, 255, 197, 0.7)",borderWidth:1,borderColor:"#AAA",align:"left",overflow:!0,crop:!1,y:-7}),t}var defaults={HintDecimals:2,line:{type:"spline",width:2,color:"#404040"}}; \ No newline at end of file +function presentation(t){this.v=2,this.axis=1,this.type=defaults.line.type,this.consumption=!1,this.style="Solid",this.width=defaults.line.width,this.color=defaults.line.color,this.colorusediff=0,this.colordiff=defaults.line.color,this.threshold=0,this.min=!1,this.max=!1,this.last=!1,this.all=!1,this.time1="00:00",this.time2="24:00",this.legend=!0,this.position=0;try{t=JSON.parse(t),"undefined"==typeof t.v&&("1"===t.coloruseneg?t.colorusediff=-1:"0"===t.coloruseneg&&(t.colorusediff=0),t.colordiff=t.colorneg),delete t.coloruseneg,delete t.colorneg,$.extend(this,t)}catch(i){}this.toString=function(){return JSON.stringify(this)}}function setExtremes(){var t,i,e,r=[],a=[],o=100,l=-100;for(t=0;t=l?a[t]=1&&(r[t].min-=(a[t]-o)*r[t].height),r[t].min=Math.round(100*r[t].min)/100,r[t].max=Math.round(100*r[t].max)/100,r[t].min<-.001&&(r[t].min-=.05*(r[t].max-r[t].min)),r[t].max>.001&&(r[t].max+=.05*(r[t].max-r[t].min)),chart.yAxis[t].setExtremes(r[t].min,r[t].max,!1);chart.redraw()}function setMinMax(t,i){var e={min:Number.MAX_VALUE,max:-Number.MAX_VALUE},r={id:null,x:null,y:Number.MAX_VALUE},a={id:null,x:null,y:-Number.MAX_VALUE},o=1==t.colorDiff?t.negativeColor:t.color;$.each(t.data,function(t,o){e.min=Math.min(e.min,o.x),i.min&&o.ya.y&&(a={id:t,x:o.x,y:o.y})}),null!=r.id&&(t.data[r.id].marker={enabled:!0,symbol:"triangle-down",fillColor:o},t.data[r.id].dataLabels={enabled:!0,formatter:function(){return Highcharts.numberFormat(+this.y,t.decimals)},color:o,style:{fontWeight:"bold"},borderRadius:3,backgroundColor:"rgba(252, 255, 197, 0.7)",borderWidth:1,borderColor:"#AAA",align:e.min+(e.max-e.min)/2-r.x>0?"left":"right",y:26},$("#min"+t.id).html(Highcharts.numberFormat(r.y,t.decimals)+" "+t.unit)),null!=a.id&&(t.data[a.id].marker={enabled:!0,symbol:"triangle",fillColor:o},t.data[a.id].dataLabels={enabled:!0,formatter:function(){return Highcharts.numberFormat(+this.y,t.decimals)},color:o,style:{fontWeight:"bold"},borderRadius:3,backgroundColor:"rgba(252, 255, 197, 0.7)",borderWidth:1,borderColor:"#AAA",align:e.min+(e.max-e.min)/2-a.x>0?"left":"right",y:-7},$("#max"+t.id).html(Highcharts.numberFormat(a.y,t.decimals)+" "+t.unit));var l=t.data.length-1;return i.last&&l!=a.id&&l!=r.id&&l>=0&&(t.data[l].marker={enabled:!0,symbol:"circle",fillColor:o},t.data[l].dataLabels={enabled:!0,formatter:function(){return Highcharts.numberFormat(+this.y,t.decimals)},color:o,style:{fontWeight:"bold"},borderRadius:3,backgroundColor:"rgba(252, 255, 197, 0.7)",borderWidth:1,borderColor:"#AAA",align:"right",overflow:!0,crop:!1,y:-7}),t}var defaults={HintDecimals:2,line:{type:"spline",width:2,color:"#404040"}}; \ No newline at end of file diff --git a/public/js/min.js b/public/js/min.js index 6da6edb..25ae305 100644 --- a/public/js/min.js +++ b/public/js/min.js @@ -225,7 +225,7 @@ function _log(){verbose&&(console.timeEnd("Duration"),console.time("Duration"),1 /* pvlng.min.js */ window.alert=function(e,t){1==arguments.length&&(t=""),$("
").dialog({title:t,resizable:!1,modal:!0,width:480,buttons:{Ok:function(){$(this).dialog("close")}},close:function(){$(this).remove()}}).html(e)};var pvlng=new function(){this.cookie=new function(){this.set=function(e,t,i){var n="";if(i){var o=new Date;o.setTime(o.getTime()+24*i*60*60*1e3),n="; expires="+o.toGMTString()}document.cookie=escape(e)+"="+escape(t)+n+"; path=/"},this.get=function(e){for(var t=escape(e)+"=",i=document.cookie.split(";"),n=0;n").dialog({title:t,resizable:!1,modal:!0,width:480,buttons:{Ok:function(){$(this).dialog("close")}},close:function(){$(this).remove()}}).html(e).find(".ui-dialog-titlebar-close").remove()};this.verbose=!1,this.Overlay=function(){this.show=function(){this.overlay.show()},this.hide=function(){this.overlay.hide(),$("#container").show()},this.overlay=$("
").height($(document).height()).css({display:"none",position:"fixed",top:0,left:0,width:"100%",backgroundColor:"#FFF",zIndex:1e3}).append($("").prop("src","/images/loading_dots.gif").css({width:"64px",height:"21px",position:"fixed",top:window.innerHeight/2-15+"px",left:window.innerWidth/2-32+"px"})).appendTo("body")},this.addClearSearchButton=function(e,t){$("").prop("src","/images/ico/cross-script.png").appendTo($("#"+e+"_filter")).css({marginLeft:"4px",cursor:"pointer"}).prop("title",t).tipTip().click(function(){$(this).parent().find("input").val("").trigger("keyup").focus()})},this.log=function(){this.verbose&&(console.timeEnd("Duration"),console.time("Duration"),1==arguments.length?console.log(arguments[0]):($(arguments).each(function(e,t){0==e?console.group(t):"[object Array]"===Object.prototype.toString.call(t)?console.table(t):console.log(t)}),console.groupEnd()))},this.changeDates=function(e){e*=864e5;var t=new Date(Date.parse($("#from").datepicker("getDate"))+e),i=new Date(Date.parse($("#to").datepicker("getDate"))+e);return i>new Date?void $.pnotify({type:"info",text:"Can't go beyond today."}):($("#from").datepicker("option","maxDate",i).datepicker("setDate",t),$("#to").datepicker("option","minDate",t).datepicker("setDate",i),void updateOutput())},this.changePreset=function(){var e=$("#preset").val().match(/(\d+)(\w+)/);if(e){var t=new Date($("#from").datepicker("getDate"));switch(e[2]){case"d":t.setDate(1);break;case"w":t.setDate(1);break;case"m":t.setDate(1),t.setMonth(0)}$("#from").datepicker("setDate",t),$("#periodcnt").val(e[1]),$("#period").val(e[2])}else $("#periodcnt").val(1),$("#period").val("");$("#period").trigger("change")}};$(function(){$("a.module").hover(function(){var e=submenus[$(this).data("module")];if(e){pvlng.menu.unsetTimer();var t=$("#submenu").empty();$.each(e,function(e,i){$("").prop("href",i.ROUTE).text(i.LABEL).prop("title",i.HINT).tipTip().appendTo(t).hover(pvlng.menu.unsetTimer,pvlng.menu.setTimer)}),t.buttonset().parent().show()}},pvlng.menu.setTimer),$("#btn-reset").button({icons:{primary:"ui-icon-calendar"},label:" ",text:!1}).click(function(e){e.preventDefault();var t=new Date;$("#from").datepicker("option","maxDate",t),$("#to").datepicker("option","minDate",t),$("#from").datepicker("setDate",t),$("#to").datepicker("setDate",t),updateOutput()}),$("#preset").change(function(){pvlng.changePreset(),updateOutput()})}); /* chart.min.js */ -function presentation(t){this.v=2,this.axis=1,this.type=defaults.line.type,this.consumption=!1,this.style="Solid",this.width=defaults.line.width,this.color=defaults.line.color,this.colorusediff=0,this.colordiff=defaults.line.color,this.threshold=0,this.min=!1,this.max=!1,this.last=!1,this.all=!1,this.time1="00:00",this.time2="24:00",this.legend=!0,this.position=0;try{t=JSON.parse(t),"undefined"==typeof t.v&&("1"===t.coloruseneg?t.colorusediff=-1:"0"===t.coloruseneg&&(t.colorusediff=0),t.colordiff=t.colorneg),delete t.coloruseneg,delete t.colorneg,$.extend(this,t)}catch(i){}this.toString=function(){return JSON.stringify(this)}}function setExtremes(){var t,i,e,r=[],a=[],o=100,l=-100;for(t=0;t=l?a[t]=1&&(r[t].min-=(a[t]-o)*r[t].height),r[t].min=Math.round(100*r[t].min)/100,r[t].max=Math.round(100*r[t].max)/100,r[t].min<-.001&&(r[t].min-=.05*(r[t].max-r[t].min)),r[t].max>.001&&(r[t].max+=.05*(r[t].max-r[t].min)),chart.yAxis[t].setExtremes(r[t].min,r[t].max,!1);chart.redraw()}function setMinMax(t,i){var e={min:Number.MAX_VALUE,max:-Number.MAX_VALUE},r={id:null,x:null,y:Number.MAX_VALUE},a={id:null,x:null,y:-Number.MAX_VALUE},o=1==t.colorDiff?t.negativeColor:t.color;$.each(t.data,function(t,o){e.min=Math.min(e.min,o.x),i.min&&o.ya.y&&(a={id:t,x:o.x,y:o.y})}),null!=r.id&&(t.data[r.id].marker={enabled:!0,symbol:"triangle-down",fillColor:o},t.data[r.id].dataLabels={enabled:!0,formatter:function(){return Highcharts.numberFormat(+this.y,t.decimals)},color:o,style:{fontWeight:"bold"},borderRadius:3,backgroundColor:"rgba(252, 255, 197, 0.7)",borderWidth:1,borderColor:"#AAA",align:e.min+(e.max-e.min)/2-r.x>0?"left":"right",y:26},$("#min"+t.id).html(Highcharts.numberFormat(r.y,t.decimals)+" "+t.unit)),null!=a.id&&(t.data[a.id].marker={enabled:!0,symbol:"triangle",fillColor:o},t.data[a.id].dataLabels={enabled:!0,formatter:function(){return Highcharts.numberFormat(+this.y,t.decimals)},color:o,style:{fontWeight:"bold"},borderRadius:3,backgroundColor:"rgba(252, 255, 197, 0.7)",borderWidth:1,borderColor:"#AAA",align:e.min+(e.max-e.min)/2-a.x>0?"left":"right",y:-7},$("#max"+t.id).html(Highcharts.numberFormat(a.y,t.decimals)+" "+t.unit));var l=t.data.length-1;return i.last&&l!=a.id&&l!=r.id&&l>=0&&(t.data[l].marker={enabled:!0,symbol:"circle",fillColor:o},t.data[l].dataLabels={enabled:!0,formatter:function(){return Highcharts.numberFormat(+this.y,t.decimals)},color:o,style:{fontWeight:"bold"},borderRadius:3,backgroundColor:"rgba(252, 255, 197, 0.7)",borderWidth:1,borderColor:"#AAA",align:"left",overflow:!0,crop:!1,y:-7}),t}var defaults={HintDecimals:2,line:{type:"spline",width:2,color:"#404040"}}; +function presentation(t){this.v=2,this.axis=1,this.type=defaults.line.type,this.consumption=!1,this.style="Solid",this.width=defaults.line.width,this.color=defaults.line.color,this.colorusediff=0,this.colordiff=defaults.line.color,this.threshold=0,this.min=!1,this.max=!1,this.last=!1,this.all=!1,this.time1="00:00",this.time2="24:00",this.legend=!0,this.position=0;try{t=JSON.parse(t),"undefined"==typeof t.v&&("1"===t.coloruseneg?t.colorusediff=-1:"0"===t.coloruseneg&&(t.colorusediff=0),t.colordiff=t.colorneg),delete t.coloruseneg,delete t.colorneg,$.extend(this,t)}catch(i){}this.toString=function(){return JSON.stringify(this)}}function setExtremes(){var t,i,e,r=[],a=[],o=100,l=-100;for(t=0;t=l?a[t]=1&&(r[t].min-=(a[t]-o)*r[t].height),r[t].min=Math.round(100*r[t].min)/100,r[t].max=Math.round(100*r[t].max)/100,r[t].min<-.001&&(r[t].min-=.05*(r[t].max-r[t].min)),r[t].max>.001&&(r[t].max+=.05*(r[t].max-r[t].min)),chart.yAxis[t].setExtremes(r[t].min,r[t].max,!1);chart.redraw()}function setMinMax(t,i){var e={min:Number.MAX_VALUE,max:-Number.MAX_VALUE},r={id:null,x:null,y:Number.MAX_VALUE},a={id:null,x:null,y:-Number.MAX_VALUE},o=1==t.colorDiff?t.negativeColor:t.color;$.each(t.data,function(t,o){e.min=Math.min(e.min,o.x),i.min&&o.ya.y&&(a={id:t,x:o.x,y:o.y})}),null!=r.id&&(t.data[r.id].marker={enabled:!0,symbol:"triangle-down",fillColor:o},t.data[r.id].dataLabels={enabled:!0,formatter:function(){return Highcharts.numberFormat(+this.y,t.decimals)},color:o,style:{fontWeight:"bold"},borderRadius:3,backgroundColor:"rgba(252, 255, 197, 0.7)",borderWidth:1,borderColor:"#AAA",align:e.min+(e.max-e.min)/2-r.x>0?"left":"right",y:26},$("#min"+t.id).html(Highcharts.numberFormat(r.y,t.decimals)+" "+t.unit)),null!=a.id&&(t.data[a.id].marker={enabled:!0,symbol:"triangle",fillColor:o},t.data[a.id].dataLabels={enabled:!0,formatter:function(){return Highcharts.numberFormat(+this.y,t.decimals)},color:o,style:{fontWeight:"bold"},borderRadius:3,backgroundColor:"rgba(252, 255, 197, 0.7)",borderWidth:1,borderColor:"#AAA",align:e.min+(e.max-e.min)/2-a.x>0?"left":"right",y:-7},$("#max"+t.id).html(Highcharts.numberFormat(a.y,t.decimals)+" "+t.unit));var l=t.data.length-1;return i.last&&l!=a.id&&l!=r.id&&l>=0&&(t.data[l].marker={enabled:!0,symbol:"circle",fillColor:o},t.data[l].dataLabels={enabled:!0,formatter:function(){return Highcharts.numberFormat(+this.y,t.decimals)},color:o,style:{fontWeight:"bold"},borderRadius:3,backgroundColor:"rgba(252, 255, 197, 0.7)",borderWidth:1,borderColor:"#AAA",align:"right",overflow:!0,crop:!1,y:-7}),t}var defaults={HintDecimals:2,line:{type:"spline",width:2,color:"#404040"}}; /* hoverIntent.min.js */ !function(t){t.fn.hoverIntent=function(e,n){var o={sensitivity:7,interval:100,timeout:0};o=t.extend(o,n?{over:e,out:n}:e);var r,i,u,v,s=function(t){r=t.pageX,i=t.pageY},a=function(e,n){return n.hoverIntent_t=clearTimeout(n.hoverIntent_t),Math.abs(u-r)+Math.abs(v-i)