Додані повідомлення та перепрацьована структура застосунку та api
This commit is contained in:
@@ -40,10 +40,11 @@ const Territory_list = {
|
||||
},
|
||||
|
||||
house: {
|
||||
url: null,
|
||||
list: [],
|
||||
loadAPI: async function (url) {
|
||||
const uuid = localStorage.getItem("uuid");
|
||||
const response = await fetch(url, {
|
||||
const response = await fetch(url ?? Territory_list.house.url, {
|
||||
method: 'GET',
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
@@ -60,6 +61,7 @@ const Territory_list = {
|
||||
const territory_list_filter = Number(localStorage.getItem("territory_list_filter") ?? 0);
|
||||
|
||||
const url = `${CONFIG.api}houses/list${territory_entrances ? '/entrances' : ''}`;
|
||||
Territory_list.house.url = url;
|
||||
let list = this.list.length > 0 ? this.list : await this.loadAPI(url);
|
||||
|
||||
const isEnd = territory_list_filter === "2";
|
||||
@@ -94,11 +96,13 @@ const Territory_list = {
|
||||
const person = working
|
||||
? `${element.history.name === 'Групова' ? 'Група ' + element.history.group_id : element.history.name}`
|
||||
: ``;
|
||||
const overdue = working && (element.history.date.start + (1000 * 2629743 * 4)) <= Date.now();
|
||||
|
||||
card.image = `${CONFIG.web}cards/house/T${element.house.id}.webp`;
|
||||
card.address = `${element.house.title} ${element.house.number} (${element.title})`;
|
||||
card.link = `/territory/manager/house/${element.house.id}`;
|
||||
card.sheep = person;
|
||||
card.overdue = overdue;
|
||||
block.appendChild(card);
|
||||
} else {
|
||||
const qty = element.entrance.quantity;
|
||||
@@ -154,8 +158,8 @@ const Territory_list = {
|
||||
}
|
||||
});
|
||||
|
||||
this.list = await response.json();
|
||||
return this.list;
|
||||
Territory_list.homestead.list = await response.json();
|
||||
return Territory_list.homestead.list;
|
||||
},
|
||||
setHTML: async function () {
|
||||
const block = document.getElementById('list-homestead');
|
||||
@@ -186,12 +190,15 @@ const Territory_list = {
|
||||
const person = working
|
||||
? `${element.history.name === 'Групова' ? 'Група ' + element.history.group_id : element.history.name}`
|
||||
: ``;
|
||||
|
||||
const overdue = working && (element.history.date.start + (1000 * 2629743 * 4)) <= Date.now();
|
||||
|
||||
const card = document.createElement('app-territory-card');
|
||||
card.image = `${CONFIG.web}cards/homestead/H${element.id}.webp`;
|
||||
card.address = `${element.title} ${element.number}`;
|
||||
card.link = `/territory/manager/homestead/${element.id}`;
|
||||
card.sheep = person;
|
||||
card.overdue = overdue;
|
||||
block.appendChild(card);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user