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

57_SSCal: contrib 1.15.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21270 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-02-24 18:11:19 +00:00
parent 1b480bf0d9
commit efd30c9ad9
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,7 @@ eval "use FHEM::Meta;1" or my $modMetaAbsent = 1;
# Versions History intern # Versions History intern
my %SSCal_vNotesIntern = ( my %SSCal_vNotesIntern = (
"1.15.0" => "24.02.2020 fix recurrence WEEKLY by DAY ", "1.15.0" => "24.02.2020 fix recurrence WEEKLY by DAY, MONTHLY by MONTHDAY ",
"1.14.0" => "23.02.2020 new setter \"calUpdate\" consistent for both models, calEventList and calToDoList are obsolete ", "1.14.0" => "23.02.2020 new setter \"calUpdate\" consistent for both models, calEventList and calToDoList are obsolete ",
"1.13.0" => "22.02.2020 manage recurring entries if one/more of a series entry is deleted or changed and their reminder times ", "1.13.0" => "22.02.2020 manage recurring entries if one/more of a series entry is deleted or changed and their reminder times ",
"1.12.0" => "15.02.2020 create At-devices from calendar entries if FHEM-commands or Perl-routines detected in \"Summary\", minor fixes ", "1.12.0" => "15.02.2020 create At-devices from calendar entries if FHEM-commands or Perl-routines detected in \"Summary\", minor fixes ",
@ -1668,12 +1668,12 @@ sub SSCal_extractEventlist ($) {
if ($freq eq "MONTHLY") { # monatliche Wiederholung if ($freq eq "MONTHLY") { # monatliche Wiederholung
if ($bymonthday) { # Wiederholungseigenschaft am Tag X des Monats if ($bymonthday) { # Wiederholungseigenschaft am Tag X des Monats
for ($ci=-1; $ci<($count*$interval); $ci+=$interval) { for ($ci=-1; $ci<($count*$interval); $ci+=$interval) {
$bmonth += $interval; $bmonth += $interval if($ci>=0);
$byear += int( $bmonth/13); $byear += int( $bmonth/13);
$bmonth %= 12 if($bmonth>12); $bmonth %= 12 if($bmonth>12);
$bmonth = sprintf("%02d", $bmonth); $bmonth = sprintf("%02d", $bmonth);
$emonth += $interval; $emonth += $interval if($ci>=0);
$eyear += int( $emonth/13); $eyear += int( $emonth/13);
$emonth %= 12 if($emonth>12); $emonth %= 12 if($emonth>12);
$emonth = sprintf("%02d", $emonth); $emonth = sprintf("%02d", $emonth);
@ -1876,8 +1876,6 @@ sub SSCal_extractEventlist ($) {
$n++; $n++;
} }
last if((defined $uets && ($uets < $nbts)) || $nbts > $tend || $ci == $count); last if((defined $uets && ($uets < $nbts)) || $nbts > $tend || $ci == $count);
} }
last if((defined $uets && ($uets < $nbts)) || $nbts > $tend || $ci == $count); last if((defined $uets && ($uets < $nbts)) || $nbts > $tend || $ci == $count);
$btsstart += (7 * 86400 * $interval); # addiere Tagesintervall, z.B. 4th Freitag ... $btsstart += (7 * 86400 * $interval); # addiere Tagesintervall, z.B. 4th Freitag ...