rozenrod/Sheep-Service
1
0
Fork 0
Code Issues 20 Pull Requests Actions Packages Projects 5 Releases Wiki Activity

Додан пошук територій за назвою вулиці

Browse Source
This commit is contained in:
Rozenrod
2026-05-30 19:47:21 +03:00
parent 3a5447d521
commit 49b559f03e
12 changed files with 273 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cron/cron.js
View File

@@ -11,7 +11,7 @@ cron.schedule("30 22 * * *", () => {
});
// 2. Перевірка стендів без графіку щосуботи о 18:00
cron.schedule("0 18 * * 6", async () => {
cron.schedule("0 8 * * 6", async () => {
console.log(`[${new Date().toLocaleString()}] Запуск перевірки стендів без графіку...`);
try {
await Stand.check_add();

23
cron/tasks/stands.js
View File

@@ -33,7 +33,8 @@ class Stands {
return;
}
const dateNow = Date.now();
const ONE_DAY = 24 * 60 * 60 * 1000;
const dateNow = Date.now() + 7 * ONE_DAY;
const sqlSchedule = `
SELECT 1
@@ -75,24 +76,28 @@ class Stands {
async check_entries() {
try {
const today = new Date();
today.setHours(0, 0, 0, 0);
// 1. Отримуємо вісників і одразу робимо Map для швидкого пошуку
const sheeps = await dbAll(`SELECT id, name FROM sheeps`);
if (!sheeps.length) return console.log('There are no sheeps');
const sheepMap = new Map(sheeps.map(s => [s.id, s.name]));
const startTomorrow = today.getTime() + 86400000;
const startDayAfterTomorrow = today.getTime() + 86400000 * 2;
// 2. Отримуємо всі записи на завтра
const now = new Date();
const tomorrow = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1);
const startTomorrow = tomorrow.getTime();
const dayAfterTomorrow = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 2);
const startDayAfterTomorrow = dayAfterTomorrow.getTime();
const sqlStands = `
SELECT
stand_schedule.*,
(SELECT stand_list.title FROM stand_list WHERE stand_list.id = stand_schedule.stand_id) AS title
stand_list.title
FROM
stand_schedule
LEFT JOIN
stand_list ON stand_schedule.stand_id = stand_list.id
WHERE
stand_schedule.date >= ? AND stand_schedule.date < ?
ORDER BY
@@ -102,7 +107,7 @@ class Stands {
const schedule = await dbAll(sqlStands, [startTomorrow, startDayAfterTomorrow]);
if (!schedule.length) return console.log('No active schedule');
// 2. Угруповання даних (Transform)
// 3. Угруповання даних (Transform)
const standsData = schedule.reduce((acc, item) => {
if (!acc[item.stand_id]) {
acc[item.stand_id] = { id: item.stand_id, title: item.title || `Стенд ${sId}`, hours: {}, maxSheepIdx: 0, date: item.date };
@@ -115,7 +120,7 @@ class Stands {
return acc;
}, {});
// 3. Генерація
// 4. Генерація
for (const standId in standsData) {
const data = standsData[standId];
const title = data.title;

2
web/index.html
View File

@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<html lang="uk">
<head>
<meta charset="UTF-8" />
<!-- <meta name="viewport" content="width=device-width, initial-scale=1.0" /> -->

2
web/lib/pages/sheeps/script.js
View File

@@ -243,7 +243,7 @@ const Sheeps = {
for (const element of list) {
if (search_value && !element.name.toLowerCase().includes(search_value)) {
continue; // пропустить, если имя не содержит строку поиска
continue; // пропустити, якщо ім'я не містить рядок пошуку
}
html += `

4
web/lib/pages/territory/card/script.js
View File

@@ -507,7 +507,7 @@ const Territory_card = {
joint: {
async setHTML(homestead_id){
let lest = await this.getJoint(homestead_id);
let list = await this.getJoint(homestead_id);
let block_info = document.getElementById('page-card-info');
@@ -516,7 +516,7 @@ const Territory_card = {
<h2>Надати спільний доступ:</h2>
<smart-select type="number" id="joint-${homestead_id}" onchange="Territory_card.getHomestead.joint.setJoint('${homestead_id}')" max="30" placeholder="Оберіть вісників..." title="Оберіть вісників, з якими хочете поділитись територією">
${Sheeps.sheeps_list.list.map(p => {
const isSelected = lest.some(item => item.sheep_id === p.id);
const isSelected = list.some(item => item.sheep_id === p.id);
if(USER.id === Number(p.id) && USER.mode != 2) return
return `<div
slot="option"

71
web/lib/pages/territory/list/index.html
View File

@@ -4,12 +4,10 @@
href="/territory/constructor"
data-route
id="constructorButton"
style="display: none"
>
style="display: none">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
<path
d="M 14.5 4 C 12.015 4 10 6.015 10 8.5 L 10 39.5 C 10 41.985 12.015 44 14.5 44 L 22.042969 44 C 22.079969 43.749 22.138516 43.502672 22.228516 43.263672 L 22.283203 43.285156 C 22.353203 42.961156 23.236422 40.161109 23.982422 37.787109 C 24.272422 36.865109 24.779891 36.029703 25.462891 35.345703 L 33.904297 27 L 27.5 27 C 26.672 27 26 26.328 26 25.5 L 26 16 L 38 16 L 38 23.054688 C 38.72 22.587688 39.4975 22.254422 40.3125 22.107422 C 40.5365 22.067422 40.769 22.062922 41 22.044922 L 41 14.5 C 41 13.672 40.328 13 39.5 13 L 34 13 L 34 8.5 C 34 6.015 31.985 4 29.5 4 L 14.5 4 z M 30.5 18 A 1.50015 1.50015 0 1 0 30.5 21 L 33.5 21 A 1.50015 1.50015 0 1 0 33.5 18 L 30.5 18 z M 41.498047 24 C 41.224047 24.001 40.946969 24.025172 40.667969 24.076172 C 39.783969 24.235172 38.939563 24.696156 38.226562 25.410156 L 26.427734 37.208984 C 26.070734 37.565984 25.807969 38.011141 25.667969 38.494141 L 24.097656 43.974609 C 24.025656 44.164609 23.993 44.365406 24 44.566406 C 24.013 44.929406 24.155594 45.288406 24.433594 45.566406 C 24.710594 45.843406 25.067688 45.986 25.429688 46 C 25.630688 46.007 25.834391 45.975344 26.025391 45.902344 L 31.505859 44.332031 C 31.988859 44.192031 32.431062 43.930266 32.789062 43.572266 L 44.589844 31.773438 C 45.303844 31.060437 45.764828 30.216031 45.923828 29.332031 C 45.973828 29.053031 45.997047 28.775953 45.998047 28.501953 C 46.001047 27.307953 45.540687 26.179312 44.679688 25.320312 C 43.820687 24.460313 42.692047 23.998 41.498047 24 z M 22 35 C 22.828 35 23.5 35.672 23.5 36.5 C 23.5 37.328 22.828 38 22 38 C 21.172 38 20.5 37.328 20.5 36.5 C 20.5 35.672 21.172 35 22 35 z"
/>
d="M 14.5 4 C 12.015 4 10 6.015 10 8.5 L 10 39.5 C 10 41.985 12.015 44 14.5 44 L 22.042969 44 C 22.079969 43.749 22.138516 43.502672 22.228516 43.263672 L 22.283203 43.285156 C 22.353203 42.961156 23.236422 40.161109 23.982422 37.787109 C 24.272422 36.865109 24.779891 36.029703 25.462891 35.345703 L 33.904297 27 L 27.5 27 C 26.672 27 26 26.328 26 25.5 L 26 16 L 38 16 L 38 23.054688 C 38.72 22.587688 39.4975 22.254422 40.3125 22.107422 C 40.5365 22.067422 40.769 22.062922 41 22.044922 L 41 14.5 C 41 13.672 40.328 13 39.5 13 L 34 13 L 34 8.5 C 34 6.015 31.985 4 29.5 4 L 14.5 4 z M 30.5 18 A 1.50015 1.50015 0 1 0 30.5 21 L 33.5 21 A 1.50015 1.50015 0 1 0 33.5 18 L 30.5 18 z M 41.498047 24 C 41.224047 24.001 40.946969 24.025172 40.667969 24.076172 C 39.783969 24.235172 38.939563 24.696156 38.226562 25.410156 L 26.427734 37.208984 C 26.070734 37.565984 25.807969 38.011141 25.667969 38.494141 L 24.097656 43.974609 C 24.025656 44.164609 23.993 44.365406 24 44.566406 C 24.013 44.929406 24.155594 45.288406 24.433594 45.566406 C 24.710594 45.843406 25.067688 45.986 25.429688 46 C 25.630688 46.007 25.834391 45.975344 26.025391 45.902344 L 31.505859 44.332031 C 31.988859 44.192031 32.431062 43.930266 32.789062 43.572266 L 44.589844 31.773438 C 45.303844 31.060437 45.764828 30.216031 45.923828 29.332031 C 45.973828 29.053031 45.997047 28.775953 45.998047 28.501953 C 46.001047 27.307953 45.540687 26.179312 44.679688 25.320312 C 43.820687 24.460313 42.692047 23.998 41.498047 24 z M 22 35 C 22.828 35 23.5 35.672 23.5 36.5 C 23.5 37.328 22.828 38 22 38 C 21.172 38 20.5 37.328 20.5 36.5 C 20.5 35.672 21.172 35 22 35 z" />
</svg>
<span>Конструктор</span>
</a>
@@ -17,8 +15,7 @@
<button onclick="Territory_list.report()">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
<path
d="M13.13,2H5.958c-1.1,0-2,0.9-2,2v16c0,1.1,0.9,2,2,2h12c1.1,0,2-0.9,2-2V8.828c0-0.53-0.211-1.039-0.586-1.414l-4.828-4.828 C14.169,2.211,13.66,2,13.13,2z M11.255,17.711l-1.297-1.297l-1.251,1.293c-0.39,0.39-1.024,0.39-1.414,0l0,0 c-0.39-0.39-0.39-1.024,0-1.414l1.958-1.989c0.39-0.396,1.027-0.398,1.42-0.006l1.287,1.287l2.335-2.293 c0.39-0.39,1.024-0.39,1.414,0l0,0c0.39,0.39,0.39,1.024,0,1.414l-3.042,3.008C12.274,18.102,11.644,18.1,11.255,17.711z M12.958,9 V3.5l5.5,5.5H12.958z"
/>
d="M13.13,2H5.958c-1.1,0-2,0.9-2,2v16c0,1.1,0.9,2,2,2h12c1.1,0,2-0.9,2-2V8.828c0-0.53-0.211-1.039-0.586-1.414l-4.828-4.828 C14.169,2.211,13.66,2,13.13,2z M11.255,17.711l-1.297-1.297l-1.251,1.293c-0.39,0.39-1.024,0.39-1.414,0l0,0 c-0.39-0.39-0.39-1.024,0-1.414l1.958-1.989c0.39-0.396,1.027-0.398,1.42-0.006l1.287,1.287l2.335-2.293 c0.39-0.39,1.024-0.39,1.414,0l0,0c0.39,0.39,0.39,1.024,0,1.414l-3.042,3.008C12.274,18.102,11.644,18.1,11.255,17.711z M12.958,9 V3.5l5.5,5.5H12.958z" />
</svg>
<span>Звіт опрацьовання</span>
</button>
@@ -27,12 +24,10 @@
href="/territory/history"
data-route
id="historyButton"
style="display: none"
>
style="display: none">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
<path
d="M 8.5 4 A 1.50015 1.50015 0 0 0 7.0761719 5.9746094 L 9.0761719 11.974609 A 1.50015 1.50015 0 0 0 10.5 13 L 13.025391 13 C 13.01166 13.081566 13 13.164544 13 13.25 C 13 17.87 15.519516 21.898375 19.228516 23.984375 C 15.518516 26.028375 13 29.974 13 34.5 C 13 34.676122 13.036016 34.84296 13.091797 35 L 10.5 35 A 1.50015 1.50015 0 0 0 9.0761719 36.025391 L 7.0761719 42.025391 A 1.50015 1.50015 0 0 0 8.5 44 L 41.5 44 A 1.50015 1.50015 0 0 0 42.923828 42.025391 L 40.923828 36.025391 A 1.50015 1.50015 0 0 0 39.5 35 L 36.908203 35 C 36.963984 34.84296 37 34.676122 37 34.5 C 37 29.974 34.480484 26.028375 30.771484 23.984375 C 34.480484 21.898375 37 17.87 37 13.25 C 37 13.164544 36.98834 13.081566 36.974609 13 L 39.5 13 A 1.50015 1.50015 0 0 0 40.923828 11.974609 L 42.923828 5.9746094 A 1.50015 1.50015 0 0 0 41.5 4 L 8.5 4 z M 15.974609 13 L 34.025391 13 C 34.01166 13.081566 34 13.164544 34 13.25 C 34 18.003 30.493 21.926453 26 22.439453 L 26 25.558594 C 30.493 26.058594 34 29.876 34 34.5 C 34 34.676122 34.036016 34.84296 34.091797 35 L 15.908203 35 C 15.963984 34.84296 16 34.676122 16 34.5 C 16 29.875 19.507 26.057594 24 25.558594 L 24 22.439453 C 19.507 21.926453 16 18.002 16 13.25 C 16 13.164544 15.98834 13.081566 15.974609 13 z M 28.554688 18 C 26.811688 18 23.189312 17.999859 21.445312 18.005859 C 21.284312 18.005859 21.140937 18.107766 21.085938 18.259766 C 21.030938 18.411766 21.075219 18.580594 21.199219 18.683594 C 22.240219 19.507594 23.563 20 25 20 C 26.437 20 27.757688 19.507453 28.804688 18.689453 C 28.930688 18.584453 28.977875 18.412813 28.921875 18.257812 C 28.865875 18.102813 28.718688 18 28.554688 18 z M 25 28 C 22.215 28 19.866719 29.847234 19.136719 32.365234 C 19.097719 32.517234 19.129562 32.680687 19.226562 32.804688 C 19.322563 32.928687 19.471906 33 19.628906 33 C 21.700906 33 28.298094 32.999234 30.371094 32.990234 C 30.525094 32.990234 30.670625 32.920828 30.765625 32.798828 C 30.860625 32.676828 30.893469 32.517187 30.855469 32.367188 C 30.133469 29.848187 27.784 28 25 28 z"
/>
d="M 8.5 4 A 1.50015 1.50015 0 0 0 7.0761719 5.9746094 L 9.0761719 11.974609 A 1.50015 1.50015 0 0 0 10.5 13 L 13.025391 13 C 13.01166 13.081566 13 13.164544 13 13.25 C 13 17.87 15.519516 21.898375 19.228516 23.984375 C 15.518516 26.028375 13 29.974 13 34.5 C 13 34.676122 13.036016 34.84296 13.091797 35 L 10.5 35 A 1.50015 1.50015 0 0 0 9.0761719 36.025391 L 7.0761719 42.025391 A 1.50015 1.50015 0 0 0 8.5 44 L 41.5 44 A 1.50015 1.50015 0 0 0 42.923828 42.025391 L 40.923828 36.025391 A 1.50015 1.50015 0 0 0 39.5 35 L 36.908203 35 C 36.963984 34.84296 37 34.676122 37 34.5 C 37 29.974 34.480484 26.028375 30.771484 23.984375 C 34.480484 21.898375 37 17.87 37 13.25 C 37 13.164544 36.98834 13.081566 36.974609 13 L 39.5 13 A 1.50015 1.50015 0 0 0 40.923828 11.974609 L 42.923828 5.9746094 A 1.50015 1.50015 0 0 0 41.5 4 L 8.5 4 z M 15.974609 13 L 34.025391 13 C 34.01166 13.081566 34 13.164544 34 13.25 C 34 18.003 30.493 21.926453 26 22.439453 L 26 25.558594 C 30.493 26.058594 34 29.876 34 34.5 C 34 34.676122 34.036016 34.84296 34.091797 35 L 15.908203 35 C 15.963984 34.84296 16 34.676122 16 34.5 C 16 29.875 19.507 26.057594 24 25.558594 L 24 22.439453 C 19.507 21.926453 16 18.002 16 13.25 C 16 13.164544 15.98834 13.081566 15.974609 13 z M 28.554688 18 C 26.811688 18 23.189312 17.999859 21.445312 18.005859 C 21.284312 18.005859 21.140937 18.107766 21.085938 18.259766 C 21.030938 18.411766 21.075219 18.580594 21.199219 18.683594 C 22.240219 19.507594 23.563 20 25 20 C 26.437 20 27.757688 19.507453 28.804688 18.689453 C 28.930688 18.584453 28.977875 18.412813 28.921875 18.257812 C 28.865875 18.102813 28.718688 18 28.554688 18 z M 25 28 C 22.215 28 19.866719 29.847234 19.136719 32.365234 C 19.097719 32.517234 19.129562 32.680687 19.226562 32.804688 C 19.322563 32.928687 19.471906 33 19.628906 33 C 21.700906 33 28.298094 32.999234 30.371094 32.990234 C 30.525094 32.990234 30.670625 32.920828 30.765625 32.798828 C 30.860625 32.676828 30.893469 32.517187 30.855469 32.367188 C 30.133469 29.848187 27.784 28 25 28 z" />
</svg>
<span>Історія служіння</span>
</a>
@@ -40,8 +35,7 @@
<a href="/territory/map" data-route id="mapButton">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
<path
d="M 18 0 C 15.791 0 14 1.791 14 4 C 14 6.062 16.082187 8.7932969 17.242188 10.154297 C 17.641188 10.622297 18.358812 10.622297 18.757812 10.154297 C 19.916813 8.7932969 22 6.062 22 4 C 22 1.791 20.209 0 18 0 z M 18 2.5703125 C 18.789 2.5703125 19.429688 3.211 19.429688 4 C 19.429688 4.789 18.789 5.4296875 18 5.4296875 C 17.211 5.4296875 16.570312 4.789 16.570312 4 C 16.570312 3.211 17.211 2.5703125 18 2.5703125 z M 8.9726562 3.0644531 C 8.7399063 3.0713281 8.5085625 3.1195313 8.2890625 3.2070312 L 4.2578125 4.8203125 C 3.4988125 5.1243125 3 5.8597344 3 6.6777344 L 3 18.521484 C 3 19.936484 4.4281875 20.903906 5.7421875 20.378906 L 9.03125 19.064453 L 14.337891 20.832031 C 14.786891 20.982031 15.273891 20.967969 15.712891 20.792969 L 19.742188 19.179688 C 20.501188 18.876688 21 18.140266 21 17.322266 L 21 10.585938 C 20.308 11.465937 19.6965 12.122625 19.4375 12.390625 C 18.6515 13.204625 17.346547 13.204625 16.560547 12.390625 C 16.301547 12.122625 15.690047 11.465938 14.998047 10.585938 L 14.998047 17.541016 C 14.998047 18.222016 14.332547 18.703234 13.685547 18.490234 L 9.6855469 17.173828 C 9.2765469 17.037828 9 16.653656 9 16.222656 L 9 6.4550781 C 9 5.7750781 9.6645469 5.2948594 10.310547 5.5058594 L 12.427734 6.1972656 C 12.165734 5.4612656 12 4.718 12 4 C 12 3.982 12.003906 3.9652656 12.003906 3.9472656 L 9.6640625 3.1679688 C 9.4395625 3.0929687 9.2054062 3.0575781 8.9726562 3.0644531 z"
/>
d="M 18 0 C 15.791 0 14 1.791 14 4 C 14 6.062 16.082187 8.7932969 17.242188 10.154297 C 17.641188 10.622297 18.358812 10.622297 18.757812 10.154297 C 19.916813 8.7932969 22 6.062 22 4 C 22 1.791 20.209 0 18 0 z M 18 2.5703125 C 18.789 2.5703125 19.429688 3.211 19.429688 4 C 19.429688 4.789 18.789 5.4296875 18 5.4296875 C 17.211 5.4296875 16.570312 4.789 16.570312 4 C 16.570312 3.211 17.211 2.5703125 18 2.5703125 z M 8.9726562 3.0644531 C 8.7399063 3.0713281 8.5085625 3.1195313 8.2890625 3.2070312 L 4.2578125 4.8203125 C 3.4988125 5.1243125 3 5.8597344 3 6.6777344 L 3 18.521484 C 3 19.936484 4.4281875 20.903906 5.7421875 20.378906 L 9.03125 19.064453 L 14.337891 20.832031 C 14.786891 20.982031 15.273891 20.967969 15.712891 20.792969 L 19.742188 19.179688 C 20.501188 18.876688 21 18.140266 21 17.322266 L 21 10.585938 C 20.308 11.465937 19.6965 12.122625 19.4375 12.390625 C 18.6515 13.204625 17.346547 13.204625 16.560547 12.390625 C 16.301547 12.122625 15.690047 11.465938 14.998047 10.585938 L 14.998047 17.541016 C 14.998047 18.222016 14.332547 18.703234 13.685547 18.490234 L 9.6855469 17.173828 C 9.2765469 17.037828 9 16.653656 9 16.222656 L 9 6.4550781 C 9 5.7750781 9.6645469 5.2948594 10.310547 5.5058594 L 12.427734 6.1972656 C 12.165734 5.4612656 12 4.718 12 4 C 12 3.982 12.003906 3.9652656 12.003906 3.9472656 L 9.6640625 3.1679688 C 9.4395625 3.0929687 9.2054062 3.0575781 8.9726562 3.0644531 z" />
</svg>
<span>Карта території</span>
</a>
@@ -52,42 +46,35 @@
<button
id="sort_1"
onclick="Territory_list.sort('2')"
data-state="active"
>
data-state="active">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
<path
d="M 32.476562 5.9785156 A 1.50015 1.50015 0 0 0 31 7.5 L 31 37.878906 L 26.560547 33.439453 A 1.50015 1.50015 0 1 0 24.439453 35.560547 L 31.439453 42.560547 A 1.50015 1.50015 0 0 0 33.560547 42.560547 L 40.560547 35.560547 A 1.50015 1.50015 0 1 0 38.439453 33.439453 L 34 37.878906 L 34 7.5 A 1.50015 1.50015 0 0 0 32.476562 5.9785156 z M 14.375 8.0058594 C 14.257547 8.01575 14.139641 8.0379219 14.025391 8.0761719 L 11.025391 9.0761719 C 10.239391 9.3381719 9.8141719 10.188609 10.076172 10.974609 C 10.338172 11.760609 11.190609 12.188828 11.974609 11.923828 L 13 11.580078 L 13 20.5 C 13 21.329 13.671 22 14.5 22 C 15.329 22 16 21.329 16 20.5 L 16 9.5 C 16 9.018 15.767953 8.5652031 15.376953 8.2832031 C 15.082953 8.0717031 14.727359 7.9761875 14.375 8.0058594 z M 14 27 C 11.344 27 9.387625 28.682109 9.015625 31.287109 C 8.898625 32.107109 9.4671094 32.867375 10.287109 32.984375 C 11.106109 33.102375 11.867375 32.533891 11.984375 31.712891 C 12.096375 30.931891 12.537 30 14 30 C 15.103 30 16 30.897 16 32 C 16 33.103 15.103 34 14 34 C 11.592 34 9 35.721 9 39.5 C 9 40.329 9.672 41 10.5 41 L 17.5 41 C 18.329 41 19 40.329 19 39.5 C 19 38.671 18.329 38 17.5 38 L 12.308594 38 C 12.781594 37.093 13.664 37 14 37 C 16.757 37 19 34.757 19 32 C 19 29.243 16.757 27 14 27 z"
></path>
d="M 32.476562 5.9785156 A 1.50015 1.50015 0 0 0 31 7.5 L 31 37.878906 L 26.560547 33.439453 A 1.50015 1.50015 0 1 0 24.439453 35.560547 L 31.439453 42.560547 A 1.50015 1.50015 0 0 0 33.560547 42.560547 L 40.560547 35.560547 A 1.50015 1.50015 0 1 0 38.439453 33.439453 L 34 37.878906 L 34 7.5 A 1.50015 1.50015 0 0 0 32.476562 5.9785156 z M 14.375 8.0058594 C 14.257547 8.01575 14.139641 8.0379219 14.025391 8.0761719 L 11.025391 9.0761719 C 10.239391 9.3381719 9.8141719 10.188609 10.076172 10.974609 C 10.338172 11.760609 11.190609 12.188828 11.974609 11.923828 L 13 11.580078 L 13 20.5 C 13 21.329 13.671 22 14.5 22 C 15.329 22 16 21.329 16 20.5 L 16 9.5 C 16 9.018 15.767953 8.5652031 15.376953 8.2832031 C 15.082953 8.0717031 14.727359 7.9761875 14.375 8.0058594 z M 14 27 C 11.344 27 9.387625 28.682109 9.015625 31.287109 C 8.898625 32.107109 9.4671094 32.867375 10.287109 32.984375 C 11.106109 33.102375 11.867375 32.533891 11.984375 31.712891 C 12.096375 30.931891 12.537 30 14 30 C 15.103 30 16 30.897 16 32 C 16 33.103 15.103 34 14 34 C 11.592 34 9 35.721 9 39.5 C 9 40.329 9.672 41 10.5 41 L 17.5 41 C 18.329 41 19 40.329 19 39.5 C 19 38.671 18.329 38 17.5 38 L 12.308594 38 C 12.781594 37.093 13.664 37 14 37 C 16.757 37 19 34.757 19 32 C 19 29.243 16.757 27 14 27 z"></path>
</svg>
</button>
<button id="sort_2" onclick="Territory_list.sort('3')" data-state="">
<button id="sort_2" onclick="Territory_list.sort('3')" data-state>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
<path
d="M 31.478516 6 A 1.50015 1.50015 0 0 0 30.439453 6.4394531 L 23.439453 13.439453 A 1.50015 1.50015 0 1 0 25.560547 15.560547 L 30 11.121094 L 30 41.5 A 1.50015 1.50015 0 1 0 33 41.5 L 33 11.121094 L 37.439453 15.560547 A 1.50015 1.50015 0 1 0 39.560547 13.439453 L 32.560547 6.4394531 A 1.50015 1.50015 0 0 0 31.478516 6 z M 13.375 8.0058594 C 13.257547 8.01575 13.139641 8.0379219 13.025391 8.0761719 L 10.025391 9.0761719 C 9.2393906 9.3381719 8.8141719 10.188609 9.0761719 10.974609 C 9.3381719 11.760609 10.190609 12.188828 10.974609 11.923828 L 12 11.580078 L 12 20.5 C 12 21.329 12.671 22 13.5 22 C 14.329 22 15 21.329 15 20.5 L 15 9.5 C 15 9.018 14.767953 8.5652031 14.376953 8.2832031 C 14.082953 8.0717031 13.727359 7.9761875 13.375 8.0058594 z M 13 27 C 10.344 27 8.387625 28.682109 8.015625 31.287109 C 7.898625 32.107109 8.4671094 32.867375 9.2871094 32.984375 C 10.106109 33.102375 10.867375 32.533891 10.984375 31.712891 C 11.096375 30.931891 11.537 30 13 30 C 14.103 30 15 30.897 15 32 C 15 33.103 14.103 34 13 34 C 10.592 34 8 35.721 8 39.5 C 8 40.329 8.672 41 9.5 41 L 16.5 41 C 17.329 41 18 40.329 18 39.5 C 18 38.671 17.329 38 16.5 38 L 11.308594 38 C 11.781594 37.093 12.664 37 13 37 C 15.757 37 18 34.757 18 32 C 18 29.243 15.757 27 13 27 z"
></path>
d="M 31.478516 6 A 1.50015 1.50015 0 0 0 30.439453 6.4394531 L 23.439453 13.439453 A 1.50015 1.50015 0 1 0 25.560547 15.560547 L 30 11.121094 L 30 41.5 A 1.50015 1.50015 0 1 0 33 41.5 L 33 11.121094 L 37.439453 15.560547 A 1.50015 1.50015 0 1 0 39.560547 13.439453 L 32.560547 6.4394531 A 1.50015 1.50015 0 0 0 31.478516 6 z M 13.375 8.0058594 C 13.257547 8.01575 13.139641 8.0379219 13.025391 8.0761719 L 10.025391 9.0761719 C 9.2393906 9.3381719 8.8141719 10.188609 9.0761719 10.974609 C 9.3381719 11.760609 10.190609 12.188828 10.974609 11.923828 L 12 11.580078 L 12 20.5 C 12 21.329 12.671 22 13.5 22 C 14.329 22 15 21.329 15 20.5 L 15 9.5 C 15 9.018 14.767953 8.5652031 14.376953 8.2832031 C 14.082953 8.0717031 13.727359 7.9761875 13.375 8.0058594 z M 13 27 C 10.344 27 8.387625 28.682109 8.015625 31.287109 C 7.898625 32.107109 8.4671094 32.867375 9.2871094 32.984375 C 10.106109 33.102375 10.867375 32.533891 10.984375 31.712891 C 11.096375 30.931891 11.537 30 13 30 C 14.103 30 15 30.897 15 32 C 15 33.103 14.103 34 13 34 C 10.592 34 8 35.721 8 39.5 C 8 40.329 8.672 41 9.5 41 L 16.5 41 C 17.329 41 18 40.329 18 39.5 C 18 38.671 17.329 38 16.5 38 L 11.308594 38 C 11.781594 37.093 12.664 37 13 37 C 15.757 37 18 34.757 18 32 C 18 29.243 15.757 27 13 27 z"></path>
</svg>
</button>
<button id="sort_3" onclick="Territory_list.sort('4')" data-state="">
<button id="sort_3" onclick="Territory_list.sort('4')" data-state>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
<path
transform="rotate(180 32.5 24.5106)"
id="svg_1"
d="m32.47852,6a1.50015,1.50015 0 0 0 -1.03907,0.43945l-7,7a1.50015,1.50015 0 1 0 2.1211,2.1211l4.43945,-4.43946l0,30.37891a1.50015,1.50015 0 1 0 3,0l0,-30.37891l4.43945,4.43946a1.50015,1.50015 0 1 0 2.1211,-2.1211l-7,-7a1.50015,1.50015 0 0 0 -1.08203,-0.43945z"
></path>
d="m32.47852,6a1.50015,1.50015 0 0 0 -1.03907,0.43945l-7,7a1.50015,1.50015 0 1 0 2.1211,2.1211l4.43945,-4.43946l0,30.37891a1.50015,1.50015 0 1 0 3,0l0,-30.37891l4.43945,4.43946a1.50015,1.50015 0 1 0 2.1211,-2.1211l-7,-7a1.50015,1.50015 0 0 0 -1.08203,-0.43945z"></path>
<path
d="m16,6c-5.511,0 -10,4.489 -10,10c0,5.511 4.489,10 10,10c5.511,0 10,-4.489 10,-10c0,-5.511 -4.489,-10 -10,-10zm0,2c4.43012,0 8,3.56988 8,8c0,4.43012 -3.56988,8 -8,8c-4.43012,0 -8,-3.56988 -8,-8c0,-4.43012 3.56988,-8 8,-8zm-1,2l0,6.41406l4.29297,4.29297l1.41406,-1.41406l-3.70703,-3.70703l0,-5.58594l-2,0z"
></path>
d="m16,6c-5.511,0 -10,4.489 -10,10c0,5.511 4.489,10 10,10c5.511,0 10,-4.489 10,-10c0,-5.511 -4.489,-10 -10,-10zm0,2c4.43012,0 8,3.56988 8,8c0,4.43012 -3.56988,8 -8,8c-4.43012,0 -8,-3.56988 -8,-8c0,-4.43012 3.56988,-8 8,-8zm-1,2l0,6.41406l4.29297,4.29297l1.41406,-1.41406l-3.70703,-3.70703l0,-5.58594l-2,0z"></path>
</svg>
</button>
<button id="sort_4" onclick="Territory_list.sort('1')" data-state="">
<button id="sort_4" onclick="Territory_list.sort('1')" data-state>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
<path
id="svg_1"
d="m32.47852,6a1.50015,1.50015 0 0 0 -1.03907,0.43945l-7,7a1.50015,1.50015 0 1 0 2.1211,2.1211l4.43945,-4.43946l0,30.37891a1.50015,1.50015 0 1 0 3,0l0,-30.37891l4.43945,4.43946a1.50015,1.50015 0 1 0 2.1211,-2.1211l-7,-7a1.50015,1.50015 0 0 0 -1.08203,-0.43945z"
></path>
d="m32.47852,6a1.50015,1.50015 0 0 0 -1.03907,0.43945l-7,7a1.50015,1.50015 0 1 0 2.1211,2.1211l4.43945,-4.43946l0,30.37891a1.50015,1.50015 0 1 0 3,0l0,-30.37891l4.43945,4.43946a1.50015,1.50015 0 1 0 2.1211,-2.1211l-7,-7a1.50015,1.50015 0 0 0 -1.08203,-0.43945z"></path>
<path
d="m16,22.85262c-5.511,0 -10,4.489 -10,10c0,5.511 4.489,10 10,10c5.511,0 10,-4.489 10,-10c0,-5.511 -4.489,-10 -10,-10zm0,2c4.43012,0 8,3.56988 8,8c0,4.43012 -3.56988,8 -8,8c-4.43012,0 -8,-3.56988 -8,-8c0,-4.43012 3.56988,-8 8,-8zm-1,2l0,6.41406l4.29297,4.29297l1.41406,-1.41406l-3.70703,-3.70703l0,-5.58594l-2,0z"
></path>
d="m16,22.85262c-5.511,0 -10,4.489 -10,10c0,5.511 4.489,10 10,10c5.511,0 10,-4.489 10,-10c0,-5.511 -4.489,-10 -10,-10zm0,2c4.43012,0 8,3.56988 8,8c0,4.43012 -3.56988,8 -8,8c-4.43012,0 -8,-3.56988 -8,-8c0,-4.43012 3.56988,-8 8,-8zm-1,2l0,6.41406l4.29297,4.29297l1.41406,-1.41406l-3.70703,-3.70703l0,-5.58594l-2,0z"></path>
</svg>
</button>
</div>
@@ -95,12 +82,22 @@
<select
id="list-controls-filter-status"
name="status"
onchange="Territory_list.filter()"
>
onchange="Territory_list.filter()">
<option value="0" selected>Всі території</option>
<option value="1">Зайняті території</option>
<option value="2">Вільні території</option>
</select>
<button title="Пошук" onclick="Territory_list.search.open()" data-state>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 72 72"><path
d="M 31 11 C 19.973 11 11 19.973 11 31 C 11 42.027 19.973 51 31 51 C 34.974166 51 38.672385 49.821569 41.789062 47.814453 L 54.726562 60.751953 C 56.390563 62.415953 59.088953 62.415953 60.751953 60.751953 C 62.415953 59.087953 62.415953 56.390563 60.751953 54.726562 L 47.814453 41.789062 C 49.821569 38.672385 51 34.974166 51 31 C 51 19.973 42.027 11 31 11 z M 31 19 C 37.616 19 43 24.384 43 31 C 43 37.616 37.616 43 31 43 C 24.384 43 19 37.616 19 31 C 19 24.384 24.384 19 31 19 z"></path></svg>
</button>
<div class="search" id="page-territory-search"
data-state="closed">
<input type="text" placeholder="Назва вулиці"
onchange="Territory_list.search.input(this.value)">
</div>
</div>
<details open>
@@ -110,24 +107,20 @@
<button
id="territory_entrances_true"
onclick="Territory_list.house.territoryType('true')"
data-state=""
>
data-state>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
<path
d="M 14.5 4 C 11.480226 4 9 6.4802259 9 9.5 L 9 41.5 C 9 42.863594 10.136406 44 11.5 44 L 19.5 44 C 20.863594 44 22 42.863594 22 41.5 L 22 37.5 C 22 37.204955 22.204955 37 22.5 37 L 25.5 37 C 25.795045 37 26 37.204955 26 37.5 L 26 41.5 C 26 42.863594 27.136406 44 28.5 44 L 36.5 44 C 37.863594 44 39 42.863594 39 41.5 L 39 9.5 C 39 6.4802259 36.519774 4 33.5 4 L 14.5 4 z M 14.5 7 L 33.5 7 C 34.898226 7 36 8.1017741 36 9.5 L 36 41 L 29 41 L 29 37.5 C 29 35.585045 27.414955 34 25.5 34 L 22.5 34 C 20.585045 34 19 35.585045 19 37.5 L 19 41 L 12 41 L 12 9.5 C 12 8.1017741 13.101774 7 14.5 7 z M 16.5 10 A 1.50015 1.50015 0 1 0 16.5 13 L 17.5 13 A 1.50015 1.50015 0 1 0 17.5 10 L 16.5 10 z M 23.5 10 A 1.50015 1.50015 0 1 0 23.5 13 L 24.5 13 A 1.50015 1.50015 0 1 0 24.5 10 L 23.5 10 z M 30.5 10 A 1.50015 1.50015 0 1 0 30.5 13 L 31.5 13 A 1.50015 1.50015 0 1 0 31.5 10 L 30.5 10 z M 16.5 16 A 1.50015 1.50015 0 1 0 16.5 19 L 17.5 19 A 1.50015 1.50015 0 1 0 17.5 16 L 16.5 16 z M 23.5 16 A 1.50015 1.50015 0 1 0 23.5 19 L 24.5 19 A 1.50015 1.50015 0 1 0 24.5 16 L 23.5 16 z M 30.5 16 A 1.50015 1.50015 0 1 0 30.5 19 L 31.5 19 A 1.50015 1.50015 0 1 0 31.5 16 L 30.5 16 z M 16.5 22 A 1.50015 1.50015 0 1 0 16.5 25 L 17.5 25 A 1.50015 1.50015 0 1 0 17.5 22 L 16.5 22 z M 23.5 22 A 1.50015 1.50015 0 1 0 23.5 25 L 24.5 25 A 1.50015 1.50015 0 1 0 24.5 22 L 23.5 22 z M 30.5 22 A 1.50015 1.50015 0 1 0 30.5 25 L 31.5 25 A 1.50015 1.50015 0 1 0 31.5 22 L 30.5 22 z M 16.5 28 A 1.50015 1.50015 0 1 0 16.5 31 L 17.5 31 A 1.50015 1.50015 0 1 0 17.5 28 L 16.5 28 z M 23.5 28 A 1.50015 1.50015 0 1 0 23.5 31 L 24.5 31 A 1.50015 1.50015 0 1 0 24.5 28 L 23.5 28 z M 30.5 28 A 1.50015 1.50015 0 1 0 30.5 31 L 31.5 31 A 1.50015 1.50015 0 1 0 31.5 28 L 30.5 28 z"
/>
d="M 14.5 4 C 11.480226 4 9 6.4802259 9 9.5 L 9 41.5 C 9 42.863594 10.136406 44 11.5 44 L 19.5 44 C 20.863594 44 22 42.863594 22 41.5 L 22 37.5 C 22 37.204955 22.204955 37 22.5 37 L 25.5 37 C 25.795045 37 26 37.204955 26 37.5 L 26 41.5 C 26 42.863594 27.136406 44 28.5 44 L 36.5 44 C 37.863594 44 39 42.863594 39 41.5 L 39 9.5 C 39 6.4802259 36.519774 4 33.5 4 L 14.5 4 z M 14.5 7 L 33.5 7 C 34.898226 7 36 8.1017741 36 9.5 L 36 41 L 29 41 L 29 37.5 C 29 35.585045 27.414955 34 25.5 34 L 22.5 34 C 20.585045 34 19 35.585045 19 37.5 L 19 41 L 12 41 L 12 9.5 C 12 8.1017741 13.101774 7 14.5 7 z M 16.5 10 A 1.50015 1.50015 0 1 0 16.5 13 L 17.5 13 A 1.50015 1.50015 0 1 0 17.5 10 L 16.5 10 z M 23.5 10 A 1.50015 1.50015 0 1 0 23.5 13 L 24.5 13 A 1.50015 1.50015 0 1 0 24.5 10 L 23.5 10 z M 30.5 10 A 1.50015 1.50015 0 1 0 30.5 13 L 31.5 13 A 1.50015 1.50015 0 1 0 31.5 10 L 30.5 10 z M 16.5 16 A 1.50015 1.50015 0 1 0 16.5 19 L 17.5 19 A 1.50015 1.50015 0 1 0 17.5 16 L 16.5 16 z M 23.5 16 A 1.50015 1.50015 0 1 0 23.5 19 L 24.5 19 A 1.50015 1.50015 0 1 0 24.5 16 L 23.5 16 z M 30.5 16 A 1.50015 1.50015 0 1 0 30.5 19 L 31.5 19 A 1.50015 1.50015 0 1 0 31.5 16 L 30.5 16 z M 16.5 22 A 1.50015 1.50015 0 1 0 16.5 25 L 17.5 25 A 1.50015 1.50015 0 1 0 17.5 22 L 16.5 22 z M 23.5 22 A 1.50015 1.50015 0 1 0 23.5 25 L 24.5 25 A 1.50015 1.50015 0 1 0 24.5 22 L 23.5 22 z M 30.5 22 A 1.50015 1.50015 0 1 0 30.5 25 L 31.5 25 A 1.50015 1.50015 0 1 0 31.5 22 L 30.5 22 z M 16.5 28 A 1.50015 1.50015 0 1 0 16.5 31 L 17.5 31 A 1.50015 1.50015 0 1 0 17.5 28 L 16.5 28 z M 23.5 28 A 1.50015 1.50015 0 1 0 23.5 31 L 24.5 31 A 1.50015 1.50015 0 1 0 24.5 28 L 23.5 28 z M 30.5 28 A 1.50015 1.50015 0 1 0 30.5 31 L 31.5 31 A 1.50015 1.50015 0 1 0 31.5 28 L 30.5 28 z" />
</svg>
</button>
<button
id="territory_entrances_false"
onclick="Territory_list.house.territoryType('false')"
data-state=""
>
data-state>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
<path
d="M 14.5 6 A 1.50015 1.50015 0 0 0 13 7.5 L 13 25 L 7.5 25 A 1.50015 1.50015 0 0 0 6 26.5 L 6 42.5 A 1.50015 1.50015 0 1 0 9 42.5 L 9 28 L 14.253906 28 A 1.50015 1.50015 0 0 0 14.740234 28 L 19 28 L 19 42.5 A 1.50015 1.50015 0 1 0 22 42.5 L 22 26.746094 A 1.50015 1.50015 0 0 0 22 26.259766 L 22 22 L 33.253906 22 A 1.50015 1.50015 0 0 0 33.740234 22 L 39 22 L 39 42.5 A 1.50015 1.50015 0 1 0 42 42.5 L 42 20.5 A 1.50015 1.50015 0 0 0 40.5 19 L 35 19 L 35 7.5 A 1.50015 1.50015 0 0 0 33.5 6 L 14.5 6 z M 16 9 L 32 9 L 32 19 L 20.5 19 A 1.50015 1.50015 0 0 0 19 20.5 L 19 25 L 16 25 L 16 9 z M 20 12 C 19.448 12 19 12.448 19 13 L 19 15 C 19 15.552 19.448 16 20 16 L 22 16 C 22.552 16 23 15.552 23 15 L 23 13 C 23 12.448 22.552 12 22 12 L 20 12 z M 26 12 C 25.448 12 25 12.448 25 13 L 25 15 C 25 15.552 25.448 16 26 16 L 28 16 C 28.552 16 29 15.552 29 15 L 29 13 C 29 12.448 28.552 12 28 12 L 26 12 z M 26 25 C 25.448 25 25 25.448 25 26 L 25 28 C 25 28.552 25.448 29 26 29 L 28 29 C 28.552 29 29 28.552 29 28 L 29 26 C 29 25.448 28.552 25 28 25 L 26 25 z M 33 25 C 32.448 25 32 25.448 32 26 L 32 28 C 32 28.552 32.448 29 33 29 L 35 29 C 35.552 29 36 28.552 36 28 L 36 26 C 36 25.448 35.552 25 35 25 L 33 25 z M 13 31 C 12.448 31 12 31.448 12 32 L 12 34 C 12 34.552 12.448 35 13 35 L 15 35 C 15.552 35 16 34.552 16 34 L 16 32 C 16 31.448 15.552 31 15 31 L 13 31 z M 26 31 C 25.448 31 25 31.448 25 32 L 25 34 C 25 34.552 25.448 35 26 35 L 28 35 C 28.552 35 29 34.552 29 34 L 29 32 C 29 31.448 28.552 31 28 31 L 26 31 z M 33 31 C 32.448 31 32 31.448 32 32 L 32 34 C 32 34.552 32.448 35 33 35 L 35 35 C 35.552 35 36 34.552 36 34 L 36 32 C 36 31.448 35.552 31 35 31 L 33 31 z M 13 37 C 12.448 37 12 37.448 12 38 L 12 40 C 12 40.552 12.448 41 13 41 L 15 41 C 15.552 41 16 40.552 16 40 L 16 38 C 16 37.448 15.552 37 15 37 L 13 37 z M 26 37 C 25.448 37 25 37.448 25 38 L 25 40 C 25 40.552 25.448 41 26 41 L 28 41 C 28.552 41 29 40.552 29 40 L 29 38 C 29 37.448 28.552 37 28 37 L 26 37 z M 33 37 C 32.448 37 32 37.448 32 38 L 32 40 C 32 40.552 32.448 41 33 41 L 35 41 C 35.552 41 36 40.552 36 40 L 36 38 C 36 37.448 35.552 37 35 37 L 33 37 z"
/>
d="M 14.5 6 A 1.50015 1.50015 0 0 0 13 7.5 L 13 25 L 7.5 25 A 1.50015 1.50015 0 0 0 6 26.5 L 6 42.5 A 1.50015 1.50015 0 1 0 9 42.5 L 9 28 L 14.253906 28 A 1.50015 1.50015 0 0 0 14.740234 28 L 19 28 L 19 42.5 A 1.50015 1.50015 0 1 0 22 42.5 L 22 26.746094 A 1.50015 1.50015 0 0 0 22 26.259766 L 22 22 L 33.253906 22 A 1.50015 1.50015 0 0 0 33.740234 22 L 39 22 L 39 42.5 A 1.50015 1.50015 0 1 0 42 42.5 L 42 20.5 A 1.50015 1.50015 0 0 0 40.5 19 L 35 19 L 35 7.5 A 1.50015 1.50015 0 0 0 33.5 6 L 14.5 6 z M 16 9 L 32 9 L 32 19 L 20.5 19 A 1.50015 1.50015 0 0 0 19 20.5 L 19 25 L 16 25 L 16 9 z M 20 12 C 19.448 12 19 12.448 19 13 L 19 15 C 19 15.552 19.448 16 20 16 L 22 16 C 22.552 16 23 15.552 23 15 L 23 13 C 23 12.448 22.552 12 22 12 L 20 12 z M 26 12 C 25.448 12 25 12.448 25 13 L 25 15 C 25 15.552 25.448 16 26 16 L 28 16 C 28.552 16 29 15.552 29 15 L 29 13 C 29 12.448 28.552 12 28 12 L 26 12 z M 26 25 C 25.448 25 25 25.448 25 26 L 25 28 C 25 28.552 25.448 29 26 29 L 28 29 C 28.552 29 29 28.552 29 28 L 29 26 C 29 25.448 28.552 25 28 25 L 26 25 z M 33 25 C 32.448 25 32 25.448 32 26 L 32 28 C 32 28.552 32.448 29 33 29 L 35 29 C 35.552 29 36 28.552 36 28 L 36 26 C 36 25.448 35.552 25 35 25 L 33 25 z M 13 31 C 12.448 31 12 31.448 12 32 L 12 34 C 12 34.552 12.448 35 13 35 L 15 35 C 15.552 35 16 34.552 16 34 L 16 32 C 16 31.448 15.552 31 15 31 L 13 31 z M 26 31 C 25.448 31 25 31.448 25 32 L 25 34 C 25 34.552 25.448 35 26 35 L 28 35 C 28.552 35 29 34.552 29 34 L 29 32 C 29 31.448 28.552 31 28 31 L 26 31 z M 33 31 C 32.448 31 32 31.448 32 32 L 32 34 C 32 34.552 32.448 35 33 35 L 35 35 C 35.552 35 36 34.552 36 34 L 36 32 C 36 31.448 35.552 31 35 31 L 33 31 z M 13 37 C 12.448 37 12 37.448 12 38 L 12 40 C 12 40.552 12.448 41 13 41 L 15 41 C 15.552 41 16 40.552 16 40 L 16 38 C 16 37.448 15.552 37 15 37 L 13 37 z M 26 37 C 25.448 37 25 37.448 25 38 L 25 40 C 25 40.552 25.448 41 26 41 L 28 41 C 28.552 41 29 40.552 29 40 L 29 38 C 29 37.448 28.552 37 28 37 L 26 37 z M 33 37 C 32.448 37 32 37.448 32 38 L 32 40 C 32 40.552 32.448 41 33 41 L 35 41 C 35.552 41 36 40.552 36 40 L 36 38 C 36 37.448 35.552 37 35 37 L 33 37 z" />
</svg>
</button>
</div>

31
web/lib/pages/territory/list/script.js
View File

@@ -39,6 +39,24 @@ const Territory_list = {
Territory_list.homestead.setHTML();
},
// Пошук
search: {
open: () => {
const sheepSearchForm = document.getElementById("page-territory-search");
const current = sheepSearchForm.dataset.state;
sheepSearchForm.dataset.state = current === 'open' ? 'closed' : 'open';
},
input: (value) => {
console.log(value);
search_value = value?.trim()?.toLowerCase() || "";
// Sheeps.sheeps_list.setHTML(search_value);
Territory_list.house.setHTML(search_value);
Territory_list.homestead.setHTML(search_value);
}
},
house: {
url: null,
list: [],
@@ -54,7 +72,7 @@ const Territory_list = {
Territory_list.house.list = await response.json();
return Territory_list.house.list;
},
setHTML: async function () {
setHTML: async function (search_value = null) {
const block = document.getElementById('list-house');
const territory_entrances = localStorage.getItem('territory_list_entrances') === 'true';
const sort_mode = localStorage.getItem('territory_list_sort') ?? "1";
@@ -88,6 +106,11 @@ const Territory_list = {
(territory_list_filter === 2 && qty !== work && !territory_entrances) ||
(territory_list_filter === 2 && element.working === false);
if (search_value && !element.house.title.toLowerCase().includes(search_value)) {
continue; // пропустити, якщо ім'я не містить рядок пошуку
}
if (statusMatch) {
const card = document.createElement('app-territory-card');
@@ -161,7 +184,7 @@ const Territory_list = {
Territory_list.homestead.list = await response.json();
return Territory_list.homestead.list;
},
setHTML: async function () {
setHTML: async function (search_value = null) {
const block = document.getElementById('list-homestead');
const sortMode = localStorage.getItem('territory_list_sort') ?? "1";
const territory_list_filter = Number(localStorage.getItem("territory_list_filter") ?? 0);
@@ -184,6 +207,10 @@ const Territory_list = {
(territory_list_filter === 1 && element.working) ||
(territory_list_filter === 2 && !element.working);
if (search_value && !element.title.toLowerCase().includes(search_value)) {
continue; // пропустити, якщо ім'я не містить рядок пошуку
}
if (statusMatch) {
const working = element.working;

53
web/lib/pages/territory/list/style.css
View File

@@ -57,6 +57,7 @@
border-radius: var(--border-radius);
overflow: auto;
display: flex;
flex-wrap: wrap;
}
.page-territory>.list-controls select {
@@ -73,6 +74,58 @@
border-radius: calc(var(--border-radius) - 5px - 2px);
}
.page-territory>.list-controls>button {
display: flex;
position: relative;
background: var(--ColorThemes3);
font-size: 18px;
cursor: pointer;
min-width: 30px;
height: 30px;
padding: 0;
margin-left: calc(100% - 220px);
align-items: center;
justify-content: center;
border-radius: calc(var(--border-radius) - 5px - 2px);
border: 1px solid var(--ColorThemes0);
}
.page-territory>.list-controls>button>svg {
width: 25px;
height: 25px;
fill: var(--ColorThemes0);
}
#page-territory-search {
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
cursor: pointer;
position: relative;
z-index: 5;
max-height: 0;
overflow: hidden;
opacity: 0;
transition: max-height 0.3s ease, opacity 0.3s ease, margin 0.3s ease, padding 0.3s ease;
}
#page-territory-search[data-state="open"] {
max-height: 60px;
padding: 15px 0 0 0;
opacity: 1;
}
#page-territory-search input {
width: 100%;
padding: 0 5px;
border-radius: calc(var(--border-radius) - 5px - 4px);
height: 30px;
background: var(--ColorThemes3);
color: var(--ColorThemes0);
font-size: var(--FontSize2);
}
#page-territory-sort {
display: flex;

8
web/lib/pages/territory/manager/index.html
View File

@@ -95,12 +95,8 @@
<option value="6">6</option>
<option value="7">7</option>
</select>
<input
id="new-worker-name"
type="text"
name="new-worker-name"
list="list_sheeps"
/>
<div id="new-worker-sheep"></div>
<div>
<button onclick="Territory_Manager.mess.close()">Закрити</button>
<button

45
web/lib/pages/territory/manager/script.js
View File

@@ -42,6 +42,8 @@ const Territory_Manager = {
});
card.dataset.listenerAdded = 'true';
}
Territory_Manager.mess.init();
},
info: {
list: {},
@@ -281,12 +283,39 @@ const Territory_Manager = {
L.polygon(data.points, polygonOptions).addTo(map_territory);
},
mess: {
init: () => {
let block_new_sheep = document.getElementById('new-worker-sheep');
block_new_sheep.innerHTML = `
<smart-select type="number" onchange="Territory_Manager.mess.select_close()" id="new-worker-name" max="1" placeholder="Оберіть вісника..." title="Оберіть вісника, якому хочете призначити цю територію">
${Sheeps.sheeps_list.list.map(p => {
return `<div
slot="option"
data-value="${Number(p.id)}">
${p.name}
</div>`;
}).join('')}
</smart-select>
`;
},
select_close: () => {
const select = document.getElementById(`new-worker-name`);
if (!select) return;
console.log(select.getClick);
if(select.getClick.state == "add"){
select.removeAttribute("open")
}
},
open: ({ type, id, number, mode }) => {
const block = document.getElementById('territory-new');
const groupInput = document.getElementById('new-worker-group');
const nameInput = document.getElementById('new-worker-name');
const nameInput = document.getElementById('new-worker-sheep');
const button = document.getElementById('new-worker-button');
button.removeAttribute("disabled")
// Показуємо блок
block.style.display = "";
requestAnimationFrame(() => block.style.opacity = "1");
@@ -311,16 +340,21 @@ const Territory_Manager = {
},
newWorker: async ({ type, id, number, mode }) => {
const uuid = localStorage.getItem('uuid');
const sheepName = document.getElementById('new-worker-name').value;
const sheepName = document.getElementById(`new-worker-name`);
const groupId = Number(document.getElementById('new-worker-group').value);
if (!sheepName.value[0] && !groupId) return;
const newButton = document.getElementById('new-worker-button');
const groupButton = document.getElementById('group-working-button');
newButton.setAttribute("disabled", "");
let territory_id;
let URL;
const sheep = Sheeps.sheeps_list.list.find(e => e.name === sheepName);
const sheep = Sheeps.sheeps_list.list.find(e => e.id === sheepName.value[0]);
if (type === "house") {
territory_id = Territory_Manager.entrances.list[number]?.id;
@@ -336,11 +370,14 @@ const Territory_Manager = {
}
const data = {
name: mode ? sheepName : "Групова",
name: mode ? sheep?.name : "Групова",
group_id: mode ? sheep?.group_id : groupId,
sheep_id: mode ? sheep?.id : null
};
console.log(data);
try {
const response = await fetch(URL, {
method: 'POST',

5
web/lib/pages/territory/manager/style.css
View File

@@ -340,14 +340,14 @@
#territory-new>.mess {
display: flex;
width: 300px;
height: 100px;
height: 90px;
border: 1px solid var(--ColorThemes2);
background: var(--ColorThemes0);
box-shadow: 0px 2px 3px rgb(0 0 0 / 5%), 0px 5px 15px rgb(0 0 0 / 5%), 0px 4px 8px rgb(0 0 0 / 5%), 0px 0px 1px rgb(0 0 0 / 5%);
position: absolute;
top: 50%;
left: 50%;
margin-top: -50px;
margin-top: -45px;
margin-left: -160px;
flex-direction: column;
align-items: center;
@@ -401,7 +401,6 @@
background: var(--ColorThemes3);
cursor: pointer;
border: 0;
margin-bottom: 5px;
margin-left: 0;
width: calc(50% - 5px);
border-radius: 10px;

2
web/sw.js
View File

@@ -1,4 +1,4 @@
const STATIC_CACHE_NAME = 'v2.2.1';
const STATIC_CACHE_NAME = 'v2.2.4';
const FILES_TO_CACHE = [
'/',