FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-07 19:04:20 +00:00
Code Issues Releases Wiki Activity

57_Calendar: bugfix for weekly recurring events on several weekdays, that start around midnight

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10811 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
borisneubert 2016-02-13 10:52:30 +00:00
parent 70b93ca13d
commit 4db7ff03db
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/CHANGED
View File

@ -1,5 +1,7 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- bugfix: 57_Calendar: weekly recurring events on several weekdays, that
start around midnight
- bugfix 49_SSCAM: fixed a problem that a usersession won't be destroyed - bugfix 49_SSCAM: fixed a problem that a usersession won't be destroyed
if a function couldn't be executed successfully if a function couldn't be executed successfully
- bugfix: 95_Dashboard: fixed javascript error because of changes - bugfix: 95_Dashboard: fixed javascript error because of changes

31
fhem/FHEM/57_Calendar.pm
View File

@ -1170,9 +1170,9 @@ sub createSingleEvent($$$) {
$self->makeEventDetails($event); $self->makeEventDetails($event);
$self->makeEventAlarms($event); $self->makeEventAlarms($event);
#main::Debug "createSingleEvent DTSTART=" . $self->value("DTSTART") . " DTEND=" . $self->value("DTEND"); main::Debug "createSingleEvent DTSTART=" . $self->value("DTSTART") . " DTEND=" . $self->value("DTEND");
#main::Debug "createSingleEvent Start " . main::FmtDateTime($event->{start}); main::Debug "createSingleEvent Start " . main::FmtDateTime($event->{start});
#main::Debug "createSingleEvent End " . main::FmtDateTime($event->{end}); main::Debug "createSingleEvent End " . main::FmtDateTime($event->{end});
# plug-in # plug-in
if(defined($onCreateEvent)) { if(defined($onCreateEvent)) {
@ -1214,21 +1214,21 @@ sub createEvents($$$%) {
# Valid values for freq: SECONDLY, MINUTELY, HOURLY, DAILY, WEEKLY, MONTHLY, YEARLY # Valid values for freq: SECONDLY, MINUTELY, HOURLY, DAILY, WEEKLY, MONTHLY, YEARLY
my $freq = $r{"FREQ"}; my $freq = $r{"FREQ"};
#main::Debug "FREQ= $freq"; main::Debug "FREQ= $freq";
# According to RFC, interval defaults to 1 # According to RFC, interval defaults to 1
my $interval = exists($r{"INTERVAL"}) ? $r{"INTERVAL"} : 1; my $interval = exists($r{"INTERVAL"}) ? $r{"INTERVAL"} : 1;
my $until = exists($r{"UNTIL"}) ? $self->tm($r{"UNTIL"}) : 99999999999999999; my $until = exists($r{"UNTIL"}) ? $self->tm($r{"UNTIL"}) : 99999999999999999;
my $count = exists($r{"COUNT"}) ? $r{"COUNT"} : 999999; my $count = exists($r{"COUNT"}) ? $r{"COUNT"} : 999999;
my $bymonthday = $r{"BYMONTHDAY"} if(exists($r{"BYMONTHDAY"})); # stored but ignored my $bymonthday = $r{"BYMONTHDAY"} if(exists($r{"BYMONTHDAY"})); # stored but ignored
my $byday = exists($r{"BYDAY"}) ? $r{"BYDAY"} : ""; my $byday = exists($r{"BYDAY"}) ? $r{"BYDAY"} : "";
#main::Debug "byday is $byday"; main::Debug "byday is $byday";
my $bymonth = $r{"BYMONTH"} if(exists($r{"BYMONTH"})); # stored but ignored my $bymonth = $r{"BYMONTH"} if(exists($r{"BYMONTH"})); # stored but ignored
my $wkst = $r{"WKST"} if(exists($r{"WKST"})); # stored but ignored my $wkst = $r{"WKST"} if(exists($r{"WKST"})); # stored but ignored
my @weekdays = qw(SU MO TU WE TH FR SA); my @weekdays = qw(SU MO TU WE TH FR SA);
#main::Debug "createEvents: " . $self->asString(); main::Debug "createEvents: " . $self->asString();
# #
# we first add all RDATEs # we first add all RDATEs
@ -1340,7 +1340,7 @@ sub createEvents($$$%) {
$nextstart = plusNSeconds($nextstart, 24*60*60, $interval); $nextstart = plusNSeconds($nextstart, 24*60*60, $interval);
} elsif($freq eq "WEEKLY") { } elsif($freq eq "WEEKLY") {
# special handling for WEEKLY and BYDAY # special handling for WEEKLY and BYDAY
#main::Debug "weekly event, BYDAY= $byday"; main::Debug "weekly event, BYDAY= $byday";
if($byday ne "") { if($byday ne "") {
# BYDAY with prefix (e.g. -1SU or 2MO) is not recognized # BYDAY with prefix (e.g. -1SU or 2MO) is not recognized
my @bydays= split(',', $byday); my @bydays= split(',', $byday);
@ -1350,11 +1350,18 @@ sub createEvents($$$%) {
my $preventloop = 0; my $preventloop = 0;
do { do {
$nextstart = plusNSeconds($nextstart, 24*60*60, 1); # forward day by day $nextstart = plusNSeconds($nextstart, 24*60*60, 1); # forward day by day
($msec, $mmin, $mhour, $mday, $mmon, $myear, $mwday, $yday, $isdat) = gmtime($nextstart); ($msec, $mmin, $mhour, $mday, $mmon, $myear, $mwday, $yday, $isdat) =
#main::Debug "Skip to: start " . ts($nextstart) . " = " . $weekdays[$mwday]; localtime($nextstart);
$preventloop ++; main::Debug "Skip to: start " . $event->ts($nextstart) . " = " . $weekdays[$mwday];
#main::Debug "weekday= " . $weekdays[$mwday] . ", smartmatch " . join(" ",@bydays) ."= " . ($weekdays[$mwday] ~~ @bydays ? "yes" : "no"); $preventloop++;
} until(($weekdays[$mwday] ~~ @bydays) or ($preventloop > 7)); if($preventloop > 7) {
main::Log3 undef, 2,
"Calendar: something is wrong for RRULE $rrule in " .
$self->asString();
last;
}
main::Debug "weekday= " . $weekdays[$mwday] . "($mwday), smartmatch " . join(" ",@bydays) ."= " . ($weekdays[$mwday] ~~ @bydays ? "yes" : "no");
} until($weekdays[$mwday] ~~ @bydays);
} }
else { else {
# default WEEKLY handling # default WEEKLY handling