From 9f2de473e6f10eb18b79ab77eb12f03a1e5c3e6f Mon Sep 17 00:00:00 2001 From: Knut Kohl Date: Sat, 13 Sep 2014 18:03:34 +0200 Subject: [PATCH] Bumped version to 2.12.0 --- .version | 4 +- CHANGELOG | 32 +++++++++++ public/css/min.css.gz | Bin 17583 -> 17583 bytes public/js/dataTables.min.js | 2 +- public/js/min.js | 2 +- public/js/min.js.gz | Bin 170293 -> 170305 bytes sql/pvlng.2.10.0.sql | 2 +- sql/pvlng.2.11.0.sql | 2 +- sql/pvlng.2.12.0.sql | 110 ++++++++++++++++++++++++++++++++++++ sql/pvlng.develop.sql | 10 ---- sql/pvlng.sql | 38 +++++++------ 11 files changed, 170 insertions(+), 32 deletions(-) create mode 100644 sql/pvlng.2.12.0.sql diff --git a/.version b/.version index 849910a..0d85d6b 100644 --- a/.version +++ b/.version @@ -1,2 +1,2 @@ -2.11.0 -2014-08-12 +2.12.0 +2014-09-13 diff --git a/CHANGELOG b/CHANGELOG index 47a31ec..56f166e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,35 @@ + v2.12.0 +========= + +FIXED + + - Fix calulation of 1st consumption value in Accumulator ~ Knut Kohl + - Fix not creating grouping channel from template ~ Knut Kohl + - Fix Solar estimate calculation, missing scale for better/worse days than average ~ Knut Kohl + - Fix double load of routes/custom.php ~ Knut Kohl + - Remove estimated output for diplay times after sunset ~ Knut Kohl + +CHANGED + + - Adjust Solar Edge handlers ~ Knut Kohl + - Update Nginx config template for MemCache handling ~ Knut Kohl + - Change icon legends from static below table to mouseover hint ~ Knut Kohl + - Change processing indicator for "delete node" and "create alias" in Overview ~ Knut Kohl + - Some updates in frontend ~ Knut Kohl + - Some updates in channel classes ~ Knut Kohl + +NEW + + - Add additional namespace handling for config loads from file ~ Knut Kohl + - Add central cron handler script for PVOutput export and Wunderground fetch ~ Knut Kohl + - Add Weather module ~ Knut Kohl + - Add filter channels by dropdown ~ Knut Kohl + - Drafts for Solar Edge inverter & optimizer handling ~ Knut Kohl + - Extend API with a "version" and "latest" route ~ Knut Kohl + - Move Infoframe support files below View folder ~ Knut Kohl + - Store chart height from URL parameter in cookie ~ Knut Kohl + - Auto refresh chart on page comes to active only if date display range is not in the past ~ Knut Kohl + v2.11.0 ========= diff --git a/public/css/min.css.gz b/public/css/min.css.gz index 9bb0c1da3c7e047cbef2bb75155cd0dcbd05e1e2..fc0e0932d244fc8e094ffc4ebf9ebc90632c51a3 100644 GIT binary patch delta 18 ZcmZ4A$+*6gkzKxr?-1:r>t?1:0},$.fn.dataTableExt.oSort["numeric-dot-desc"]=function(a,e){var r="-"==a?0:a.replace(/,/,"");r=parseFloat(r);var t="-"==e?0:e.replace(/,/,"");return t=parseFloat(t),t>r?1:r>t?-1:0},$.fn.dataTableExt.oSort["numeric-comma-asc"]=function(a,e){var r="-"==a?0:a.replace(/\./,"").replace(/,/,".");r=parseFloat(r);var t="-"==e?0:e.replace(/\./,"").replace(/,/,".");return t=parseFloat(t),t>r?-1:r>t?1:0},$.fn.dataTableExt.oSort["numeric-comma-desc"]=function(a,e){var r="-"==a?0:a.replace(/\./,"").replace(/,/,".");r=parseFloat(r);var t="-"==e?0:e.replace(/\./,"").replace(/,/,".");return t=parseFloat(t),t>r?1:r>t?-1:0}}); \ No newline at end of file +$(function(){$.extend($.fn.dataTable.defaults,{bLengthChange:!1,bFilter:!1,bInfo:!1,bPaginate:!1,bJQueryUI:!0,bProcessing:!0,bStateSave:DatatablesStateSave,iCookieDuration:31536e3,oLanguage:{sUrl:"/resources/dataTables."+language+".json"}}),$.fn.dataTableExt.oSort["numeric-dot-asc"]=function(a,e){var r="-"==a?0:a.replace(/,/,"");r=parseFloat(r);var t="-"==e?0:e.replace(/,/,"");return t=parseFloat(t),t>r?-1:r>t?1:0},$.fn.dataTableExt.oSort["numeric-dot-desc"]=function(a,e){var r="-"==a?0:a.replace(/,/,"");r=parseFloat(r);var t="-"==e?0:e.replace(/,/,"");return t=parseFloat(t),t>r?1:r>t?-1:0},$.fn.dataTableExt.oSort["numeric-comma-asc"]=function(a,e){var r="-"==a?0:a.replace(/\./,"").replace(/,/,".");r=parseFloat(r);var t="-"==e?0:e.replace(/\./,"").replace(/,/,".");return t=parseFloat(t),t>r?-1:r>t?1:0},$.fn.dataTableExt.oSort["numeric-comma-desc"]=function(a,e){var r="-"==a?0:a.replace(/\./,"").replace(/,/,".");r=parseFloat(r);var t="-"==e?0:e.replace(/\./,"").replace(/,/,".");return t=parseFloat(t),t>r?1:r>t?-1:0}}); \ No newline at end of file diff --git a/public/js/min.js b/public/js/min.js index 24be52a..6c3b146 100644 --- a/public/js/min.js +++ b/public/js/min.js @@ -194,7 +194,7 @@ k);if((j[1]||"").length",{"class":"ui-pnotify "+r.addclass,css:{display:"none"},mouseenter:function(e){r.nonblock&&e.stopPropagation(),r.mouse_reset&&"out"==c&&(h.stop(!0),c="in",h.css("height","auto").animate({width:r.width,opacity:r.nonblock?r.nonblock_opacity:r.opacity},"fast")),r.nonblock&&h.animate({opacity:r.nonblock_opacity},"fast"),r.hide&&r.mouse_reset&&h.pnotify_cancel_remove(),r.sticker&&!r.nonblock&&h.sticker.trigger("pnotify_icon").css("visibility","visible"),r.closer&&!r.nonblock&&h.closer.css("visibility","visible")},mouseleave:function(i){r.nonblock&&i.stopPropagation(),l=null,h.css("cursor","auto"),r.nonblock&&"out"!=c&&h.animate({opacity:r.opacity},"fast"),r.hide&&r.mouse_reset&&h.pnotify_queue_remove(),r.sticker_hover&&h.sticker.css("visibility","hidden"),r.closer_hover&&h.closer.css("visibility","hidden"),e.pnotify_position_all()},mouseover:function(e){r.nonblock&&e.stopPropagation()},mouseout:function(e){r.nonblock&&e.stopPropagation()},mousemove:function(e){r.nonblock&&(e.stopPropagation(),u(e,"onmousemove"))},mousedown:function(e){r.nonblock&&(e.stopPropagation(),e.preventDefault(),u(e,"onmousedown"))},mouseup:function(e){r.nonblock&&(e.stopPropagation(),e.preventDefault(),u(e,"onmouseup"))},click:function(e){r.nonblock&&(e.stopPropagation(),u(e,"onclick"))},dblclick:function(e){r.nonblock&&(e.stopPropagation(),u(e,"ondblclick"))}});h.opts=r,h.container=e("
",{"class":f.container+" ui-pnotify-container "+("error"==r.type?f.error:"info"==r.type?f.info:"success"==r.type?f.success:f.notice)}).appendTo(h),""!=r.cornerclass&&h.container.removeClass("ui-corner-all").addClass(r.cornerclass),r.shadow&&h.container.addClass("ui-pnotify-shadow"),h.pnotify_version="1.2.2",h.pnotify=function(i){var t=r;"string"==typeof i?r.text=i:r=e.extend({},r,i);for(var o in r)"string"==typeof o&&o.match(/^pnotify_/)&&(r[o.replace(/^pnotify_/,"")]=r[o]);return h.opts=r,r.cornerclass!=t.cornerclass&&h.container.removeClass("ui-corner-all").addClass(r.cornerclass),r.shadow!=t.shadow&&(r.shadow?h.container.addClass("ui-pnotify-shadow"):h.container.removeClass("ui-pnotify-shadow")),r.addclass===!1?h.removeClass(t.addclass):r.addclass!==t.addclass&&h.removeClass(t.addclass).addClass(r.addclass),r.title===!1?h.title_container.slideUp("fast"):r.title!==t.title&&(r.title_escape?h.title_container.text(r.title).slideDown(200):h.title_container.html(r.title).slideDown(200)),r.text===!1?h.text_container.slideUp("fast"):r.text!==t.text&&(r.text_escape?h.text_container.text(r.text).slideDown(200):h.text_container.html(r.insert_brs?String(r.text).replace(/\n/g,"
"):r.text).slideDown(200)),h.pnotify_history=r.history,h.pnotify_hide=r.hide,r.type!=t.type&&h.container.removeClass(f.error+" "+f.notice+" "+f.success+" "+f.info).addClass("error"==r.type?f.error:"info"==r.type?f.info:"success"==r.type?f.success:f.notice),(r.icon!==t.icon||r.icon===!0&&r.type!=t.type)&&(h.container.find("div.ui-pnotify-icon").remove(),r.icon!==!1&&e("
",{"class":"ui-pnotify-icon"}).append(e("",{"class":r.icon===!0?"error"==r.type?f.error_icon:"info"==r.type?f.info_icon:"success"==r.type?f.success_icon:f.notice_icon:r.icon})).prependTo(h.container)),r.width!==t.width&&h.animate({width:r.width}),r.min_height!==t.min_height&&h.container.animate({minHeight:r.min_height}),r.opacity!==t.opacity&&h.fadeTo(r.animate_speed,r.opacity),!r.closer||r.nonblock?h.closer.css("display","none"):h.closer.css("display","block"),!r.sticker||r.nonblock?h.sticker.css("display","none"):h.sticker.css("display","block"),h.sticker.trigger("pnotify_icon"),r.sticker_hover?h.sticker.css("visibility","hidden"):r.nonblock||h.sticker.css("visibility","visible"),r.closer_hover?h.closer.css("visibility","hidden"):r.nonblock||h.closer.css("visibility","visible"),r.hide?t.hide||h.pnotify_queue_remove():h.pnotify_cancel_remove(),h.pnotify_queue_position(),h},h.pnotify_position=function(e){var i=h.opts.stack;if(i){i.nextpos1||(i.nextpos1=i.firstpos1),i.nextpos2||(i.nextpos2=i.firstpos2),i.addpos2||(i.addpos2=0);var t="none"==h.css("display");if(!t||e){var o,s,a,c={};switch(i.dir1){case"down":a="top";break;case"up":a="bottom";break;case"left":a="right";break;case"right":a="left"}o=parseInt(h.css(a)),isNaN(o)&&(o=0),"undefined"!=typeof i.firstpos1||t||(i.firstpos1=o,i.nextpos1=i.firstpos1);var r;switch(i.dir2){case"down":r="top";break;case"up":r="bottom";break;case"left":r="right";break;case"right":r="left"}if(s=parseInt(h.css(r)),isNaN(s)&&(s=0),"undefined"!=typeof i.firstpos2||t||(i.firstpos2=s,i.nextpos2=i.firstpos2),("down"==i.dir1&&i.nextpos1+h.height()>n.height()||"up"==i.dir1&&i.nextpos1+h.height()>n.height()||"left"==i.dir1&&i.nextpos1+h.width()>n.width()||"right"==i.dir1&&i.nextpos1+h.width()>n.width())&&(i.nextpos1=i.firstpos1,i.nextpos2+=i.addpos2+("undefined"==typeof i.spacing2?25:i.spacing2),i.addpos2=0),i.animation&&i.nextpos2i.addpos2&&(i.addpos2=h.height());break;case"left":case"right":h.outerWidth(!0)>i.addpos2&&(i.addpos2=h.width())}if(i.nextpos1)if(i.animation&&(o>i.nextpos1||c.top||c.bottom||c.right||c.left))switch(i.dir1){case"down":c.top=i.nextpos1+"px";break;case"up":c.bottom=i.nextpos1+"px";break;case"left":c.right=i.nextpos1+"px";break;case"right":c.left=i.nextpos1+"px"}else h.css(a,i.nextpos1+"px");switch((c.top||c.bottom||c.right||c.left)&&h.animate(c,{duration:500,queue:!1}),i.dir1){case"down":case"up":i.nextpos1+=h.height()+("undefined"==typeof i.spacing1?25:i.spacing1);break;case"left":case"right":i.nextpos1+=h.width()+("undefined"==typeof i.spacing1?25:i.spacing1)}}}},h.pnotify_queue_position=function(i){t&&clearTimeout(t),i||(i=10),t=setTimeout(e.pnotify_position_all,i)},h.pnotify_display=function(){h.parent().length||h.appendTo(o),r.before_open&&r.before_open(h)===!1||("top"!=r.stack.push&&h.pnotify_position(!0),"fade"==r.animation||"fade"==r.animation.effect_in?h.show().fadeTo(0,0).hide():1!=r.opacity&&h.show().fadeTo(0,r.opacity).hide(),h.animate_in(function(){r.after_open&&r.after_open(h),h.pnotify_queue_position(),r.hide&&h.pnotify_queue_remove()}))},h.pnotify_remove=function(){h.timer&&(window.clearTimeout(h.timer),h.timer=null),r.before_close&&r.before_close(h)===!1||h.animate_out(function(){r.after_close&&r.after_close(h)===!1||(h.pnotify_queue_position(),r.remove&&h.detach())})},h.animate_in=function(e){c="in";var i;i="undefined"!=typeof r.animation.effect_in?r.animation.effect_in:r.animation,"none"==i?(h.show(),e()):"show"==i?h.show(r.animate_speed,e):"fade"==i?h.show().fadeTo(r.animate_speed,r.opacity,e):"slide"==i?h.slideDown(r.animate_speed,e):"function"==typeof i?i("in",e,h):h.show(i,"object"==typeof r.animation.options_in?r.animation.options_in:{},r.animate_speed,e)},h.animate_out=function(e){c="out";var i;i="undefined"!=typeof r.animation.effect_out?r.animation.effect_out:r.animation,"none"==i?(h.hide(),e()):"show"==i?h.hide(r.animate_speed,e):"fade"==i?h.fadeOut(r.animate_speed,e):"slide"==i?h.slideUp(r.animate_speed,e):"function"==typeof i?i("out",e,h):h.hide(i,"object"==typeof r.animation.options_out?r.animation.options_out:{},r.animate_speed,e)},h.pnotify_cancel_remove=function(){h.timer&&window.clearTimeout(h.timer)},h.pnotify_queue_remove=function(){h.pnotify_cancel_remove(),h.timer=window.setTimeout(function(){h.pnotify_remove()},isNaN(r.delay)?0:r.delay)},h.closer=e("
",{"class":"ui-pnotify-closer",css:{cursor:"pointer",visibility:r.closer_hover?"hidden":"visible"},click:function(){h.pnotify_remove(),h.sticker.css("visibility","hidden"),h.closer.css("visibility","hidden")}}).append(e("",{"class":f.closer,title:r.labels.close})).appendTo(h.container),(!r.closer||r.nonblock)&&h.closer.css("display","none"),h.sticker=e("
",{"class":"ui-pnotify-sticker",css:{cursor:"pointer",visibility:r.sticker_hover?"hidden":"visible"},click:function(){r.hide=!r.hide,r.hide?h.pnotify_queue_remove():h.pnotify_cancel_remove(),e(this).trigger("pnotify_icon")}}).bind("pnotify_icon",function(){e(this).children().removeClass(f.pin_up+" "+f.pin_down).addClass(r.hide?f.pin_up:f.pin_down)}).append(e("",{"class":f.pin_up,title:r.labels.stick})).appendTo(h.container),(!r.sticker||r.nonblock)&&h.sticker.css("display","none"),r.icon!==!1&&e("
",{"class":"ui-pnotify-icon"}).append(e("",{"class":r.icon===!0?"error"==r.type?f.error_icon:"info"==r.type?f.info_icon:"success"==r.type?f.success_icon:f.notice_icon:r.icon})).prependTo(h.container),h.title_container=e("

",{"class":"ui-pnotify-title"}).appendTo(h.container),r.title===!1?h.title_container.hide():r.title_escape?h.title_container.text(r.title):h.title_container.html(r.title),h.text_container=e("
",{"class":"ui-pnotify-text"}).appendTo(h.container),r.text===!1?h.text_container.hide():r.text_escape?h.text_container.text(r.text):h.text_container.html(r.insert_brs?String(r.text).replace(/\n/g,"
"):r.text),"string"==typeof r.width&&h.css("width",r.width),"string"==typeof r.min_height&&h.container.css("min-height",r.min_height),h.pnotify_history=r.history,h.pnotify_hide=r.hide;var _=n.data("pnotify");if((null==_||"object"!=typeof _)&&(_=[]),_="top"==r.stack.push?e.merge([h],_):e.merge(_,[h]),n.data("pnotify",_),"top"==r.stack.push&&h.pnotify_queue_position(1),r.after_init&&r.after_init(h),r.history){var y=n.data("pnotify_history");if("undefined"==typeof y){y=e("
",{"class":"ui-pnotify-history-container "+f.hi_menu,mouseleave:function(){y.animate({top:"-"+i+"px"},{duration:100,queue:!1})}}).append(e("
",{"class":"ui-pnotify-history-header",text:r.labels.redisplay})).append(e("