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

57_SSCal: contrib 1.7.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21164 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-02-09 18:49:02 +00:00
parent 19ce9e838f
commit 642e2ff66d
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3266,7 +3266,7 @@ sub SSCal_calAsHtml($;$) {
my $lang = AttrVal("global", "language", "EN"); my $lang = AttrVal("global", "language", "EN");
my $mi = AttrVal($name, "tableColumnMap", "icon"); my $mi = AttrVal($name, "tableColumnMap", "icon");
my ($begin,$begind,$begint,$end,$endd,$endt,$summary,$location,$status,$desc,$gps,$gpsa,$gpsc,$cal,$completion,$tz,$dleft,$edleft,$id); my ($begin,$begind,$begint,$end,$endd,$endt,$summary,$location,$status,$desc,$gps,$gpsa,$gpsc,$cal,$completion,$tz,$dleft,$edleft,$id,$isallday);
# alle Readings in Array einlesen # alle Readings in Array einlesen
my @allrds = keys%{$defs{$name}{READINGS}}; my @allrds = keys%{$defs{$name}{READINGS}};
@ -3353,6 +3353,7 @@ sub SSCal_calAsHtml($;$) {
$completion = ReadingsVal($name, $prestr."_85_percentComplete", ""); $completion = ReadingsVal($name, $prestr."_85_percentComplete", "");
$cal = ReadingsVal($name, $prestr."_90_calName", ""); $cal = ReadingsVal($name, $prestr."_90_calName", "");
$id = ReadingsVal($name, $prestr."_98_EventId", ""); $id = ReadingsVal($name, $prestr."_98_EventId", "");
$isallday = ReadingsVal($name, $prestr."_50_isAllday", "");
if($gpsc) { if($gpsc) {
my $micon; my $micon;
@ -3414,13 +3415,20 @@ sub SSCal_calAsHtml($;$) {
$begind = (($de)?'morgen ':'tomorrow ') if($dleft eq "1"); $begind = (($de)?'morgen ':'tomorrow ') if($dleft eq "1");
$endd = (($de)?'morgen ':'tomorrow ') if($edleft 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 if (($begind eq $endd) && !$isallday) {
} $endd = ""; # bei "Ende" nur Uhrzeit angeben wenn Termin am gleichen Tag beginnt/endet aber kein Ganztagstermin ist
} elsif (($begind eq $endd) && $isallday) {
$begint = "";
$endt = "";
}
}
$out .= "<tr class='".($k&1?"odd":"even")."'>"; $out .= "<tr class='".($k&1?"odd":"even")."'>";
if($small) { if($small) {
$out .= "<td class='cal '> ".$begind." ".$begint. "</td>" if($seen{Begin}); $out .= "<td class='cal '> ".$begind." ".$begint. "</td>" if($seen{Begin});
$out .= "<td class='cal '> ".$endd ." ".$endt. "</td>" if($seen{End}); $out .= "<td class='cal '> ".$endd ." ".$endt. "</td>" if($seen{End});
} else { } else {
$out .= "<td class='cal calcenter'> $begind </td>" if($seen{Begin}); $out .= "<td class='cal calcenter'> $begind </td>" if($seen{Begin});
$out .= "<td class='cal calcenter'> $begint </td>" if($seen{Begin}); $out .= "<td class='cal calcenter'> $begint </td>" if($seen{Begin});