From b820dce5e5976e3e6c4fb727a311030029d546dd Mon Sep 17 00:00:00 2001 From: DS_Starter Date: Mon, 3 Feb 2020 15:21:58 +0000 Subject: [PATCH] 57_SSCal: contrib 1.6.0 git-svn-id: https://svn.fhem.de/fhem/trunk@21106 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/contrib/DS_Starter/57_SSCal.pm | 60 +++++++++++++++-------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/fhem/contrib/DS_Starter/57_SSCal.pm b/fhem/contrib/DS_Starter/57_SSCal.pm index cc6dd4836..042cd13e2 100644 --- a/fhem/contrib/DS_Starter/57_SSCal.pm +++ b/fhem/contrib/DS_Starter/57_SSCal.pm @@ -158,7 +158,7 @@ sub SSCal_Initialize($) { $hash->{AttrList} = "asyncMode:1,0 ". "calendarShowInDetail:0,1 ". "calendarShowInRoom:0,1 ". - "calOverviewFields:multiple-strict,Begin,End,Summary,Status,Location,Description,GPS,Calendar ". + "calOverviewFields:multiple-strict,Begin,End,Summary,Status,Location,Description,GPS,Calendar,Completion ". "cutOlderDays ". "cutLaterDays ". "disable:1,0 ". @@ -3171,26 +3171,28 @@ sub SSCal_calAsHtml($) { my ($name)= @_; my $hash = $defs{$name}; - my ($begin,$end,$summary,$location,$status,$desc,$gps,$cal); + my ($begin,$end,$summary,$location,$status,$desc,$gps,$cal,$completion); my %seen; my @cof = split(",", AttrVal($name, "calOverviewFields", "Begin,End,Summary,Status,Location")); grep { !$seen{$_}++ } @cof; my $out = ""; - $out .= ""; - $out .= ""; + $out .= ""; + $out .= ""; + $out .= ""; $out .= ""; $out .= ""; - $out .= "" if($seen{Begin}); - $out .= "" if($seen{End}); - $out .= "" if($seen{Summary}); - $out .= "" if($seen{Description}); - $out .= "" if($seen{Status}); - $out .= "" if($seen{Location}); - $out .= "" if($seen{GPS}); - $out .= "" if($seen{Calendar}); + $out .= "" if($seen{Begin}); + $out .= "" if($seen{End}); + $out .= "" if($seen{Summary}); + $out .= "" if($seen{Description}); + $out .= "" if($seen{Status}); + $out .= "" if($seen{Completion}); + $out .= "" if($seen{Location}); + $out .= "" if($seen{GPS}); + $out .= "" if($seen{Calendar}); $out .= ""; $out .= ""; @@ -3208,24 +3210,26 @@ 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 - $summary = ReadingsVal($name, $prestr."_01_Summary", ""); - $begin = ReadingsVal($name, $prestr."_02_Begin", "not set"); - $end = ReadingsVal($name, $prestr."_03_End", "not set"); - $desc = ReadingsVal($name, $prestr."_04_Description", ""); - $location = ReadingsVal($name, $prestr."_07_Location", ""); - $gps = ReadingsVal($name, $prestr."_08_GPS", ""); - $status = ReadingsVal($name, $prestr."_10_Status", ""); - $cal = ReadingsVal($name, $prestr."_90_calName", ""); + $summary = ReadingsVal($name, $prestr."_01_Summary", ""); + $begin = ReadingsVal($name, $prestr."_02_Begin", "not set"); + $end = ReadingsVal($name, $prestr."_03_End", "not set"); + $desc = ReadingsVal($name, $prestr."_04_Description", ""); + $location = ReadingsVal($name, $prestr."_07_Location", ""); + $gps = ReadingsVal($name, $prestr."_08_GPS", ""); + $status = ReadingsVal($name, $prestr."_10_Status", ""); + $completion = ReadingsVal($name, $prestr."_16_percentComplete", ""); + $cal = ReadingsVal($name, $prestr."_90_calName", ""); $out .= ""; - $out .= "" if($seen{Begin}); - $out .= "" if($seen{End}); - $out .= "" if($seen{Summary}); - $out .= "" if($seen{Description}); - $out .= "" if($seen{Status}); - $out .= "" if($seen{Location}); - $out .= "" if($seen{GPS}); - $out .= "" if($seen{Calendar}); + $out .= "" if($seen{Begin}); + $out .= "" if($seen{End}); + $out .= "" if($seen{Summary}); + $out .= "" if($seen{Description}); + $out .= "" if($seen{Status}); + $out .= "" if($seen{Completion}); + $out .= "" if($seen{Location}); + $out .= "" if($seen{GPS}); + $out .= "" if($seen{Calendar}); $out .= ""; }
Begin End Summary Description Status Location GPS Calendar Begin End Summary Description Status Completion
(%) 		Location GPS Calendar
$begin $end $summary $desc $status $location $gps $cal $begin $end $summary $desc $status $completion $location $gps $cal