diff --git a/contrib/DS_Starter/57_SSCal.pm b/contrib/DS_Starter/57_SSCal.pm index a928bb114..73d299415 100644 --- a/contrib/DS_Starter/57_SSCal.pm +++ b/contrib/DS_Starter/57_SSCal.pm @@ -176,7 +176,7 @@ sub SSCal_Initialize($) { "showPassInLog:1,0 ". "tableInDetail:0,1 ". "tableInRoom:0,1 ". - "tableFields:multiple-strict,Begin,End,DaysLeft,DaysLeftLong,Weekday,Timezone,Summary,Description,Status,Completion,Location,Map,Calendar,EventId ". + "tableFields:multiple-strict,Symbol,Begin,End,DaysLeft,DaysLeftLong,Weekday,Timezone,Summary,Description,Status,Completion,Location,Map,Calendar,EventId ". "timeout ". "usedCalendars:--wait#for#Calendar#list-- ". $readingFnAttributes; @@ -222,7 +222,7 @@ sub SSCal_Define($@) { $hash->{HELPER}{APIPARSET} = 0; # es sind keine API Informationen gesetzt -> neu abrufen CommandAttr(undef,"$name room SSCal"); - CommandAttr(undef,"$name event-on-update-reading .*Summary.*,state"); + CommandAttr(undef,"$name event-on-update-reading .*Summary,.*Status,state"); %SSCal_api = ( "APIINFO" => { "NAME" => "SYNO.API.Info" }, # Info-Seite für alle API's, einzige statische Seite ! @@ -2228,21 +2228,21 @@ sub SSCal_writeValuesToArray ($$$$$$$$$$$) { my @row_array = @{$aref}; my $hash = $defs{$name}; my $lang = AttrVal("global", "language", "EN"); - my $ts = time(); # Istzeit Timestamp - my $om = $hash->{OPMODE}; # aktuelle Operation Mode + my $ts = time(); # Istzeit Timestamp + my $om = $hash->{OPMODE}; # aktuelle Operation Mode my $status = "initialized"; my ($val,$uts,$td,$dleft,$bWday); my ($upcoming,$alarmed,$started,$ended) = (0,0,0,0); - $upcoming = SSCal_isUpcoming ($ts,0,$bts); # initiales upcoming + $upcoming = SSCal_isUpcoming ($ts,0,$bts); # initiales upcoming $started = SSCal_isStarted ($ts,$bts,$ets); $ended = SSCal_isEnded ($ts,$ets); if($bdate && $btime) { push(@row_array, $bts+$n." 05_Begin " .$bdate." ".$btime."\n"); - my ($ny,$nm,$nd,undef) = split(/[ -]/, TimeNow()); # Datum Jetzt - my ($by,$bm,$bd) = split("-", $bdate); # Beginn Datum + my ($ny,$nm,$nd,undef) = split(/[ -]/, TimeNow()); # Datum Jetzt + my ($by,$bm,$bd) = split("-", $bdate); # Beginn Datum my $ntimes = fhemTimeLocal(00, 00, 00, $nd, $nm-1, $ny-1900); my $btimes = fhemTimeLocal(00, 00, 00, $bd, $bm-1, $by-1900); if($btimes >= $ntimes) { @@ -3247,8 +3247,8 @@ sub SSCal_calAsHtml($;$) { my $lang = AttrVal("global", "language", "EN"); my $mi = AttrVal($name, "tableColumnMap", "icon"); - my ($begin,$begind,$begint,$end,$endd,$endt,$summary,$location,$status,$desc,$gps,$gpsa,$gpsc); - my ($cal,$completion,$tz,$dleft,$dleftlong,$weekday,$edleft,$id,$isallday); + my ($symbol,$begin,$begind,$begint,$end,$endd,$endt,$summary,$location,$status,$desc,$gps,$gpsa,$gpsc); + my ($di,$cal,$completion,$tz,$dleft,$dleftlong,$weekday,$edleft,$id,$isallday); # alle Readings in Array einlesen my @allrds = keys%{$defs{$name}{READINGS}}; @@ -3284,6 +3284,7 @@ sub SSCal_calAsHtml($;$) { $out .= "
".(($de)?'Symbol' :'Symbol')." | " if($seen{Symbol}); if ($small) { # nur ein Datumfeld umbrechbar $out .= "".(($de)?'Start' :'Begin')." | " if($seen{Begin}); $out .= "".(($de)?'Ende' :'End')." | " if($seen{End}); @@ -3345,12 +3346,8 @@ sub SSCal_calAsHtml($;$) { my $micon; if ($mi eq "icon") { # Karten-Icon auswählen - my $di = "it_i-net"; - $micon = SSCal_evalTableSpecs ($hash,$di,$hash->{HELPER}{tableSpecs}{columnMapIcon},$bnr,\@allrds,"image"); - - # in Image umwandeln (versuchen) wenn SSCal_evalTableSpecs String liefert - # if($ui =~ /