FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-07 16:59:18 +00:00
Code Issues Releases Wiki Activity

57_CALVIEW.pm: -new reading weekdayname and weekday

Browse Source 
-new attr weekdayformat

git-svn-id: https://svn.fhem.de/fhem/trunk@15232 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
chris1284 2017-10-11 17:21:34 +00:00
parent 3bc2ee64c1
commit ea85c7d10c
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fhem/FHEM/57_CALVIEW.pm
View File

@ -32,6 +32,7 @@ sub CALVIEW_Initialize($)
"sourcecolor:textField-long " .
"timeshort:1,0 " .
"yobfield:_location,_description,_summary " .
"weekdayformat:de-long,de-short,en-long,en-short " .
$readingFnAttributes;
}
sub CALVIEW_Define($$){
@ -109,7 +110,10 @@ sub CALVIEW_GetUpdate($){
my $isoendtime;
my ($D,$M,$Y);
my ($eD,$eM,$eY);
my @arrWeekday = ("Sonntag","Montag", "Dienstag","Mittwoch","Donnerstag","Freitag","Samstag");
my @arrWeekdayDe = ("Sonntag","Montag", "Dienstag","Mittwoch","Donnerstag","Freitag","Samstag");
my @arrWeekdayDeShrt = ("So","Mo", "Di","Mi","Do","Fr","Sa");
my @arrWeekdayEn = ("Sunday","Monday", "Tuesday","Wednesday","Thursday","Friday","Saturday");
my @arrWeekdayEnShrt = ("Sun","Mon", "Tue","Wed","Thu","Fri","Sat");
foreach my $item (@termine ){
#start datum und zeit behandeln
if( defined($item->[0])&& length($item->[0]) > 0) {
@ -136,6 +140,13 @@ sub CALVIEW_GetUpdate($){
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));
#"weekdayname:de-long,de-short,en-long,en-short " .
my $weekdayname;
if ( AttrVal($name,"weekdayformat","de-long") eq "de-short") {$weekdayname = $arrWeekdayDeShrt[$weekday]}
elsif (AttrVal($name,"weekdayformat","de-long") eq "en-long") {$weekdayname = $arrWeekdayEn[$weekday]}
elsif (AttrVal($name,"weekdayformat","de-long") eq "en-short") {$weekdayname = $arrWeekdayEnShrt[$weekday]}
else {$weekdayname = $arrWeekdayDe[$weekday]}
if( $daysleft == 0){$daysleft_long = "heute";}
elsif( $daysleft == 1){$daysleft_long = "morgen";}
else{$daysleft_long = "in ".$daysleft." Tagen";}
@ -155,7 +166,7 @@ sub CALVIEW_GetUpdate($){
btimestamp => $bts[0],
mode => $item->[6],
weekday => $weekday,
weekdayname => $arrWeekday[$weekday]};
weekdayname => $weekdayname};
}
my $todaycounter = 1;
my $tomorrowcounter = 1;
@ -431,6 +442,13 @@ sub CALVIEW_Notify($$)
_location - year of birth will be read from term location <br>
_summary - year of birth will be read from summary (uses the first sequence of 4 digits in the string)
</li><br>
<li>weekdayformat<br>
formats the name of the reading weekdayname <br>
- de-long - (default) german, long name like Dienstag <br>
- de-short - german, short name like Di <br>
- en-long - english, long name like Tuesday <br>
- en-short - english, short name like Tue <br>
</li><br>
=end html
=begin html_DE
@ -497,5 +515,12 @@ sub CALVIEW_Notify($$)
_location - Geburtsjahr wird aus dem Terminort gelesen <br>
_summary - Geburtsjahr wird aus dem Termintiele gelesen (verwendet wird die erste folge von 4 Ziffern im String))
</li><br>
<li>weekdayformat<br>
formatiert den Namen im Reading weekdayname <br>
- de-long - (default) Deutsch, lang zb Dienstag <br>
- de-short - Deutsch, kurze zb Di <br>
- en-long - English, lang zb Tuesday <br>
- en-short - English, kurze zb Tue <br>
</li><br>
=end html_DE
=cut