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

57_SSCal: contrib 2.4.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21970 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-05-19 14:55:16 +00:00
parent 87d993664f
commit c29490b974
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/contrib/DS_Starter/57_SSCal.pm
View File

@ -1718,11 +1718,7 @@ sub extractEventlist { ## no critic 'complexi
} elsif ($p1 eq "UNTIL") { # festes Intervallende angegeben } elsif ($p1 eq "UNTIL") { # festes Intervallende angegeben
$until = $p2; $until = $p2;
$until =~ s/[-:]//gx; $until =~ s/[-:]//gx;
(undef,undef,undef,undef,$uets,undef) = explodeDateTime ($hash, $until, 0, 0, 0); $uets = (explodeDateTime ($hash, $until, 0, 0, 0))[4];
if ($uets < $tstart) {
Log3($name, 4, "$name - Ignore recurring event -> $data->{data}{$key}[$i]{summary} , interval end \"$nedate $netime\" is less than selection start \"$datetimestart\"");
$ignore = 1;
}
} elsif ($p1 eq "BYMONTHDAY") { # Wiederholungseigenschaft -> Tag des Monats z.B. 13 (Tag 13) } elsif ($p1 eq "BYMONTHDAY") { # Wiederholungseigenschaft -> Tag des Monats z.B. 13 (Tag 13)
$bymonthday = $p2; $bymonthday = $p2;
} elsif ($p1 eq "BYDAY") { # Wiederholungseigenschaft -> Wochentag z.B. 2WE,-1SU,4FR (kann auch Liste bei WEEKLY sein) } elsif ($p1 eq "BYDAY") { # Wiederholungseigenschaft -> Wochentag z.B. 2WE,-1SU,4FR (kann auch Liste bei WEEKLY sein)
@ -1730,6 +1726,11 @@ sub extractEventlist { ## no critic 'complexi
} }
} }
if (defined $uets && $uets < $tstart) {
Log3($name, 4, "$name - Ignore recurring event -> $data->{data}{$key}[$i]{summary} , interval end \"$nedate $netime\" is less than selection start \"$datetimestart\"");
$ignore = 1;
}
$count = $count ? $count : 9999999; # $count "unendlich" wenn kein COUNT angegeben $count = $count ? $count : 9999999; # $count "unendlich" wenn kein COUNT angegeben
$interval = $interval ? $interval : 1; $interval = $interval ? $interval : 1;
$bymonthday = $bymonthday ? $bymonthday : ""; $bymonthday = $bymonthday ? $bymonthday : "";