mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

endPlotToday

Browse Source 
git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@2347 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2012-12-20 10:10:57 +00:00
parent 363e27398d
commit 8e388ee030
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
FHEM/01_FHEMWEB.pm
View File

@@ -128,7 +128,7 @@ FHEMWEB_Initialize($)
"plotmode:gnuplot,gnuplot-scroll,SVG plotsize refresh " . "plotmode:gnuplot,gnuplot-scroll,SVG plotsize refresh " .
"touchpad smallscreen plotfork basicAuth basicAuthMsg ". "touchpad smallscreen plotfork basicAuth basicAuthMsg ".
"stylesheetPrefix iconpath hiddenroom hiddengroup HTTPS longpoll:1,0 ". "stylesheetPrefix iconpath hiddenroom hiddengroup HTTPS longpoll:1,0 ".
"redirectCmds:0,1 reverseLogs:0,1 allowfrom CORS:0,1"; "redirectCmds:0,1 reverseLogs:0,1 allowfrom CORS:0,1 endPlotToday:1,0";
############### ###############
# Initialize internal structures # Initialize internal structures
@@ -1785,7 +1785,8 @@ FW_calcWeblink($$)
} elsif($zoom eq "week") { } elsif($zoom eq "week") {
my @l = localtime($now); my @l = localtime($now);
my $t = $now - ($l[6]*86400) + ($off*86400)*7; my $start = (AttrVal($FW_wname, "endPlotToday", undef) ? 7 : $l[6]);
my $t = $now - ($start*86400) + ($off*86400)*7;
@l = localtime($t); @l = localtime($t);
$FW_devs{$d}{from} = sprintf("%04d-%02d-%02d",$l[5]+1900,$l[4]+1,$l[3]); $FW_devs{$d}{from} = sprintf("%04d-%02d-%02d",$l[5]+1900,$l[4]+1,$l[3]);
@@ -1794,17 +1795,25 @@ FW_calcWeblink($$)
} elsif($zoom eq "month") { } elsif($zoom eq "month") {
my @l = localtime($now); my ($endDay, @l);
while($off < -12) { if(AttrVal($FW_wname, "endPlotToday", undef)) {
@l = localtime($now+86400);
$endDay = $l[3];
$off--;
} else {
@l = localtime($now);
$endDay = 1;
}
while($off < -12) { # Correct the year
$off += 12; $l[5]--; $off += 12; $l[5]--;
} }
$l[4] += $off; $l[4] += $off;
$l[4] += 12, $l[5]-- if($l[4] < 0); $l[4] += 12, $l[5]-- if($l[4] < 0);
$FW_devs{$d}{from} = sprintf("%04d-%02d", $l[5]+1900, $l[4]+1); $FW_devs{$d}{from} = sprintf("%04d-%02d-%02d", $l[5]+1900, $l[4]+1,$endDay);
$l[4]++; $l[4]++;
$l[4] = 0, $l[5]++ if($l[4] == 12); $l[4] = 0, $l[5]++ if($l[4] == 12);
$FW_devs{$d}{to} = sprintf("%04d-%02d", $l[5]+1900, $l[4]+1); $FW_devs{$d}{to} = sprintf("%04d-%02d-%02d", $l[5]+1900, $l[4]+1,$endDay);
} elsif($zoom eq "year") { } elsif($zoom eq "year") {
@@ -2757,6 +2766,13 @@ FW_closeOldClients()
viewed in with the default (day) zoom, the other one with a week zoom. viewed in with the default (day) zoom, the other one with a week zoom.
</li><br> </li><br>
<a name="endPlotToday"></a>
<li>endPlotToday<br>
If this FHEMWEB attribute ist set to 1, then week and month plots will
end today. Else the current week (starting at Sunday) or the current
month will be shown.<br>
</li><br>
<a name="smallscreen"></a> <a name="smallscreen"></a>
<a name="touchpad"></a> <a name="touchpad"></a>
<li>smallscreen, touchpad<br> <li>smallscreen, touchpad<br>