FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 06:39:11 +00:00
Code Issues Releases Wiki Activity

57_SSCal: additional composite event 'compositeBlockNumbers'

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21348 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-03-03 22:46:10 +00:00
parent 4c4aa82446
commit e9d631fb6c
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# 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.
- feature: 57_SSCal: additional composite event 'compositeBlockNumbers'
- change: 70_DENON_AVR: model reporting for newer AVRs
- change: 57_SSCal: expand composite Event, fix API behavior if entry with
'is_all_day' is at first position

9
fhem/FHEM/57_SSCal.pm
View File

@ -48,6 +48,7 @@ eval "use FHEM::Meta;1" or my $modMetaAbsent = 1;
# Versions History intern
my %SSCal_vNotesIntern = (
"2.2.0" => "03.03.2020 new composite event 'compositeBlockNumbers' ",
"2.1.0" => "01.03.2020 expand composite Event, bugfix API if entry with 'is_all_day' and at first position in 'data' ",
"2.0.0" => "28.02.2020 check in release ",
"1.15.0" => "27.02.2020 fix recurrence WEEKLY by DAY, MONTHLY by MONTHDAY and BYDAY, create commandref ",
@ -2199,6 +2200,12 @@ sub SSCal_doCompositeEvents ($$$) {
my ($summary,$desc,$begin,$status,$isrepeat,$id,$event);
if(@{$abnr}) {
my $nrs = join(" ", @{$abnr});
$event = "compositeBlockNumbers: $nrs";
CommandTrigger(undef, "$name $event");
}
foreach my $bnr (@{$abnr}) {
$summary = ReadingsVal($name, $bnr."_01_Summary", "");
$desc = ReadingsVal($name, $bnr."_03_Description", "");
@ -2207,7 +2214,7 @@ sub SSCal_doCompositeEvents ($$$) {
$isrepeat = ReadingsVal($name, $bnr."_55_isRepeatEvt", 0);
$id = ReadingsVal($name, $bnr."_98_EventId", "");
$begin =~ s/\s/T/; # Formatierung nach ISO8601 (YYYY-MM-DDTHH:MM:SS) für at-Devices
$begin =~ s/\s/T/; # Formatierung nach ISO8601 (YYYY-MM-DDTHH:MM:SS) für at-Device
if($begin) { # einen Composite-Event erstellen wenn Beginnzeit gesetzt ist
$event = "composite: $bnr $id $isrepeat $begin $status ".($desc?$desc:$summary);