| ".(($de)?'Start' :'Begin')." | " if($seen{Begin}); - $out .= "".(($de)?'Ende' :'End')." | " if($seen{End}); - $out .= "".(($de)?'Zeitzone' :'Timezone')." | " if($seen{Timezone}); - $out .= "".(($de)?'Zusammenfassung' :'Summary')." | " if($seen{Summary}); - $out .= "".(($de)?'Beschreibung' :'Description')." | " if($seen{Description}); - $out .= "".(($de)?'Status' :'State')." | " if($seen{Status}); - $out .= " ".(($de)?'Erfüllung (%)' :'Completion (%)')." | " if($seen{Completion});
- $out .= "".(($de)?'Ort' :'Location')." | " if($seen{Location}); - $out .= "".(($de)?'Karte' :'Map')." | " if($seen{Map}); - $out .= "".(($de)?'Kalender' :'Calendar')." | " if($seen{Calendar}); - - $out .= "|||||||||||||
| ".(($de)?'Start' :'Begin')." | " if($seen{Begin}); + $out .= "".(($de)?'----' :'----')." | " if($seen{Begin}); + $out .= "".(($de)?'Ende' :'End')." | " if($seen{End}); + $out .= "".(($de)?'----' :'----')." | " if($seen{End}); + $out .= "".(($de)?'Resttage' :'Days left')." | " if($seen{Days}); + $out .= "".(($de)?'Zeitzone' :'Timezone')." | " if($seen{Timezone}); + $out .= "".(($de)?'Zusammenfassung' :'Summary')." | " if($seen{Summary}); + $out .= "".(($de)?'Beschreibung' :'Description')." | " if($seen{Description}); + $out .= "".(($de)?'Status' :'State')." | " if($seen{Status}); + $out .= "".(($de)?'Erfüllung (%)' :'Completion (%)')." | " if($seen{Completion}); + $out .= "".(($de)?'Ort' :'Location')." | " if($seen{Location}); + $out .= "".(($de)?'Karte' :'Map')." | " if($seen{Map}); + $out .= "".(($de)?'Kalender' :'Calendar')." | " if($seen{Calendar}); my $l = length(keys %{$data{SSCal}{$name}{eventlist}}); @@ -3256,9 +3270,12 @@ sub SSCal_calAsHtml($) { my $prestr = sprintf("%0$l.0f", $k); # Prestring erstellen last if(!ReadingsVal($name, $prestr."_05_EventId", "")); # keine Ausgabe wenn es keine EventId mit Blocknummer 0 gibt -> kein Event/Aufage vorhanden + ($begind,$begint,$endd,$endt,$gps) = ("","","","",""); + $summary = ReadingsVal($name, $prestr."_01_Summary", ""); $begin = ReadingsVal($name, $prestr."_02_Begin", ""); $end = ReadingsVal($name, $prestr."_03_End", ""); + $dleft = ReadingsVal($name, $prestr."_04_daysLeft", ""); $desc = ReadingsVal($name, $prestr."_04_Description", ""); $location = ReadingsVal($name, $prestr."_07_Location", ""); $gpsa = ReadingsVal($name, $prestr."_08_gpsAddress", ""); @@ -3268,14 +3285,36 @@ sub SSCal_calAsHtml($) { $completion = ReadingsVal($name, $prestr."_16_percentComplete", ""); $cal = ReadingsVal($name, $prestr."_90_calName", ""); - $gps = ""; if($gpsc) { - my $img = FW_makeImage("it_i-net"); + my $micon; + if ($mi eq "icon") { + my $di = "it_i-net"; + my $ui = $hash->{HELPER}{tableSpecs}{columnMapIcon}; + $di = $ui ? $ui : $di; + $micon = FW_makeImage($di); + } elsif ($mi eq "data") { + $micon = join(" ", split(",", $gpsc)); + } elsif ($mi eq "text") { + my $dt = "link"; + my $ut = $hash->{HELPER}{tableSpecs}{columnMapText}; + $micon = $ut ? $ut : $dt; + } else { + $micon = ""; + } + my ($lat,$lng) = split(",", $gpsc); $lat = (split("=", $lat))[1]; $lng = (split("=", $lng))[1]; - # $gps = " $img "; # OpenstreetMap - $gps = " $img "; # Google Maps + + my $up = $hash->{HELPER}{tableSpecs}{columnMapProvider} || ""; + if ($up eq "GoogleMaps") { # Kartenprovider: Google Maps + $gps = " $micon "; + } elsif ($up eq "OpenStreetMap") { + $gps = " $micon "; # Kartenprovider: OpenstreetMap + } else { + $gps = " $micon "; # Kartenprovider default: Google Maps + } + } if($begin ne "") { # Datum sprachabhängig konvertieren bzw. heute/morgen setzen @@ -3286,32 +3325,43 @@ sub SSCal_calAsHtml($) { my $btimes = fhemTimeLocal(00, 00, 00, $bd, $bm-1, $by-1900); my $etimes = fhemTimeLocal(00, 00, 00, $ed, $em-1, $ey-1900); - if($de && $begin =~ m/(\d{4})-(\d{2})-(\d{2})\s(.*)/) { - $begin = "$3.$2.$1 $4"; - $end =~ m/(\d{4})-(\d{2})-(\d{2})\s(.*)/; - $end = "$3.$2.$1 $4"; - } + if($de) { + $begind = "$bd.$bm.$by"; + $endd = "$ed.$em.$ey"; + } else { + $begind = "$by-$bm-$bd"; + $endd = "$ey-$em-$ed"; + } + $begint = $bt; + $endt = $et; + + $edleft = ""; + if($etimes >= $ntimes) { + $edleft = int(($etimes - $ntimes)/86400); + } - $begin = (($de)?'heute ':'today ').$bt if(($btimes >= $ntimes) && ($btimes < $ntimes+86400)); - $end = (($de)?'heute ':'today ').$et if(($etimes >= $ntimes) && ($etimes < $ntimes+86400)); - - $begin = (($de)?'morgen ':'tomorrow ').$bt if(($btimes >= $ntimes+86400) && ($btimes < $ntimes+172800)); - $end = (($de)?'morgen ':'tomorrow ').$et if(($etimes >= $ntimes+86400) && ($etimes < $ntimes+172800)); + $begind = (($de)?'heute ':'today ') if($dleft eq "0"); + $endd = (($de)?'heute ':'today ') if($edleft eq "0"); + $begind = (($de)?'morgen ':'tomorrow ') if($dleft eq "1"); + $endd = (($de)?'morgen ':'tomorrow ') if($edleft eq "1"); + + $endd = "" if($begind eq $endd); # bei Ende nur Uhrzeit angeben wenn Termin am gleichen Tag beginnt/endet } - - $end = substr($end,11,8) if(substr($begin,0,10) eq substr($end,0,10) && $end !~ /heute|today|morgen|tomorrow/); # bei Ende nur Uhrzeit angeben wenn Termin am gleichen Tag beginnt/endet $out .= "||||||||||
| $begin | " if($seen{Begin}); - $out .= "$end | " if($seen{End}); - $out .= "$tz | " if($seen{Timezone}); - $out .= "$summary | " if($seen{Summary}); - $out .= "$desc | " if($seen{Description}); - $out .= "$status | " if($seen{Status}); - $out .= "$completion | " if($seen{Completion}); - $out .= "$location | " if($seen{Location}); - $out .= "$gps | " if($seen{Map}); - $out .= "$cal | " if($seen{Calendar}); + $out .= "$begind | " if($seen{Begin}); + $out .= "$begint | " if($seen{Begin}); + $out .= "$endd | " if($seen{End}); + $out .= "$endt | " if($seen{End}); + $out .= "$dleft | " if($seen{Days}); + $out .= "$tz | " if($seen{Timezone}); + $out .= "$summary | " if($seen{Summary}); + $out .= "$desc | " if($seen{Description}); + $out .= "$status | " if($seen{Status}); + $out .= "$completion | " if($seen{Completion}); + $out .= "$location | " if($seen{Location}); + $out .= "$gps | " if($seen{Map}); + $out .= "$cal | " if($seen{Calendar}); $out .= "