From 11feb1795d581272c95df2ab02c37b30faaedeba Mon Sep 17 00:00:00 2001 From: ilmirka Date: Tue, 27 Apr 2021 17:13:29 +0500 Subject: [PATCH 1/2] 1 --- static/focus.js | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/static/focus.js b/static/focus.js index 4b43735..fa64044 100644 --- a/static/focus.js +++ b/static/focus.js @@ -5,20 +5,22 @@ const API = { buhForms: "/api3/buh", }; -function run() { - sendRequest(API.organizationList, (orgOgrns) => { - const ogrns = orgOgrns.join(","); - sendRequest(`${API.orgReqs}?ogrn=${ogrns}`, (requisites) => { +async function run() { + let orgOgrns = await sendRequest(API.organizationList) + let ogrns = orgOgrns.join(","); + + Promise.all([ + sendRequest(`${API.orgReqs}?ogrn=${ogrns}`), + sendRequest(`${API.analytics}?ogrn=${ogrns}`), + sendRequest(`${API.buhForms}?ogrn=${ogrns}`) + ]) + .then(([requisites, analytics, buh]) => { const orgsMap = reqsToMap(requisites); - sendRequest(`${API.analytics}?ogrn=${ogrns}`, (analytics) => { - addInOrgsMap(orgsMap, analytics, "analytics"); - sendRequest(`${API.buhForms}?ogrn=${ogrns}`, (buh) => { - addInOrgsMap(orgsMap, buh, "buhForms"); - render(orgsMap, orgOgrns); - }); - }); - }); - }); + addInOrgsMap(orgsMap, analytics, "analytics"); + addInOrgsMap(orgsMap, buh, "buhForms"); + render(orgsMap, orgOgrns); + }) + .catch((error) => alert(error)) } run(); From 5d788ded80a728b6393feea19035cbddf627a6d4 Mon Sep 17 00:00:00 2001 From: ilmirka Date: Tue, 8 Jun 2021 02:09:53 +0500 Subject: [PATCH 2/2] All --- static/focus.js | 66 +++++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 44 deletions(-) diff --git a/static/focus.js b/static/focus.js index fa64044..4085921 100644 --- a/static/focus.js +++ b/static/focus.js @@ -6,38 +6,31 @@ const API = { }; async function run() { - let orgOgrns = await sendRequest(API.organizationList) - let ogrns = orgOgrns.join(","); - - Promise.all([ - sendRequest(`${API.orgReqs}?ogrn=${ogrns}`), - sendRequest(`${API.analytics}?ogrn=${ogrns}`), - sendRequest(`${API.buhForms}?ogrn=${ogrns}`) - ]) - .then(([requisites, analytics, buh]) => { - const orgsMap = reqsToMap(requisites); - addInOrgsMap(orgsMap, analytics, "analytics"); - addInOrgsMap(orgsMap, buh, "buhForms"); - render(orgsMap, orgOgrns); - }) - .catch((error) => alert(error)) + let orgOgrns = await sendRequestPromise(API.organizationList); + let ogrns = orgOgrns.join(','); + + await Promise.all([ + sendRequestPromise(`${API.orgReqs}?ogrn=${ogrns}`), + sendRequestPromise(`${API.analytics}?ogrn=${ogrns}`), + sendRequestPromise(`${API.buhForms}?ogrn=${ogrns}`) + ]).then(([requisites='', analytics='', buh='']) => { + const orgsMap = reqsToMap(requisites); + addInOrgsMap(orgsMap, analytics, 'analytics'); + addInOrgsMap(orgsMap, buh, 'buhForms'); + render(orgsMap, orgOgrns); + }); } run(); -function sendRequest(url, callback) { - const xhr = new XMLHttpRequest(); - xhr.open("GET", url, true); - - xhr.onreadystatechange = function () { - if (xhr.readyState === XMLHttpRequest.DONE) { - if (xhr.status === 200) { - callback(JSON.parse(xhr.response)); - } - } - }; +async function sendRequestPromise(url) { + let response = await fetch(url); - xhr.send(); + if (response.ok) { + return response.json(); + } else { + alert("Ошибка HTTP: " + response.status); + } } function reqsToMap(requisites) { @@ -46,37 +39,30 @@ function reqsToMap(requisites) { return acc; }, {}); } - function addInOrgsMap(orgsMap, additionalInfo, key) { for (const item of additionalInfo) { orgsMap[item.ogrn][key] = item[key]; } } - function render(organizationsInfo, organizationsOrder) { const table = document.getElementById("organizations"); table.classList.remove("hide"); - const template = document.getElementById("orgTemplate"); const container = table.querySelector("tbody"); - organizationsOrder.forEach((item) => { renderOrganization(organizationsInfo[item], template, container); }); } - function renderOrganization(orgInfo, template, container) { const clone = document.importNode(template.content, true); const name = clone.querySelector(".name"); const indebtedness = clone.querySelector(".indebtedness"); const money = clone.querySelector(".money"); const address = clone.querySelector(".address"); - name.textContent = (orgInfo.UL && orgInfo.UL.legalName && orgInfo.UL.legalName.short) || ""; indebtedness.textContent = formatMoney(orgInfo.analytics.s1002 || 0); - if ( orgInfo.buhForms && orgInfo.buhForms.length && @@ -88,31 +74,25 @@ function renderOrganization(orgInfo, template, container) { orgInfo.buhForms[orgInfo.buhForms.length - 1].form2[0] && orgInfo.buhForms[orgInfo.buhForms.length - 1].form2[0] .endValue) || - 0 + 0 ); } else { money.textContent = "—"; } - const addressFromServer = orgInfo.UL.legalAddress.parsedAddressRF; address.textContent = createAddress(addressFromServer); - container.appendChild(clone); } - function formatMoney(money) { let formatted = money.toFixed(2); formatted = formatted.replace(".", ","); - const rounded = money.toFixed(0); const numLen = rounded.length; for (let i = numLen - 3; i > 0; i -= 3) { formatted = `${formatted.slice(0, i)} ${formatted.slice(i)}`; } - return `${formatted} ₽`; } - function createAddress(address) { const addressToRender = []; if (address.regionName) { @@ -127,10 +107,8 @@ function createAddress(address) { if (address.house) { addressToRender.push(createAddressItem("house")); } - return addressToRender.join(", "); - function createAddressItem(key) { return `${address[key].topoShortName}. ${address[key].topoValue}`; } -} +} \ No newline at end of file