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@21160 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-02-09 15:05:13 +00:00
parent d7acb84e56
commit a96c30f036
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,8 @@ eval "use FHEM::Meta;1" or my $modMetaAbsent = 1;
my %SSCal_vNotesIntern = ( my %SSCal_vNotesIntern = (
"1.7.0" => "09.02.2020 respect global language setting for some presentation, new attributes tableSpecs & tableColumnMap, days left in overview ". "1.7.0" => "09.02.2020 respect global language setting for some presentation, new attributes tableSpecs & tableColumnMap, days left in overview ".
"formatting overview table, feature smallScreen for tableSpecs, rename attributes to tableFields, ". "formatting overview table, feature smallScreen for tableSpecs, rename attributes to tableFields, ".
"tableInDetail, tableInRoom, correct enddate/time if is_all_day incl. bugfix API ", "tableInDetail, tableInRoom, correct enddate/time if is_all_day incl. bugfix API, function SSCal_boolean ".
"to avoid fhem crash if an older JSON module is installed ",
"1.6.1" => "03.02.2020 rename attributes to \"calOverviewInDetail\",\"calOverviewInRoom\", bugfix of gps extraction ", "1.6.1" => "03.02.2020 rename attributes to \"calOverviewInDetail\",\"calOverviewInRoom\", bugfix of gps extraction ",
"1.6.0" => "03.02.2020 new attribute \"tableFields\" to show specified fields in calendar overview in detail/room view, ". "1.6.0" => "03.02.2020 new attribute \"tableFields\" to show specified fields in calendar overview in detail/room view, ".
"Model Diary/Tasks defined, periodic call of ToDo-Liists now possible ", "Model Diary/Tasks defined, periodic call of ToDo-Liists now possible ",
@ -3242,7 +3243,7 @@ sub SSCal_jboolmap($){
my ($bool)= @_; my ($bool)= @_;
if(JSON::is_bool($bool)) { if(JSON::is_bool($bool)) {
my $b = JSON::boolean($bool); my $b = SSCal_boolean($bool);
$bool = 1 if($b == $JSON::true); $bool = 1 if($b == $JSON::true);
$bool = 0 if($b == $JSON::false); $bool = 0 if($b == $JSON::false);
} }
@ -3250,6 +3251,12 @@ sub SSCal_jboolmap($){
return $bool; return $bool;
} }
sub SSCal_boolean {
# might be called as method or as function, so pop() to get the last arg
# instead of shift() to get the first
pop() ? $JSON::true : $JSON::false
}
############################################################################################# #############################################################################################
# Kalenderliste als HTML-Tabelle zurückgeben # Kalenderliste als HTML-Tabelle zurückgeben
############################################################################################# #############################################################################################
@ -3510,7 +3517,7 @@ Die Beschreibung des Moduls ist momentan nur im <a href="https://wiki.fhem.de/wi
"requires": { "requires": {
"FHEM": 5.00918799, "FHEM": 5.00918799,
"perl": 5.014, "perl": 5.014,
"JSON": 0, "JSON": 4.020,
"Data::Dumper": 0, "Data::Dumper": 0,
"MIME::Base64": 0, "MIME::Base64": 0,
"Time::HiRes": 0, "Time::HiRes": 0,