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

98_weekprofile: attribute widgetEditDaysInRow to control visible days in one row

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10893 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
risiko79 2016-02-20 16:37:34 +00:00
parent 470a296b55
commit 82fb97daad
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/CHANGED
View File

@ -1,5 +1,7 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- feature: 98_weekprofile: attribute widgetEditDaysInRow to control
visible days in one row
- feature 49_SSCAM: function "get ... eventlist" added, - feature 49_SSCAM: function "get ... eventlist" added,
Reading "CamEventNum" added which containes total Reading "CamEventNum" added which containes total
number of camera events, number of camera events,

16
fhem/FHEM/98_weekprofile.pm
View File

@ -386,7 +386,7 @@ sub weekprofile_Initialize($)
$hash->{StateFn} = "weekprofile_State"; $hash->{StateFn} = "weekprofile_State";
$hash->{NotifyFn} = "weekprofile_Notify"; $hash->{NotifyFn} = "weekprofile_Notify";
$hash->{AttrFn} = "weekprofile_Attr"; $hash->{AttrFn} = "weekprofile_Attr";
$hash->{AttrList} = "useTopics:0,1 widgetWeekdays widgetEditOnNewPage:0,1 configFile ".$readingFnAttributes; $hash->{AttrList} = "useTopics:0,1 widgetWeekdays widgetEditOnNewPage:0,1 widgetEditDaysInRow:1,2,3,4,5,6,7 configFile ".$readingFnAttributes;
$hash->{FW_summaryFn} = "weekprofile_SummaryFn"; $hash->{FW_summaryFn} = "weekprofile_SummaryFn";
@ -1013,6 +1013,7 @@ sub weekprofile_SummaryFn()
my $iconName = AttrVal($d, "icon", "edit_settings"); my $iconName = AttrVal($d, "icon", "edit_settings");
my $editNewpage = AttrVal($d, "widgetEditOnNewPage", 0); my $editNewpage = AttrVal($d, "widgetEditOnNewPage", 0);
my $useTopics = AttrVal($d, "useTopics", 0); my $useTopics = AttrVal($d, "useTopics", 0);
my $editDaysInRow = AttrVal($d, "widgetEditDaysInRow", undef);
my $editIcon = FW_iconName($iconName) ? FW_makeImage($iconName,$iconName,"icon") : ""; my $editIcon = FW_iconName($iconName) ? FW_makeImage($iconName,$iconName,"icon") : "";
$editIcon = "<a name=\"$d.edit\" onclick=\"weekprofile_DoEditWeek('$d','$editNewpage')\" href=\"javascript:void(0)\">$editIcon</a>"; $editIcon = "<a name=\"$d.edit\" onclick=\"weekprofile_DoEditWeek('$d','$editNewpage')\" href=\"javascript:void(0)\">$editIcon</a>";
@ -1025,6 +1026,7 @@ sub weekprofile_SummaryFn()
my $args = "weekprofile,MODE:SHOW"; my $args = "weekprofile,MODE:SHOW";
$args .= ",USETOPICS:$useTopics"; $args .= ",USETOPICS:$useTopics";
$args .= ",MASTERDEV:$masterDev" if (defined($masterDev)); $args .= ",MASTERDEV:$masterDev" if (defined($masterDev));
$args .= ",DAYINROW:$editDaysInRow" if (defined($editDaysInRow));
my $curr = ""; my $curr = "";
if (@{$hash->{PROFILES}} > 0) if (@{$hash->{PROFILES}} > 0)
@ -1057,10 +1059,14 @@ sub weekprofile_SummaryFn()
############################################## ##############################################
sub weekprofile_editOnNewpage(@) sub weekprofile_editOnNewpage(@)
{ {
my ($device, $prf) = @_; my ($device, $prf, $daysInRow) = @_;
my $hash = $defs{$device}; my $hash = $defs{$device};
my $editDaysInRow = AttrVal($device, "widgetEditDaysInRow", undef);
$editDaysInRow = $daysInRow if (defined($daysInRow));
my $args = "weekprofile,MODE:EDIT,JMPBACK:1"; my $args = "weekprofile,MODE:EDIT,JMPBACK:1";
$args .= ",DAYINROW:$editDaysInRow" if (defined($editDaysInRow));
my $html; my $html;
$html .= "<html>"; $html .= "<html>";
@ -1248,6 +1254,9 @@ sub weekprofile_getEditLNK_MasterDev($$)
<li>widgetEditOnNewPage<br> <li>widgetEditOnNewPage<br>
Editing the profile on a new html page if it is set to '1' Editing the profile on a new html page if it is set to '1'
</li> </li>
<li>widgetEditDaysInRow<br>
Count of visible days in on row during Edit. Default 2.<br>
</li>
<li>configFile<br> <li>configFile<br>
Path and filename of the configuration file where the profiles will be stored Path and filename of the configuration file where the profiles will be stored
Default: ./log/weekprofile-<name>.cfg Default: ./log/weekprofile-<name>.cfg
@ -1385,6 +1394,9 @@ sub weekprofile_getEditLNK_MasterDev($$)
Beginnend bei Montag. z.B. Beginnend bei Montag. z.B.
<code>attr name widgetWeekdays Montag,Dienstag,Mittwoch,Donnerstag,Freitag,Samstag,Sonntag</code> <code>attr name widgetWeekdays Montag,Dienstag,Mittwoch,Donnerstag,Freitag,Samstag,Sonntag</code>
</li> </li>
<li>widgetEditDaysInRow<br>
Anzahl in der in einer Reihe dargestellten Tage während der Bearbeitung. Default 2.<br>
</li>
<li>widgetEditOnNewPage<br> <li>widgetEditOnNewPage<br>
Wenn gesetzt ('1'), dann wird die Bearbeitung auf einer separaten\neuen Webseite gestartet. Wenn gesetzt ('1'), dann wird die Bearbeitung auf einer separaten\neuen Webseite gestartet.
</li> </li>