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

98_SVG.pm: fix date calc for month & endPlotToday (Forum #101005)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20859 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2019-12-31 10:21:48 +00:00
parent 14005952ff
commit bd4e4f10b3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fhem/FHEM/98_SVG.pm
View File

@@ -1015,6 +1015,7 @@ SVG_calcOffsets($$)
$l[4] += $off; $l[4] += $off;
$l[4] += 12, $l[5]-- if($l[4] < 0); $l[4] += 12, $l[5]-- if($l[4] < 0);
my @me = (31,28,31,30,31,30,31,31,30,31,30,31); my @me = (31,28,31,30,31,30,31,31,30,31,30,31);
$me[1]++ if(($sy+1900)%4); # leap year. Ignore 1900 and 2100 :)
if(SVG_Attr($FW_wname, $wl, "endPlotToday", undef)) { if(SVG_Attr($FW_wname, $wl, "endPlotToday", undef)) {
$sy = $ey = $l[5]; $sy = $ey = $l[5];
@@ -1022,12 +1023,12 @@ SVG_calcOffsets($$)
$sm += 12, $sy-- if($sm < 0); $sm += 12, $sy-- if($sm < 0);
$sd = $l[3]+1; $ed = $l[3]; $sd = $l[3]+1; $ed = $l[3];
$sd=1, $sm=$em, $sy=$ey if($sd > $me[$sm]); $sd=1, $sm=$em, $sy=$ey if($sd > $me[$sm]);
$ed = $me[$em] if($ed > $me[$em]);
} else { } else {
$sy = $ey = $l[5]; $sy = $ey = $l[5];
$sm = $em = $l[4]; $sm = $em = $l[4];
$sd = 1; $ed = $me[$l[4]]; $sd = 1; $ed = $me[$l[4]];
$ed++ if($l[4]==1 && !(($sy+1900)%4)); # leap year
} }
$SVG_devs{$d}{from} = SVG_tspec( 0, 0, 0,$sd,$sm,$sy); $SVG_devs{$d}{from} = SVG_tspec( 0, 0, 0,$sd,$sm,$sy);
$SVG_devs{$d}{to} = SVG_tspec(59,59,23,$ed,$em,$ey); $SVG_devs{$d}{to} = SVG_tspec(59,59,23,$ed,$em,$ey);