Updated 2 files (automated)

2 files changed, 12 insertions, 25 deletions

diff --git a/includes/components/emergency.inc b/includes/components/emergency.inc
index 8ebd65e..67f4422 100644
--- a/includes/components/emergency.inc
+++ b/includes/components/emergency.inc
@@ -85,7 +85,7 @@
             document.getElementById("enable-<?= $GLOBALS["ColdHazeApp"]["other"]["slug"] ?>").checked ? "<?= $GLOBALS["ColdHazeApp"]["other"]["slug"] ?>" : null,
             document.getElementById("enable-raindrops").checked ? "raindrops" : null,
             document.getElementById("enable-moonglow").checked ? "moonglow" : null,
-            document.getElementById("enable-hailstorm").checked ? "hailstorm" : null,
+            //document.getElementById("enable-hailstorm").checked ? "hailstorm" : null,
         ].filter(i => i);
         return "?" + targets.join("&");
     }
@@ -127,7 +127,7 @@
         document.getElementById("enable-<?= $GLOBALS["ColdHazeApp"]["other"]["slug"] ?>").disabled = true;
         document.getElementById("enable-raindrops").disabled = true;
         document.getElementById("enable-moonglow").disabled = true;
-        document.getElementById("enable-hailstorm").disabled = true;
+        //document.getElementById("enable-hailstorm").disabled = true;
 
         window.alertInterval = setInterval(() => {
             window.alertIntervalCounter--;
@@ -151,6 +151,6 @@
         document.getElementById("enable-<?= $GLOBALS["ColdHazeApp"]["other"]["slug"] ?>").disabled = false;
         document.getElementById("enable-raindrops").disabled = false;
         document.getElementById("enable-moonglow").disabled = false;
-        document.getElementById("enable-hailstorm").disabled = false;
+        //document.getElementById("enable-hailstorm").disabled = false;
     }
 </script>
\ No newline at end of file
diff --git a/pages/schedule.inc b/pages/schedule.inc
index f61d43b..3c6bc2a 100644
--- a/pages/schedule.inc
+++ b/pages/schedule.inc
@@ -4,11 +4,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/init.inc"; global $title; gl
 require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/components/header.inc';
 global $app; global $_PROFILE;
 
-$pairs = [
-    ["rirgf", "tbimg"],
-    ["yhbrc", "qaenj"],
-    ["rpavp", "khsbb"]
-];
+$pairs = [];
 
 $pairs2 = [
     ["lqolg"],
@@ -20,7 +16,8 @@ $pairs2 = [
     ["qraku"],
     ["mhnqy"],
     ["ztfjz"],
-    ["ufadt"]
+    ["ufadt"],
+    ["ckqsw"]
 ];
 
 // --------------------
@@ -204,6 +201,7 @@ if (isset($_GET["ignore"]) && isset($_GET["day"])) {
         </ul>
     </details>
 
+    <div style="display: grid; grid-template-columns: max-content 1fr; grid-column-gap: 10px;">
     <?php
 
     $pairs = array_values($pairs);
@@ -212,12 +210,11 @@ if (isset($_GET["ignore"]) && isset($_GET["day"])) {
     $i = 0;
     $i1 = 0;
     $i2 = 0;
+    $max = 62;
 
-    while ($i < 7): ?>
-    <h5><?= getRelativeDay($i) ?></h5>
-    <div style="display: grid; grid-template-columns: max-content 1fr; grid-column-gap: 10px;">
-        <div>
-            <b>During the day:</b>
+    while ($i < $max): ?>
+        <div style="text-align: right;">
+            <b><?= getRelativeDay($i) ?>:</b>
         </div>
         <div>
             <?php $j = 0; foreach ($pairs2[$i2] as $id): ?>
@@ -225,24 +222,14 @@ if (isset($_GET["ignore"]) && isset($_GET["day"])) {
                 <?php if (isset($pairs2[$i2][$j + 1])): ?>and<?php endif; ?>
             <?php $j++; endforeach; $i2++; ?>
         </div>
-        <div>
-            <b>In the evening:</b>
-        </div>
-        <div>
-            <?php if ((int)date('j', time() + ($i * 86400)) % 2 === 0): $j = 0; foreach ($pairs[$i1] as $id): ?>
-                <a href="/<?=  getMemberWithoutSystem($id)["name"] ?>"><img style="width: 24px;" src="<?= getAsset("gdapd", $id, "heads") ?>"> <?= getMemberWithoutSystem($id)["display_name"] ?></a>
-                <?php if (isset($pairs[$i1][$j + 1])): ?>and<?php endif; ?>
-            <?php $j++; endforeach; $i1++; else: echo("<span class='text-muted'>Nopony on this day</span>"); endif; ?>
-        </div>
-    </div>
 
-    <?php if ($i + 1 < 7): ?><hr><?php endif; ?>
     <?php $i++;
 
     if (!isset($pairs2[$i2])) $i2 = 0;
     if (!isset($pairs[$i1])) $i1 = 0;
 
     endwhile; ?>
+    </div>
 </div>
 
 <?php require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/components/footer.inc'; ?>