Змінено директорії
Додано скрипти CRON Поліпшено механізм запису стендів та їх редагування
This commit is contained in:
@@ -31,7 +31,7 @@ const Territory_card = {
|
||||
controls.style.display = "flex";
|
||||
|
||||
// Застосовуємо режим сортування
|
||||
this.sort(localStorage.getItem('sort_mode'), false);
|
||||
this.sort(localStorage.getItem('territory_card_sort'), false);
|
||||
this.getEntrances({ update: false });
|
||||
} else if (type === "homestead") {
|
||||
this.getHomestead.map({});
|
||||
@@ -249,14 +249,14 @@ const Territory_card = {
|
||||
const data = await res.json();
|
||||
this.listApartment[number] = data;
|
||||
|
||||
const sort_mode = localStorage.getItem('sort_mode') ?? "1";
|
||||
const territory_card_sort = localStorage.getItem('territory_card_sort') ?? "1";
|
||||
const sorters = {
|
||||
"1": (a, b) => a.apartment_number - b.apartment_number,
|
||||
"2": (a, b) => b.apartment_number - a.apartment_number,
|
||||
"3": (a, b) => a.updated_at - b.updated_at,
|
||||
"4": (a, b) => b.updated_at - a.updated_at,
|
||||
};
|
||||
data.sort(sorters[sort_mode] || sorters["1"]);
|
||||
data.sort(sorters[territory_card_sort] || sorters["1"]);
|
||||
|
||||
const container = document.getElementById(`apartments_${id}`);
|
||||
if (!update) container.innerHTML = "";
|
||||
@@ -493,7 +493,7 @@ const Territory_card = {
|
||||
['sort_1', 'sort_2', 'sort_3', 'sort_4'].forEach((id, i) => {
|
||||
document.getElementById(id)?.setAttribute('data-state', i + 1 === idx ? 'active' : '');
|
||||
});
|
||||
localStorage.setItem('sort_mode', idx);
|
||||
localStorage.setItem('territory_card_sort', idx);
|
||||
if (!load) this.getEntrances({ update: false });
|
||||
},
|
||||
|
||||
|
||||
@@ -4,8 +4,8 @@ const Territory_list = {
|
||||
app.innerHTML = html;
|
||||
|
||||
let selectStatus = document.getElementById('list-controls-filter-status');
|
||||
let filterStatus = localStorage.getItem("filterStatus") ? Number(localStorage.getItem("filterStatus")) : 0;
|
||||
selectStatus.value = filterStatus;
|
||||
let territory_list_filter = localStorage.getItem("territory_list_filter") ? Number(localStorage.getItem("territory_list_filter")) : 0;
|
||||
selectStatus.value = territory_list_filter;
|
||||
|
||||
if (USER.mode == 2) {
|
||||
document.getElementById("buttons-list").style.display = "flex";
|
||||
@@ -17,10 +17,10 @@ const Territory_list = {
|
||||
}
|
||||
|
||||
// Застосовуємо режим сортування
|
||||
Territory_list.sort(localStorage.getItem('territory_sort_mode'));
|
||||
Territory_list.sort(localStorage.getItem('territory_list_sort'));
|
||||
|
||||
|
||||
if (localStorage.getItem('territory_entrances') == 'true') {
|
||||
if (localStorage.getItem('territory_list_entrances') == 'true') {
|
||||
document.getElementById('territory_entrances_true').setAttribute('data-state', '')
|
||||
document.getElementById('territory_entrances_false').setAttribute('data-state', 'active')
|
||||
} else {
|
||||
@@ -35,7 +35,7 @@ const Territory_list = {
|
||||
['sort_1', 'sort_2', 'sort_3', 'sort_4'].forEach((id, i) => {
|
||||
document.getElementById(id)?.setAttribute('data-state', i + 1 === idx ? 'active' : '');
|
||||
});
|
||||
localStorage.setItem('territory_sort_mode', idx);
|
||||
localStorage.setItem('territory_list_sort', idx);
|
||||
|
||||
Territory_list.house.setHTML();
|
||||
Territory_list.homestead.setHTML();
|
||||
@@ -57,9 +57,9 @@ const Territory_list = {
|
||||
},
|
||||
setHTML: async function () {
|
||||
const block_house = document.getElementById('list-house');
|
||||
const territory_entrances = localStorage.getItem('territory_entrances') === 'true';
|
||||
const sort_mode = localStorage.getItem('territory_sort_mode') ?? "1";
|
||||
const filterStatus = Number(localStorage.getItem("filterStatus") ?? 0);
|
||||
const territory_entrances = localStorage.getItem('territory_list_entrances') === 'true';
|
||||
const sort_mode = localStorage.getItem('territory_list_sort') ?? "1";
|
||||
const territory_list_filter = Number(localStorage.getItem("territory_list_filter") ?? 0);
|
||||
|
||||
const url = `${CONFIG.api}houses/list${territory_entrances ? '/entrances' : ''}`;
|
||||
let list = this.list.length > 0 ? this.list : await this.loadAPI(url);
|
||||
@@ -79,11 +79,11 @@ const Territory_list = {
|
||||
const work = element.entrance?.working ?? 0;
|
||||
|
||||
const statusMatch =
|
||||
filterStatus === 0 ||
|
||||
(filterStatus === 1 && qty === work && !territory_entrances) ||
|
||||
(filterStatus === 1 && element.working === true) ||
|
||||
(filterStatus === 2 && qty !== work && !territory_entrances) ||
|
||||
(filterStatus === 2 && element.working === false);
|
||||
territory_list_filter === 0 ||
|
||||
(territory_list_filter === 1 && qty === work && !territory_entrances) ||
|
||||
(territory_list_filter === 1 && element.working === true) ||
|
||||
(territory_list_filter === 2 && qty !== work && !territory_entrances) ||
|
||||
(territory_list_filter === 2 && element.working === false);
|
||||
|
||||
if (statusMatch) {
|
||||
html += this.renderCard({ element, territory_entrances });
|
||||
@@ -161,7 +161,7 @@ const Territory_list = {
|
||||
}
|
||||
},
|
||||
territoryType: (type) => {
|
||||
localStorage.setItem('territory_entrances', type);
|
||||
localStorage.setItem('territory_list_entrances', type);
|
||||
document.getElementById('territory_entrances_true').setAttribute('data-state', type === 'false' ? 'active' : '');
|
||||
document.getElementById('territory_entrances_false').setAttribute('data-state', type === 'true' ? 'active' : '');
|
||||
Territory_list.house.list = [];
|
||||
@@ -187,8 +187,8 @@ const Territory_list = {
|
||||
},
|
||||
setHTML: async function () {
|
||||
const block = document.getElementById('list-homestead');
|
||||
const sortMode = localStorage.getItem('territory_sort_mode') ?? "1";
|
||||
const filterStatus = Number(localStorage.getItem("filterStatus") ?? 0);
|
||||
const sortMode = localStorage.getItem('territory_list_sort') ?? "1";
|
||||
const territory_list_filter = Number(localStorage.getItem("territory_list_filter") ?? 0);
|
||||
|
||||
let list = this.list.length > 0 ? this.list : await this.loadAPI();
|
||||
|
||||
@@ -205,9 +205,9 @@ const Territory_list = {
|
||||
|
||||
for (const element of list) {
|
||||
const statusMatch =
|
||||
filterStatus === 0 ||
|
||||
(filterStatus === 1 && element.working) ||
|
||||
(filterStatus === 2 && !element.working);
|
||||
territory_list_filter === 0 ||
|
||||
(territory_list_filter === 1 && element.working) ||
|
||||
(territory_list_filter === 2 && !element.working);
|
||||
|
||||
if (statusMatch) {
|
||||
html += this.renderCard(element);
|
||||
@@ -244,7 +244,7 @@ const Territory_list = {
|
||||
filter: () => {
|
||||
let selectStatus = document.getElementById('list-controls-filter-status').value;
|
||||
|
||||
localStorage.setItem("filterStatus", selectStatus);
|
||||
localStorage.setItem("territory_list_filter", selectStatus);
|
||||
|
||||
|
||||
Territory_list.house.setHTML();
|
||||
|
||||
@@ -163,6 +163,7 @@
|
||||
|
||||
.page-territory summary span {
|
||||
font-weight: 500;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.page-territory summary>div>button {
|
||||
@@ -218,7 +219,7 @@
|
||||
width: 300px;
|
||||
height: 200px;
|
||||
background-color: var(--ColorThemes2);
|
||||
margin: 0px 10px 20px 10px;
|
||||
margin: 10px;
|
||||
overflow: hidden;
|
||||
cursor: pointer;
|
||||
border-radius: calc(var(--border-radius) - 5px);
|
||||
|
||||
Reference in New Issue
Block a user