mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

57_SSCal: contrib 1.6.1

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21120 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
DS_Starter
2020-02-04 19:35:38 +00:00
parent 38b538c654
commit fd172d5a01
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,7 +159,7 @@ sub SSCal_Initialize($) {
$hash->{AttrList} = "asyncMode:1,0 ". $hash->{AttrList} = "asyncMode:1,0 ".
"calOverviewInDetail:0,1 ". "calOverviewInDetail:0,1 ".
"calOverviewInRoom:0,1 ". "calOverviewInRoom:0,1 ".
"calOverviewFields:multiple-strict,Begin,End,Summary,Status,Location,Description,GPS,Calendar,Completion,Timezone ". "calOverviewFields:multiple-strict,Begin,End,Summary,Status,Location,Description,Map,Calendar,Completion,Timezone ".
"cutOlderDays ". "cutOlderDays ".
"cutLaterDays ". "cutLaterDays ".
"disable:1,0 ". "disable:1,0 ".
@@ -2224,15 +2224,16 @@ sub SSCal_writeValuesToArray ($$$$$$$$$$$) {
$vh->{$p}{$r} = "" if(!defined $vh->{$p}{$r}); $vh->{$p}{$r} = "" if(!defined $vh->{$p}{$r});
next if($vh->{$p}{$r} eq ""); next if($vh->{$p}{$r} eq "");
if ($r eq "address") { if ($r eq "address") {
$address = encode("UTF-8", $vh->{$p}{$r}); $address = encode("UTF-8", $vh->{$p}{$r}) if($vh->{$p}{$r});
} }
if ($r eq "gps") { if ($r eq "gps") {
$lng = encode("UTF-8", $vh->{$p}{$r}{lng}); $lng = encode("UTF-8", $vh->{$p}{$r}{lng});
$lat = encode("UTF-8", $vh->{$p}{$r}{lat}); $lat = encode("UTF-8", $vh->{$p}{$r}{lat});
} }
} }
$val = "mlat=".$lat.",mlon=".$lng; push(@row_array, $bts+$n." 08_gpsAddress " .$address."\n");
push(@row_array, $bts+$n." 08_GPS " .$val."\n"); $val = "lat=".$lat.",lng=".$lng;
push(@row_array, $bts+$n." 08_gpsCoordinates " .$val."\n");
} }
push(@row_array, $bts+$n." 11_isAllday " .$val."\n") if($p eq "is_all_day"); push(@row_array, $bts+$n." 11_isAllday " .$val."\n") if($p eq "is_all_day");
@@ -3212,7 +3213,7 @@ sub SSCal_calAsHtml($) {
$out .= "<td class='sscal sscalbold sscalcenter'> Status </td>" if($seen{Status}); $out .= "<td class='sscal sscalbold sscalcenter'> Status </td>" if($seen{Status});
$out .= "<td class='sscal sscalbold sscalcenter'> Completion<br>(%) </td>" if($seen{Completion}); $out .= "<td class='sscal sscalbold sscalcenter'> Completion<br>(%) </td>" if($seen{Completion});
$out .= "<td class='sscal sscalbold sscalcenter'> Location </td>" if($seen{Location}); $out .= "<td class='sscal sscalbold sscalcenter'> Location </td>" if($seen{Location});
$out .= "<td class='sscal sscalbold sscalcenter'> GPS </td>" if($seen{GPS}); $out .= "<td class='sscal sscalbold sscalcenter'> Map </td>" if($seen{Map});
$out .= "<td class='sscal sscalbold sscalcenter'> Calendar </td>" if($seen{Calendar}); $out .= "<td class='sscal sscalbold sscalcenter'> Calendar </td>" if($seen{Calendar});
$out .= "<tr><td> </td></tr>"; $out .= "<tr><td> </td></tr>";
@@ -3236,7 +3237,7 @@ sub SSCal_calAsHtml($) {
$end = ReadingsVal($name, $prestr."_03_End", "not set"); $end = ReadingsVal($name, $prestr."_03_End", "not set");
$desc = ReadingsVal($name, $prestr."_04_Description", ""); $desc = ReadingsVal($name, $prestr."_04_Description", "");
$location = ReadingsVal($name, $prestr."_07_Location", ""); $location = ReadingsVal($name, $prestr."_07_Location", "");
$gps = ReadingsVal($name, $prestr."_08_GPS", ""); $gps = ReadingsVal($name, $prestr."_08_gpsCoordinates", "");
$tz = ReadingsVal($name, $prestr."_09_Timezone", ""); $tz = ReadingsVal($name, $prestr."_09_Timezone", "");
$status = ReadingsVal($name, $prestr."_10_Status", ""); $status = ReadingsVal($name, $prestr."_10_Status", "");
$completion = ReadingsVal($name, $prestr."_16_percentComplete", ""); $completion = ReadingsVal($name, $prestr."_16_percentComplete", "");
@@ -3245,9 +3246,9 @@ sub SSCal_calAsHtml($) {
if($gps) { if($gps) {
my $img = FW_makeImage("it_i-net"); my $img = FW_makeImage("it_i-net");
my ($lat,$lng) = split(",", $gps); my ($lat,$lng) = split(",", $gps);
$gps = "<a href='https://www.openstreetmap.org/?$lat&$lng&zoom=14' target='_blank'> $img </a>"; $lat = (split("=", $lat))[1];
#$gps = "<img src=\"$FW_ME/www/images/default/Restart.png\" >"; $lng = (split("=", $lng))[1];
# $gps = $img; $gps = "<a href='https://www.openstreetmap.org/?mlat=$lat&mlon=$lng&zoom=14' target='_blank'> $img </a>";
} }
$out .= "<tr class='odd'>"; $out .= "<tr class='odd'>";
@@ -3259,7 +3260,7 @@ sub SSCal_calAsHtml($) {
$out .= "<td class='sscal'> $status </td>" if($seen{Status}); $out .= "<td class='sscal'> $status </td>" if($seen{Status});
$out .= "<td class='sscal'> $completion </td>" if($seen{Completion}); $out .= "<td class='sscal'> $completion </td>" if($seen{Completion});
$out .= "<td class='sscal'> $location </td>" if($seen{Location}); $out .= "<td class='sscal'> $location </td>" if($seen{Location});
$out .= "<td class='sscal'> $gps </td>" if($seen{GPS}); $out .= "<td class='sscal'> $gps </td>" if($seen{Map});
$out .= "<td class='sscal'> $cal </td>" if($seen{Calendar}); $out .= "<td class='sscal'> $cal </td>" if($seen{Calendar});
$out .= "</tr>"; $out .= "</tr>";
} }