diff --git a/fhem/CHANGED b/fhem/CHANGED index 7bfc02dc3..8f9b6e363 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,7 @@ # 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. + - feature: 98_weekprofile: new attribute 'widgetEditOnNewPage' to edit + weekprofile on new web page - change: 89_HEATRONIC: new feature: set heating mode, set temperature new reading ch_code - bugfix: FB_CALLMONITOR: empty phonebooks will be recognized correctly, diff --git a/fhem/FHEM/98_weekprofile.pm b/fhem/FHEM/98_weekprofile.pm index 7ab91f400..185bbd709 100644 --- a/fhem/FHEM/98_weekprofile.pm +++ b/fhem/FHEM/98_weekprofile.pm @@ -310,7 +310,7 @@ sub weekprofile_Initialize($) $hash->{StateFn} = "weekprofile_State"; $hash->{NotifyFn} = "weekprofile_Notify"; $hash->{AttrFn} = "weekprofile_Attr"; - $hash->{AttrList} = "widgetWeekdays configFile ".$readingFnAttributes; + $hash->{AttrList} = "widgetWeekdays widgetEditOnNewPage:0,1 configFile ".$readingFnAttributes; $hash->{FW_summaryFn} = "weekprofile_SummaryFn"; @@ -659,11 +659,13 @@ sub weekprofile_SummaryFn() my $html; my $iconName = AttrVal($d, "icon", "edit_settings"); - my $icon = FW_iconName($iconName) ? FW_makeImage($iconName,$iconName,"icon") : ""; - $icon = "$icon"; + my $editNewpage = AttrVal($d, "widgetEditOnNewPage", 0); - my $lnk = AttrVal($d, "alias", $d); - $lnk = "$lnk" if($show_links); + my $editIcon = FW_iconName($iconName) ? FW_makeImage($iconName,$iconName,"icon") : ""; + $editIcon = "$editIcon"; + + my $lnkDetails = AttrVal($d, "alias", $d); + $lnkDetails = "$lnkDetails" if($show_links); my $args = "weekprofile"; my $curr = undef; @@ -673,7 +675,7 @@ sub weekprofile_SummaryFn() $html .= ""; $html .= "
"; $html .= "
"; - $html .= $icon." ".$lnk; + $html .= $editIcon." ".$lnkDetails; $html .= "
"; $html .= ""; $html .= "
"; # div tag to support inform updates @@ -682,6 +684,30 @@ sub weekprofile_SummaryFn() $html .= ""; return $html; } +############################################## +sub weekprofile_editOnNewpage(@) +{ + my ($device, $prf,$backurl) = @_; + my $hash = $defs{$device}; + + $backurl="?" if(!defined($backurl)); + my $args = "weekprofile,EDIT,$backurl"; + + my $html; + $html .= ""; + $html .= ""; + $html .= ""; + $html .= ""; + $html .= "
"; + $html .= "
"; + $html .= "
"; + $html .= "
"; + $html .= "
"; # div tag to support inform updates + $html .= "
"; + $html .= "
"; + $html .= ""; + return $html; +} 1; =pod @@ -764,6 +790,9 @@ sub weekprofile_SummaryFn() Liste von Wochentagen getrennt durch ',' welche im Widget angzeigt werden. Beginnend bei Montag. z.B. attr name widgetWeekdays Montag,Dienstag,Mittwoch,Donnerstag,Freitag,Samstag,Sonntag + +
  • widgetEditOnNewPage
    + Wenn gesetzt ('1'), dann wird die Bearbeitung auf einer separaten\neuen Webseite gestartet.
  • configFile
    Pfad und Dateiname wo die Profile gespeichert werden sollen. diff --git a/fhem/www/pgm2/fhemweb_weekprofile.js b/fhem/www/pgm2/fhemweb_weekprofile.js index 0bd5b9cab..4dbcfdb16 100644 --- a/fhem/www/pgm2/fhemweb_weekprofile.js +++ b/fhem/www/pgm2/fhemweb_weekprofile.js @@ -39,14 +39,23 @@ function FW_weekprofileInputDialog(title,inp,parent, callback) }); } -function weekprofile_DoEditWeek(devName) +function weekprofile_DoEditWeek(devName,newPage) { var widget = $('div[informid="'+devName+'"]').get(0); - widget.MODE = 'EDIT'; - - $(widget.MENU.BASE).hide(); - - widget.setValueFn("REUSEPRF"); + + if (newPage == 1) { + var url = location.href; + var pos = url.indexOf('?'); + if (pos >=0) + url = url.substr(pos); + else + url=''; + window.location.assign(FW_root+'?cmd={weekprofile_editOnNewpage("'+widget.DEVICE+'","'+widget.CURPRF+'","'+url+'");;}'); + } else { + widget.MODE = 'EDIT'; + $(widget.MENU.BASE).hide(); + widget.setValueFn("REUSEPRF"); + } } function FW_weekprofilePRFChached(devName,select) @@ -357,15 +366,24 @@ function FW_weekprofilePrepAndSendProf(devName) widget.PROFILE[day] = prf[day]; } } - widget.MODE = "SHOW"; - widget.setValueFn("REUSEPRF"); + FW_weekprofileBack(widget); +} + +function FW_weekprofileBack(widget) +{ + if (widget.SHOWURL){ + window.location.assign(FW_root+widget.SHOWURL); + } + else { + widget.MODE = "SHOW"; + widget.setValueFn("REUSEPRF"); + } } function FW_weekprofileEditAbort(devName) { var widget = $('div[informid="'+devName+'"]').get(0); - widget.MODE = "SHOW"; - widget.setValueFn("REUSEPRF"); + FW_weekprofileBack(widget); } function FW_weekprofileSetValue(devName,data) @@ -383,7 +401,7 @@ function FW_weekprofileSetValue(devName,data) } widget.PROFILE = prf; - if (widget.MODE == 'SHOW' || widget.MODE == 'CREATE') + if (widget.MODE == 'SHOW') { FW_weekprofileShow(widget); } @@ -416,14 +434,15 @@ function FW_weekprofileGetValues(devName,what,data) function FW_weekprofileCreate(elName, devName, vArr, currVal, set, params, cmd) { + // called from FW_replaceWidget fhemweb.js if( 0 ) { - console.log( "elName: "+elName ); - console.log( "devName: "+devName ); - console.log( "vArr: "+vArr ); - console.log( "currVal: "+currVal ); - console.log( "set: "+set ); - console.log( "params: "+params ); - console.log( "cmd: "+cmd ); + console.log( "elName: "+elName ); + console.log( "devName: "+devName ); // attr dev + console.log( "vArr: "+vArr ); // attr arg split ',' + console.log( "currVal: "+currVal ); // attr current + console.log( "set: "+set ); // attr cmd split ' ' first entry + console.log( "params: "+params ); // attr cmd list split ' ' without first entry + console.log( "cmd: "+cmd ); // function for ToDo } if(!vArr.length || vArr[0] != "weekprofile") @@ -451,7 +470,13 @@ FW_weekprofileCreate(elName, devName, vArr, currVal, set, params, cmd) } $(widget.HEADER).append(prfCnt); - widget.MODE = 'CREATE'; + widget.SHOWURL = null; + widget.MODE = 'SHOW'; + if (vArr.length > 1) { + widget.MODE = vArr[1]; + if (vArr.length > 2) + widget.SHOWURL = vArr[2]; + } widget.DEVICE = devName; widget.WEEKDAYS = shortDays.slice(); widget.CURPRF = currVal;