FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

95_holiday.pm: add YYYY-MM-DD for #4 (Forum #22528)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21878 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2020-05-06 08:25:53 +00:00
parent e4ae1bd0a2
commit 9eb34d8f12
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fhem/FHEM/95_holiday.pm
View File

@ -164,7 +164,9 @@ holiday_refresh($;$$)
} elsif($l =~ m/^4/) { # Interval: 4 MM-DD MM-DD Holiday } elsif($l =~ m/^4/) { # Interval: 4 MM-DD MM-DD Holiday
my @args = split(" ", $l, 4); my @args = split(" ", $l, 4);
if($args[1] le $fordate && $args[2] ge $fordate) { if(@args == 4 &&
(($args[1] le $fordate && $args[2] ge $fordate) ||
($args[1] le $foryeardate && $args[2] ge $foryeardate))) {
$found = $args[3]; $found = $args[3];
} }
@ -409,7 +411,7 @@ holiday_FW_detailFn($$$$)
<li>1<br> <li>1<br>
Exact date. Arguments: &lt;MM-DD&gt; &lt;holiday-name&gt;<br> Exact date. Arguments: &lt;MM-DD&gt; &lt;holiday-name&gt;<br>
Exampe: 1 12-24 Christmas<br> Exampe: 1 12-24 Christmas<br>
You can alternatively specify the year as YYYY-MM-DD. MM-DD can also be written as YYYY-MM-DD.
</li> </li>
<li>2<br> <li>2<br>
Easter-dependent date. Arguments: &lt;day-offset&gt; Easter-dependent date. Arguments: &lt;day-offset&gt;
@ -443,6 +445,7 @@ holiday_FW_detailFn($$$$)
4 12-20 12-31 Winter holiday<br> 4 12-20 12-31 Winter holiday<br>
4 01-01 01-10 Winter holiday<br> 4 01-01 01-10 Winter holiday<br>
</ul> </ul>
MM-DD can also be written as YYYY-MM-DD.
</li> </li>
<li>5<br> <li>5<br>
Date relative, weekday fixed holiday. Arguments: &lt;nth&gt; Date relative, weekday fixed holiday. Arguments: &lt;nth&gt;
@ -564,7 +567,7 @@ holiday_FW_detailFn($$$$)
<li>1<br> <li>1<br>
Genaues Datum. Argument: &lt;MM-TT&gt; &lt;Feiertag-Name&gt;<br> Genaues Datum. Argument: &lt;MM-TT&gt; &lt;Feiertag-Name&gt;<br>
Beispiel: 1 12-24 Weihnachten<br> Beispiel: 1 12-24 Weihnachten<br>
Statt MM-TT kann auch YYYY-MM-TT geschrieben werden MM-TT kann auch als YYYY-MM-TT geschrieben werden.
</li> </li>
<li>2<br> <li>2<br>
Oster-abh&auml;ngiges Datum. Argument: &lt;Tag-Offset&gt; Oster-abh&auml;ngiges Datum. Argument: &lt;Tag-Offset&gt;
@ -598,6 +601,7 @@ holiday_FW_detailFn($$$$)
4 12-20 12-31 Winterferien<br> 4 12-20 12-31 Winterferien<br>
4 01-01 01-10 Winterferien<br> 4 01-01 01-10 Winterferien<br>
</ul> </ul>
MM-TT kann auch als YYYY-MM-TT geschrieben werden.
</li> </li>
<li>5<br> <li>5<br>
Datum relativ, Wochentags ein fester Urlaubstag/Feiertag. Argument: Datum relativ, Wochentags ein fester Urlaubstag/Feiertag. Argument: