From 46251292b5c8b431de66aeff473594ccec60e04c Mon Sep 17 00:00:00 2001 From: RaindropsSys Date: Thu, 20 Jul 2023 18:29:09 +0200 Subject: Updated 19 files and added 26 files (automated) --- pages/account.inc | 15 +++ pages/alerts.inc | 15 +++ pages/api/2023ui.php | 5 + pages/docs.inc | 2 + pages/evening.inc | 308 +-------------------------------------------------- pages/jobs.inc | 12 ++ pages/lists.inc | 15 +++ pages/money.inc | 44 +++++--- pages/schedules.inc | 10 ++ pages/travelling.inc | 6 +- 10 files changed, 109 insertions(+), 323 deletions(-) create mode 100644 pages/account.inc create mode 100644 pages/alerts.inc create mode 100644 pages/api/2023ui.php create mode 100644 pages/lists.inc (limited to 'pages') diff --git a/pages/account.inc b/pages/account.inc new file mode 100644 index 0000000..c1c5d52 --- /dev/null +++ b/pages/account.inc @@ -0,0 +1,15 @@ + + +
+
+
+

Account and security

+
+
+ + diff --git a/pages/alerts.inc b/pages/alerts.inc new file mode 100644 index 0000000..b58a9ce --- /dev/null +++ b/pages/alerts.inc @@ -0,0 +1,15 @@ + + +
+
+
+

Alerts

+
+
+ + diff --git a/pages/api/2023ui.php b/pages/api/2023ui.php new file mode 100644 index 0000000..0501b9a --- /dev/null +++ b/pages/api/2023ui.php @@ -0,0 +1,5 @@ + } diff --git a/pages/evening.inc b/pages/evening.inc index f40cb20..59c34e4 100644 --- a/pages/evening.inc +++ b/pages/evening.inc @@ -1,311 +1,11 @@ 0) { - $thisIndex = array_search($thisMember[0], $switches); - - $frontingStart = $thisMember[0]; - $frontingEnd = $switches[$thisIndex - 1]; - } - - if ($frontingEnd !== null && isset($frontingStart)) { - $i["_lastFronted"] = strtotime($frontingEnd["timestamp"]); - } - } - - return $i; - }, array_values(array_filter(scoreOrderGlobal(), function ($i) { - return $i["_system"] === "ynmuc"; - }))), - ...array_map(function ($i) { - $system = "gdapd"; - $i["_lastFronted"] = -1; - $id = $i["id"]; - $memberData = $i; - - $fronters = array_map(function ($item) { - return $item["id"]; - }, json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$system/fronters.json"), true)["members"]); - - if (in_array($id, $fronters)) { - $i["_lastFronted"] = time(); - } else { - $switches = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$system/switches.json"), true); - - $thisMember = array_filter($switches, function ($item) use ($memberData) { - return in_array($memberData["id"], $item["members"]); - }); - - $thisMember = array_values($thisMember); - $frontingEnd = null; - - if (count($thisMember) > 0) { - $thisIndex = array_search($thisMember[0], $switches); - - $frontingStart = $thisMember[0]; - $frontingEnd = $switches[$thisIndex - 1]; - } - - if ($frontingEnd !== null && isset($frontingStart)) { - $i["_lastFronted"] = strtotime($frontingEnd["timestamp"]); - } - } - - return $i; - }, array_values(array_filter(scoreOrderGlobal(), function ($i) { - return $i["_system"] === "gdapd"; - }))) - ]; - - ?> - - +require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/components/header.inc'; ?>
-
-
-

= 1686787200 ? "" : " (Beta)" ?>

- - -
- The evening schedule will replace the fronting schedule starting June 15th. The fronting schedule page contains more information and shows the schedule up to that date. The evening schedule is experimental until then. -
- - -
- -

Click on the "Ignore" button to mark an evening as ignored and shift the schedule one day after. You can revert this by clicking on "Unignore".

- -
    - 0) $times[] = getLastFronted($members, $id); - } - foreach ($a[1] as $id) { - if (getLastFronted($members, $id) > 0) $times[] = getLastFronted($members, $id); - } - - $timeA = time() - min($times); - $times = []; - - foreach ($b[0] as $id) { - if (getLastFronted($members, $id) > 0) $times[] = getLastFronted($members, $id); - } - foreach ($b[1] as $id) { - if (getLastFronted($members, $id) > 0) $times[] = getLastFronted($members, $id); - } - - $timeB = time() - min($times); - - return $timeB - $timeA; - }); $pairs = array_values($pairs); foreach ($pairs as $pair): $times = []; ?> -
  • - - "> - - with - - "> - - () -
    • - -
-
- - = 1686787200): ?> -

-
-
-
- - ">">
- -
-
-
-
- - ">">
- -
-
-
- 0) $times[] = getLastFronted($members, $id); - } - foreach ($pair[1] as $id) { - if (getLastFronted($members, $id) > 0) $times[] = getLastFronted($members, $id); - } - - $time = time() - min($times); - echo(timeAgo(time() - $time)); - - ?> -
-
- - " class="btn btn-outline-secondary">Unlock - - " class="btn btn-outline-primary">Lock -    - - Unignore - - Ignore - -
-
- " : "" ?> - -
-
- + diff --git a/pages/jobs.inc b/pages/jobs.inc index c00e35c..3c0bb3d 100644 --- a/pages/jobs.inc +++ b/pages/jobs.inc @@ -17,6 +17,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/components/header.inc'; ?>