Merge branch 'working'

This commit is contained in:
Dan-in-CA 2013-10-16 12:10:58 -07:00
commit ea839442e8
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@ web/
/data/sd.json
/data/snames.txt
*.pyc
/static/log/water_log.csv

View File

@ -556,7 +556,7 @@ class change_values:
gv.srvals = [0]*(gv.sd['nst']) # turn off all stations
set_output()
if qdict.has_key('mm') and qdict['mm'] == '0': clear_mm()
if qdict.has_key('rd') and qdict['rd'] != '0' and qdict['rd'] != '':
if qdict.has_key('rd') and qdict['rd'] > '0':
gv.sd['rdst'] = (gv.now+(int(qdict['rd'])*3600))
stop_onrain()
elif qdict.has_key('rd') and qdict['rd'] == '0': gv.sd['rdst'] = 0