.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3696585337a4b38d66c080981606b97295283c3e..15bd8f6afacdb1cd9c54d3cc506ea53e23607049 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,7 @@
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/weatherstation.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/weatherstation.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/scenes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/scenes.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1220,7 +1220,8 @@
       <workItem from="1688631283455" duration="69000" />
       <workItem from="1688631448099" duration="605000" />
       <workItem from="1688647175964" duration="439000" />
-      <workItem from="1688714739367" duration="44000" />
+      <workItem from="1688714739367" duration="177000" />
+      <workItem from="1688731476610" duration="479000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1565,7 +1566,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="558" />
+    <option name="localTasksCounter" value="559" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 5decac0aabc7f4806f2c48a7079583cfba10d1f1..df471fd2fb33af3599fcaa9e8b8953a3c07a841b 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -1221,13 +1221,22 @@ function updateSalonAuto() {
        if (getState('salonAutoMode') != '1') {
                return;
        }
+       $d = date('w');
        $hours = intval(date('H'));
-       if ($hours <= 9) {
-               $scene = 'tamise';
-       } else if ($hours <= 22) {
-               $scene = 'day';
-       } else {
-               $scene = 'tamise';
+       if ($d < 5) {
+               if ($hours <= 9) {
+                       $scene = 'tamise';
+               } else if ($hours <= 22) {
+                       $scene = 'day';
+               } else {
+                       $scene = 'tamise';
+               }
+       }else{
+               if ($hours <= 9) {
+                       $scene = 'tamise';
+               } else  {
+                       $scene = 'day';
+               }
        }
        execScene('salon/' . $scene, false);
 }