mirror/weewx
1
0
Fork 0
mirror of https://github.com/weewx/weewx.git synced 2026-04-22 18:46:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Catch up with development branch

Browse Source
This commit is contained in:
Tom Keffer
2018-12-03 09:38:58 -08:00
parent bee9c4240d a1684140fe
commit bbd3a7acf7
2 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/weewx/manager.py
View File

@@ -1579,7 +1579,7 @@ class DaySummaryManager(Manager):
if 'interval' not in record:
raise ValueError("Missing value for record field 'interval'")
elif record['interval'] <= 0:
raise ValueError("Non-positive value for record field 'interval': %s" (record['interval'], ))
raise ValueError("Non-positive value for record field 'interval': %s" % (record['interval'], ))
weight = 60.0 * record['interval'] if self.version >= '2.0' else 1.0
return weight

56
docs/js/weewx.js
View File

@@ -16,44 +16,56 @@ function wee_gen_id(text, element) {
return hv
}
function set_cookie(name, value, dur) {
if(dur===null || dur===0) dur=30;
var today = new Date();
var expire = new Date();
expire.setTime(today.getTime() + 24*3600000*dur);
document.cookie = name+"="+encodeURIComponent(value)+";expires="+expire.toUTCString();
function set_cookie(name, value, days) {
// Default duration of 30 days
if (!days) days = 30;
var expire = new Date(Date.now() + 24 * 3600000 * days);
document.cookie = name + "=" + value + ";path=/;expires=" + expire.toUTCString();
}
function get_cookie(name) {
if(name==="") return "";
var cookie = " "+document.cookie;
var i = cookie.indexOf(" "+name+"=");
if(i<0) i = cookie.indexOf(";"+name+"=");
if(i<0) return "";
var j = cookie.indexOf(";", i+1);
if(j<0) j = cookie.length;
return decodeURIComponent(cookie.substring(i + name.length + 2, j));
if (!name) return "";
var v = document.cookie.match('(^|;) ?' + name + '=([^;]*)(;|$)');
return v ? v[2] : null;
}
function get_default_level() {
var level = get_cookie("toc_level");
if (level === "") { level = 2; }
if (!level) {
level = 3;
}
return level;
}
function create_toc_control(level) {
var c = document.getElementById('toc_controls');
if(c) {
if (c) {
var txt = "<select id='toc_level' onChange='change_toc_level()'>";
txt += "<option value='1'";
if (level === 1) { txt += " selected"; }
txt += ">Less Detail</option>";
if (level == 1) {
txt += " selected";
}
txt += ">Less detail</option>";
txt += "<option value='2'";
if (level === 2) { txt += " selected"; }
txt += ">Some Detail</option>";
if (level == 2) {
txt += " selected";
}
txt += ">Some detail</option>";
txt += "<option value='3'";
if (level === 3) { txt += " selected"; }
txt += ">More Detail</option>";
if (level == 3) {
txt += " selected";
}
txt += ">More detail</option>";
txt += "<option value='4'";
if (level == 4) {
txt += " selected";
}
txt += ">Very detailed</option>";
txt += "</select>";
c.innerHTML = txt;
}