.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 45fbe6e7e9eb1b0b13f5f2ddd5691ff934c402f8..8efa6645a6d70d5a3967678cf1d5d875affe00bc 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,6 +3,8 @@
   <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/hotwater.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/hotwater.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/ical.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/ical.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scripts/lib/switchbot.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/switchbot.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -1163,14 +1165,8 @@
       <workItem from="1665644816191" duration="1000" />
       <workItem from="1665644884295" duration="20000" />
       <workItem from="1665655356996" duration="39000" />
-      <workItem from="1665922708761" duration="713000" />
-    </task>
-    <task id="LOCAL-00484" summary=".">
-      <created>1621061259708</created>
-      <option name="number" value="00484" />
-      <option name="presentableId" value="LOCAL-00484" />
-      <option name="project" value="LOCAL" />
-      <updated>1621061259708</updated>
+      <workItem from="1665922708761" duration="719000" />
+      <workItem from="1666248330245" duration="384000" />
     </task>
     <task id="LOCAL-00485" summary=".">
       <created>1621493667425</created>
@@ -1508,7 +1504,14 @@
       <option name="project" value="LOCAL" />
       <updated>1665644900754</updated>
     </task>
-    <option name="localTasksCounter" value="533" />
+    <task id="LOCAL-00533" summary=".">
+      <created>1665953404593</created>
+      <option name="number" value="00533" />
+      <option name="presentableId" value="LOCAL-00533" />
+      <option name="project" value="LOCAL" />
+      <updated>1665953404594</updated>
+    </task>
+    <option name="localTasksCounter" value="534" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/scripts/lib/ical.php b/scripts/lib/ical.php
index fda2c00cc1c18822aaf5176ad01b0f3728b699d9..aa02e9b0fbc0a6c6d092a1ebcdcf1ac887df0c3a 100644 (file)
--- a/scripts/lib/ical.php
+++ b/scripts/lib/ical.php
@@ -47,7 +47,6 @@ function searchIcalEvent($cal, $start = null, $end = null)
         }
         $event['data'] = $data;
         $res[] = $event;
-
     }
     return $res;
 }
@@ -62,8 +61,8 @@ function searchICalEventDay($cal, $day = null)
     $start = $day;
     $end = clone $day;
 
-    $start->setTime(0, 0, 0);
-    $end->setTime(23, 59, 59);
+    $start->setTime(6, 0, 0);
+    $end->setTime(18, 0, 0);
 
     return searchIcalEvent($cal, $start, $end);
 }

diff --git a/scripts/lib/switchbot.php b/scripts/lib/switchbot.php
index dd688d863244da4d32d6260232149e9cf0365ea1..16ad5730bf6348ab4a8d96830a59830fecd12488 100644 (file)
--- a/scripts/lib/switchbot.php
+++ b/scripts/lib/switchbot.php
@@ -31,7 +31,6 @@ function hotwaterCheckMode()
     $isWeek = $d < 6;
     $maxLevel = isJerome() ? "2" : '1';
 
-
     $ecomode = (int)getState('ecomode', '0');
 
     if (!isVincent()) {