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

57_CALVIEW.pm: -new reading weekdayname and weekday

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15231 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
chris1284
2017-10-11 16:56:07 +00:00
parent 77099f7eaa
commit 6b2da2c66e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fhem/FHEM/57_CALVIEW.pm
View File

@@ -10,6 +10,7 @@ use strict;
use warnings;
use POSIX;
use Date::Parse;
#use Date::Calc qw(Day_of_Week);
sub CALVIEW_Initialize($)
{
@@ -108,6 +109,7 @@ sub CALVIEW_GetUpdate($){
my $isoendtime;
my ($D,$M,$Y);
my ($eD,$eM,$eY);
my @arrWeekday = ("Sonntag","Montag", "Dienstag","Mittwoch","Donnerstag","Freitag","Samstag");
foreach my $item (@termine ){
#start datum und zeit behandeln
if( defined($item->[0])&& length($item->[0]) > 0) {
@@ -132,6 +134,8 @@ sub CALVIEW_GetUpdate($){
my $eventDate = fhemTimeLocal(0,0,0,$D,$M-1,$Y-1900);
my $daysleft = floor(($eventDate - time) / 60 / 60 / 24 + 1);
my $daysleft_long;
#my $weekday = Day_of_Week($Y, $M, $D);
my ($tsec,$tmin,$thour,$tmday,$tmon,$year,$weekday,$tyday,$tisdst) = localtime(time + (86400 * $daysleft));
if( $daysleft == 0){$daysleft_long = "heute";}
elsif( $daysleft == 1){$daysleft_long = "morgen";}
else{$daysleft_long = "in ".$daysleft." Tagen";}
@@ -150,7 +154,8 @@ sub CALVIEW_GetUpdate($){
edatetimeiso => $isoendtime,
btimestamp => $bts[0],
mode => $item->[6],
wday => $wday};
weekday => $weekday,
weekdayname => $arrWeekday[$weekday]};
}
my $todaycounter = 1;
my $tomorrowcounter = 1;
@@ -228,7 +233,8 @@ sub CALVIEW_GetUpdate($){
readingsBulkUpdate($hash, "t_".sprintf ('%03d', $counter)."_etime", $termin->{etime});
readingsBulkUpdate($hash, "t_".sprintf ('%03d', $counter)."_mode", $termin->{mode});
readingsBulkUpdate($hash, "t_".sprintf ('%03d', $counter)."_timeshort", $timeshort );
readingsBulkUpdate($hash, "t_".sprintf ('%03d', $counter)."_weekday", $termin->{wday} );
readingsBulkUpdate($hash, "t_".sprintf ('%03d', $counter)."_weekday", $termin->{weekday} );
readingsBulkUpdate($hash, "t_".sprintf ('%03d', $counter)."_weekdayname", $termin->{weekdayname} );
#wenn termin heute today readings anlegen
if ($date eq $termin->{bdate} ){
if($isbday == 1 ){ readingsBulkUpdate($hash, "today_".sprintf ('%03d', $todaycounter)."_age", $age);}