FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 10:46:53 +00:00
Code Issues Releases Wiki Activity

57_SSCal: contrib 1.8.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21178 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-02-11 17:26:59 +00:00
parent 331d1e0ae5
commit 309f227722
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,7 +175,7 @@ sub SSCal_Initialize($) {
"showPassInLog:1,0 ". "showPassInLog:1,0 ".
"tableInDetail:0,1 ". "tableInDetail:0,1 ".
"tableInRoom:0,1 ". "tableInRoom:0,1 ".
"tableFields:multiple-strict,Begin,End,Summary,Status,Location,Description,Map,Calendar,Completion,Timezone,DaysLeft,EventId ". "tableFields:multiple-strict,Begin,End,DaysLeft,Timezone,Summary,Description,Status,Completion,Location,Map,Calendar,EventId ".
"timeout ". "timeout ".
"usedCalendars:--wait#for#Calendar#list-- ". "usedCalendars:--wait#for#Calendar#list-- ".
$readingFnAttributes; $readingFnAttributes;
@ -3363,14 +3363,18 @@ sub SSCal_calAsHtml($;$) {
if ($mi eq "icon") { if ($mi eq "icon") {
# Karten-Icon auswählen # Karten-Icon auswählen
my $di = "it_i-net"; my $di = "it_i-net";
my $ui = SSCal_evalTableSpecs ($hash,$di,$hash->{HELPER}{tableSpecs}{columnMapIcon},$bnr); my $ui = SSCal_evalTableSpecs ($hash,$di,$hash->{HELPER}{tableSpecs}{columnMapIcon},$bnr,@allrds);
$micon = FW_makeImage($ui); if($ui =~ /<svg class=|<img class=/) {
$micon = $ui;
} else { # in Image umwandeln wenn noch nicht passiert in SSCal_evalTableSpecs
$micon = FW_makeImage($ui);
}
} elsif ($mi eq "data") { } elsif ($mi eq "data") {
$micon = join(" ", split(",", $gpsc)); $micon = join(" ", split(",", $gpsc));
} elsif ($mi eq "text") { } elsif ($mi eq "text") {
# Karten-Text auswählen # Karten-Text auswählen
my $dt = "link"; my $dt = "link";
$micon = SSCal_evalTableSpecs ($hash,$dt,$hash->{HELPER}{tableSpecs}{columnMapText},$bnr); $micon = SSCal_evalTableSpecs ($hash,$dt,$hash->{HELPER}{tableSpecs}{columnMapText},$bnr,@allrds);
} else { } else {
$micon = ""; $micon = "";
} }
@ -3380,7 +3384,7 @@ sub SSCal_calAsHtml($;$) {
$lng = (split("=", $lng))[1]; $lng = (split("=", $lng))[1];
# Kartenanbieter auswählen # Kartenanbieter auswählen
my $up = SSCal_evalTableSpecs ($hash,"",$hash->{HELPER}{tableSpecs}{columnMapProvider},$bnr); my $up = SSCal_evalTableSpecs ($hash,"",$hash->{HELPER}{tableSpecs}{columnMapProvider},$bnr,@allrds);
if ($up eq "GoogleMaps") { # Kartenprovider: Google Maps if ($up eq "GoogleMaps") { # Kartenprovider: Google Maps
$gps = "<a href='https://www.google.de/maps/place/$gpsa/\@$lat,$lng' target='_blank'> $micon </a>"; $gps = "<a href='https://www.google.de/maps/place/$gpsa/\@$lat,$lng' target='_blank'> $micon </a>";
} elsif ($up eq "OpenStreetMap") { } elsif ($up eq "OpenStreetMap") {