Додана сторінка "Стенд"

Додане повідомлення про оновлення застосунку Оновлен Service Worker Перероблен WebSocket APІ
2025-10-19 00:55:30 +03:00
parent 6ec6523d71
commit 3f08f3f6c9
46 changed files with 2651 additions and 2691 deletions
--- a/web/lib/pages/sheeps/script.js
+++ b/web/lib/pages/sheeps/script.js
@@ -27,144 +27,142 @@ let Sheeps_icon = [
    '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><path d="M 14 12 C 12.896 12 12 12.896 12 14 C 12 15.104 12.896 16 14 16 L 15.492188 16 C 11.397556 20.243092 9 25.992059 9 32 C 9 39.62 12.760547 46.729531 19.060547 51.019531 C 20.970547 52.319531 23.249688 53 25.679688 53 L 38.330078 53 C 40.750078 53 43.039219 52.309766 44.949219 51.009766 C 51.239219 46.719766 55 39.62 55 32 C 55 25.992059 52.602444 20.243092 48.507812 16 L 50 16 C 51.104 16 52 15.104 52 14 C 52 12.896 51.104 12 50 12 L 14 12 z M 21.75 16 L 42.25 16 C 44.971669 17.740083 47.142531 20.078247 48.642578 22.791016 L 46.380859 23.695312 C 42.871859 25.098312 38.961906 25.213578 35.378906 24.017578 L 29.582031 22.085938 C 25.319031 20.664938 20.646828 20.726672 16.423828 22.263672 L 15.460938 22.613281 C 16.956883 19.976859 19.088528 17.701597 21.75 16 z M 23.042969 25.064453 C 24.826219 25.040328 26.612906 25.312359 28.316406 25.880859 L 34.113281 27.8125 C 36.165281 28.4965 38.300547 28.837891 40.435547 28.837891 C 42.961547 28.837891 45.486234 28.358203 47.865234 27.408203 L 50.1875 26.480469 C 50.715092 28.239658 51 30.092368 51 32 C 51 38.29 47.899219 44.170938 42.699219 47.710938 C 41.459219 48.550938 39.950078 49 38.330078 49 L 25.679688 49 C 24.059687 49 22.550547 48.560938 21.310547 47.710938 C 16.110547 44.170938 13 38.3 13 32 C 13 30.484897 13.183421 29.005425 13.519531 27.578125 L 17.791016 26.023438 C 19.480516 25.409438 21.259719 25.088578 23.042969 25.064453 z M 34.5 32 C 31.548188 32 29.139763 33.869393 27.722656 35.292969 L 25.199219 33.400391 C 24.469219 32.852391 23.464953 32.8685 22.751953 33.4375 C 22.039953 34.0065 21.802781 34.986359 22.175781 35.818359 C 22.537781 36.624359 22.900281 37.607 22.988281 38 C 22.901281 38.393 22.537781 39.375641 22.175781 40.181641 C 21.802781 41.013641 22.039953 41.9935 22.751953 42.5625 C 23.116953 42.8545 23.558 43 24 43 C 24.422 43 24.843219 42.866609 25.199219 42.599609 L 27.722656 40.707031 C 29.139763 42.130607 31.548188 44 34.5 44 C 38.979 44 42.258187 39.670734 42.617188 39.177734 C 43.128188 38.475734 43.128188 37.524266 42.617188 36.822266 C 42.258188 36.329266 38.979 32 34.5 32 z M 34.5 36 C 35.908 36 37.346078 37.048 38.330078 38 C 37.345078 38.953 35.908 40 34.5 40 C 33.092 40 31.655922 38.953 30.669922 38 C 31.655922 37.047 33.092 36 34.5 36 z"/></svg>'
 ]

-const SheepsEvents = (() => {
-    let initialized = false;
+const SheepsEvents = {
+    initialized: false,

-    return {
-        init: () => {
-            if (initialized) return;
+    init() {
+        if (this.initialized) return;

-            const sheepEditorForm = document.getElementById("sheep-editor");
-            const sheepEditorButton = document.getElementById('sheep-editor-button');
-            sheepEditorForm.addEventListener("submit", async (event) => {
-                event.preventDefault();
+        const sheepEditorForm = document.getElementById("sheep-editor");
+        const sheepEditorButton = document.getElementById('sheep-editor-button');
+        sheepEditorForm.addEventListener("submit", async (event) => {
+            event.preventDefault();

-                const form = event.target;
-                const formData = new FormData(form);
-                const uuidValue = form.elements["uuid"].value;
-                const sheep = Sheeps.sheeps_list.list.find(item => item.uuid === uuidValue);
+            const form = event.target;
+            const formData = new FormData(form);
+            const uuidValue = form.elements["uuid"].value;
+            const sheep = Sheeps.sheeps_list.list.find(item => item.uuid === uuidValue);

-                if (!sheep) {
-                    console.error("Sheep not found for uuid:", uuidValue);
-                    return;
-                }
+            if (!sheep) {
+                console.error("Sheep not found for uuid:", uuidValue);
+                return;
+            }

-                sheep.name = form.elements["name"].value;
-                sheep.group_id = Number(formData.get("group_id"));
-                sheep.appointment = formData.get("appointment");
-                sheep.mode = formData.get("mode");
-                sheep.mode_title = ["Користувач", "Модератор", "Адміністратор"][sheep.mode] || "Користувач";
+            sheep.name = form.elements["name"].value;
+            sheep.group_id = Number(formData.get("group_id"));
+            sheep.appointment = formData.get("appointment");
+            sheep.mode = formData.get("mode");
+            sheep.mode_title = ["Користувач", "Модератор", "Адміністратор"][sheep.mode] || "Користувач";

-                const permKeys = [
-                    "can_view_sheeps",
-                    "can_view_schedule",
-                    "can_view_stand",
-                    "can_view_territory",
-                    "can_add_sheeps",
-                    "can_add_territory",
-                    "can_manager_territory",
-                    "can_add_stand",
-                    "can_manager_stand",
-                    "can_add_schedule"
-                ];
-                for (const key of permKeys) {
-                    sheep.possibilities[key] = form.elements[key].checked;
-                }
+            const permKeys = [
+                "can_view_sheeps",
+                "can_view_schedule",
+                "can_view_stand",
+                "can_view_territory",
+                "can_add_sheeps",
+                "can_add_territory",
+                "can_manager_territory",
+                "can_add_stand",
+                "can_manager_stand",
+                "can_add_schedule"
+            ];
+            for (const key of permKeys) {
+                sheep.possibilities[key] = form.elements[key].checked;
+            }

-                sheepEditorButton.innerText = "Зачекайте...";
+            sheepEditorButton.innerText = "Зачекайте...";

-                try {
-                    const uuid = localStorage.getItem('uuid');
-                    const URL = `${CONFIG.api}sheep`;
-                    const response = await fetch(URL, {
-                        method: 'PUT',
-                        headers: {
-                            "Content-Type": "application/json",
-                            "Authorization": uuid
-                        },
-                        body: JSON.stringify(sheep)
-                    });
+            try {
+                const uuid = localStorage.getItem('uuid');
+                const URL = `${CONFIG.api}sheep`;
+                const response = await fetch(URL, {
+                    method: 'PUT',
+                    headers: {
+                        "Content-Type": "application/json",
+                        "Authorization": uuid
+                    },
+                    body: JSON.stringify(sheep)
+                });

-                    if (response.ok) {
-                        sheepEditorButton.innerText = "Успішно збережено";
-                        const data = await response.json();
-                        console.log(data);
+                if (response.ok) {
+                    sheepEditorButton.innerText = "Успішно збережено";
+                    const data = await response.json();
+                    console.log(data);

-                        Sheeps.sheeps_list.list = [];
-                        await Sheeps.sheeps_list.setHTML();
+                    Sheeps.sheeps_list.list = [];
+                    await Sheeps.sheeps_list.setHTML();

-                        setTimeout(() => {
-                            sheepEditorButton.innerText = "Зберегти";
-                        }, 3000);
-                    } else {
-                        console.error('Помилка збереження');
-                        sheepEditorButton.innerText = "Помилка збереження";
-                    }
-                } catch (err) {
-                    console.error(err);
+                    setTimeout(() => {
+                        sheepEditorButton.innerText = "Зберегти";
+                    }, 3000);
+                } else {
+                    console.error('Помилка збереження');
                    sheepEditorButton.innerText = "Помилка збереження";
                }
-            });
+            } catch (err) {
+                console.error(err);
+                sheepEditorButton.innerText = "Помилка збереження";
+            }
+        });

-            const sheepAddedsForm = document.getElementById("sheep-addeds");
-            const sheepAddedsButton = document.getElementById('sheep-addeds-button');
-            sheepAddedsForm.addEventListener("submit", async (event) => {
-                event.preventDefault();
+        const sheepAddedsForm = document.getElementById("sheep-addeds");
+        const sheepAddedsButton = document.getElementById('sheep-addeds-button');
+        sheepAddedsForm.addEventListener("submit", async (event) => {
+            event.preventDefault();

-                const form = event.target;
-                const formData = new FormData(form);
-                const data = Object.fromEntries(formData.entries());
+            const form = event.target;
+            const formData = new FormData(form);
+            const data = Object.fromEntries(formData.entries());

-                sheepAddedsButton.innerText = "Зачекайте...";
+            sheepAddedsButton.innerText = "Зачекайте...";

-                try {
-                    const uuid = localStorage.getItem('uuid');
-                    const URL = `${CONFIG.api}sheep`;
-                    const response = await fetch(URL, {
-                        method: 'POST',
-                        headers: {
-                            "Content-Type": "application/json",
-                            "Authorization": uuid
-                        },
-                        body: JSON.stringify(data)
-                    });
+            try {
+                const uuid = localStorage.getItem('uuid');
+                const URL = `${CONFIG.api}sheep`;
+                const response = await fetch(URL, {
+                    method: 'POST',
+                    headers: {
+                        "Content-Type": "application/json",
+                        "Authorization": uuid
+                    },
+                    body: JSON.stringify(data)
+                });

-                    if (response.ok) {
-                        sheepAddedsButton.innerText = "Вісника додано";
-                        const data = await response.json();
-                        console.log(data);
+                if (response.ok) {
+                    sheepAddedsButton.innerText = "Вісника додано";
+                    const data = await response.json();
+                    console.log(data);

-                        Sheeps.sheeps_list.list = [];
+                    Sheeps.sheeps_list.list = [];

-                        const randomNumber = Math.floor(Math.random() * Sheeps_icon.length);
+                    const randomNumber = Math.floor(Math.random() * Sheeps_icon.length);

-                        Sheeps.addeds.close();
-                        await Sheeps.editor.setHTML(data.uuid, randomNumber);
+                    Sheeps.addeds.close();
+                    await Sheeps.editor.setHTML(data.id, randomNumber);

-                        setTimeout(() => {
-                            sheepAddedsButton.innerText = "Додати";
-                        }, 3000);
-                    } else {
-                        console.error('Помилка додавання');
-                        sheepAddedsButton.innerText = "Помилка додавання";
-                    }
-                } catch (err) {
-                    console.error(err);
+                    setTimeout(() => {
+                        sheepAddedsButton.innerText = "Додати";
+                    }, 3000);
+                } else {
+                    console.error('Помилка додавання');
                    sheepAddedsButton.innerText = "Помилка додавання";
                }
-            });
+            } catch (err) {
+                console.error(err);
+                sheepAddedsButton.innerText = "Помилка додавання";
+            }
+        });

-            initialized = true;
-        }
+        this.initialized = true;
    }
-})();
+};

 const Sheeps = {
    init: async (id) => {
        let html = await fetch('/lib/pages/sheeps/index.html').then((response) => response.text());
        app.innerHTML = html;

-        Sheeps.sheeps_list.setHTML();
+        await Sheeps.sheeps_list.setHTML();
        if (id) Sheeps.editor.setHTML(id);

        SheepsEvents.init();
@@ -196,6 +194,8 @@ const Sheeps = {
                ? Sheeps.sheeps_list.list
                : await Sheeps.sheeps_list.loadAPI();

+            Sheeps.sheeps_list.list.sort((a, b) => a.group_id - b.group_id);
+
            let block_sheeps = document.getElementById('block-sheeps-list');

            let butt_add = USER.possibilities.can_add_sheeps ? `
@@ -245,7 +245,7 @@ const Sheeps = {
                if (search_value && !element.name.toLowerCase().includes(search_value)) {
                    continue; // пропустить, если имя не содержит строку поиска
                }
-                
+
                html += `
                <div class="card-profile" onclick="Sheeps.editor.setHTML('${element.id}')" name="sheep_${element.id}">
                  ${Sheeps_icon[element.group_id]}
@@ -386,11 +386,13 @@ const Sheeps = {
            sheep_editor_can_view_territory.checked = sheep.possibilities.can_view_territory;

            if (USER.possibilities.can_manager_territory) {
-                document.getElementById('editor-blocks-territory').style.display = "";
+                document.getElementById('editor-blocks-territory').style.display = "none";
+                document.getElementById(`editor-blocks-territory`).innerHTML = "<summary>Території вісника</summary>";
+                Sheeps.territory.house(id);
+                Sheeps.territory.homestead(id);
            }

            if (USER.mode == 2) {
-                document.getElementById('editor-blocks-territory').style.display = "";
                document.getElementById('sheep-editor-button').style.display = "";
                sheep_editor_mode.disabled = false;
            } else {
@@ -462,5 +464,69 @@ const Sheeps = {
            search_value = value?.trim()?.toLowerCase() || "";
            Sheeps.sheeps_list.setHTML(search_value);
        }
+    },
+    territory: {
+        async loadAPI(URL) {
+            const uuid = localStorage.getItem("uuid");
+            const res = await fetch(URL, {
+                headers: {
+                    "Content-Type": "application/json",
+                    "Authorization": uuid
+                }
+            });
+            return await res.json();
+        },
+
+        async house(id) {
+            const URL = `${CONFIG.api}house/list?mode=admin&sheep_id=${id}`;
+            const list = await Sheeps.territory.loadAPI(URL);
+
+            if ((USER.possibilities.can_view_territory || USER.mode == 2) && list.length > 0){
+                document.getElementById('editor-blocks-territory').style.display = "";
+                Sheeps.territory.renderCards(list, "house");
+            }
+        },
+
+        async homestead(id) {
+            const URL = `${CONFIG.api}homestead/list?mode=admin&sheep_id=${id}`;
+            const list = await Sheeps.territory.loadAPI(URL);
+
+            if ((USER.possibilities.can_view_territory || USER.mode == 2) && list.length > 0){
+                document.getElementById('editor-blocks-territory').style.display = "";
+                Sheeps.territory.renderCards(list, "homestead");
+            }
+        },
+
+        renderCards: (list, type) => {
+            const container = document.getElementById(`editor-blocks-territory`);
+            const fragment = document.createDocumentFragment();
+
+            for (const el of list) {
+                const card = document.createElement("div");
+                card.innerHTML = `
+                    <div id="title">
+                        <h1>${el.title} ${el.number}</h1>
+
+                        <a href="/territory/manager/${type}/${el.id}" title="Редактор квартир" data-route>
+                            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
+                                <path d="M24 2H14c-.55 0-1 .45-1 1v4l3.6 2.7c.25.19.4.49.4.8V14h8V3C25 2.45 24.55 2 24 2zM15.5 7C15.22 7 15 6.78 15 6.5v-2C15 4.22 15.22 4 15.5 4h2C17.78 4 18 4.22 18 4.5v2C18 6.78 17.78 7 17.5 7h-1.17H15.5zM23 4.5v2C23 6.78 22.78 7 22.5 7h-2C20.22 7 20 6.78 20 6.5v-2C20 4.22 20.22 4 20.5 4h2C22.78 4 23 4.22 23 4.5zM22.5 12h-2c-.28 0-.5-.22-.5-.5v-2C20 9.22 20.22 9 20.5 9h2C22.78 9 23 9.22 23 9.5v2C23 11.78 22.78 12 22.5 12zM1 11.51V27c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V11.51c0-.32-.16-.62-.42-.81l-6-4.28C8.41 6.29 8.2 6.23 8 6.23S7.59 6.29 7.42 6.42l-6 4.28C1.16 10.89 1 11.19 1 11.51zM6.5 20h-2C4.22 20 4 19.78 4 19.5v-2C4 17.22 4.22 17 4.5 17h2C6.78 17 7 17.22 7 17.5v2C7 19.78 6.78 20 6.5 20zM7 22.5v2C7 24.78 6.78 25 6.5 25h-2C4.22 25 4 24.78 4 24.5v-2C4 22.22 4.22 22 4.5 22h2C6.78 22 7 22.22 7 22.5zM6.5 15h-2C4.22 15 4 14.78 4 14.5v-2C4 12.22 4.22 12 4.5 12h2C6.78 12 7 12.22 7 12.5v2C7 14.78 6.78 15 6.5 15zM9.5 17h2c.28 0 .5.22.5.5v2c0 .28-.22.5-.5.5h-2C9.22 20 9 19.78 9 19.5v-2C9 17.22 9.22 17 9.5 17zM9 14.5v-2C9 12.22 9.22 12 9.5 12h2c.28 0 .5.22.5.5v2c0 .28-.22.5-.5.5h-2C9.22 15 9 14.78 9 14.5zM9.5 22h2c.28 0 .5.22.5.5v2c0 .28-.22.5-.5.5h-2C9.22 25 9 24.78 9 24.5v-2C9 22.22 9.22 22 9.5 22zM17 17v10c0 .55.45 1 1 1h10c.55 0 1-.45 1-1V17c0-.55-.45-1-1-1H18C17.45 16 17 16.45 17 17zM19.5 18h2c.28 0 .5.22.5.5v2c0 .28-.22.5-.5.5h-2c-.28 0-.5-.22-.5-.5v-2C19 18.22 19.22 18 19.5 18zM27 18.5v2c0 .28-.22.5-.5.5h-2c-.28 0-.5-.22-.5-.5v-2c0-.28.22-.5.5-.5h2C26.78 18 27 18.22 27 18.5zM26.5 26h-2c-.28 0-.5-.22-.5-.5v-2c0-.28.22-.5.5-.5h2c.28 0 .5.22.5.5v2C27 25.78 26.78 26 26.5 26zM19.5 23h2c.28 0 .5.22.5.5v2c0 .28-.22.5-.5.5h-2c-.28 0-.5-.22-.5-.5v-2C19 23.22 19.22 23 19.5 23z"></path>
+                            </svg>
+                        </a>
+                    </div>
+                    <!--
+                    <div>
+                        <h1>Територія видана:</h1>
+                        <h2>02.07.2025</h2>
+                    </div>
+                    <div>
+                        <h1>Варто забрати:</h1>
+                        <h2>01.11.2025</h2>
+                    </div> -->
+            `;
+                fragment.appendChild(card);
+            }
+
+            container.appendChild(fragment);
+        }
    }
 }
--- a/web/lib/pages/sheeps/style.css
+++ b/web/lib/pages/sheeps/style.css
@@ -552,17 +552,17 @@
    align-items: flex-start;
    margin: 10px;
    padding: 10px;
-    min-height: 100px;
+    min-height: 30px;
    justify-content: center;
    position: relative;
-        border-radius: calc(var(--border-radius) - 5px - 6px);
+    border-radius: calc(var(--border-radius) - 5px - 6px);
 }

 #editor-blocks-territory>div>#title {
    display: flex;
    align-items: center;
    height: 30px;
-    margin-bottom: 10px;
+    /* margin-bottom: 10px; */
    justify-content: space-between;
 }

@@ -595,14 +595,14 @@
 }

 #editor-blocks-territory>div>#title>a>svg {
-    width: 25px;
-    height: 25px;
+    width: 20px;
+    height: 20px;
    fill: var(--PrimaryColorText);
 }

 #editor-blocks-territory>div>div {
    display: flex;
-    margin-bottom: 10px;
+    /* margin-bottom: 10px; */
    flex-direction: row;
    align-items: center;
    width: 100%;