diff --git a/static/focus.js b/static/focus.js index 4b43735..41c2514 100644 --- a/static/focus.js +++ b/static/focus.js @@ -1,41 +1,45 @@ const API = { organizationList: "/orgsList", - analytics: "/api3/analytics", + analytics: "/api3/analitics", orgReqs: "/api3/reqBase", buhForms: "/api3/buh", }; -function run() { - sendRequest(API.organizationList, (orgOgrns) => { +async function run() { + try { + const orgOgrns = await sendRequest(API.organizationList); + if (!orgOgrns) return; + const ogrns = orgOgrns.join(","); - sendRequest(`${API.orgReqs}?ogrn=${ogrns}`, (requisites) => { - 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); - }); - }); - }); - }); + const [requisites, analytics, buh] = await Promise.all([ + sendRequest(`${API.orgReqs}?ogrn=${ogrns}`), + sendRequest(`${API.analytics}?ogrn=${ogrns}`), + sendRequest(`${API.buhForms}?ogrn=${ogrns}`) + ]); + + if (!requisites || !analytics || !buh) { + return; + } + + const orgsMap = reqsToMap(requisites); + addInOrgsMap(orgsMap, analytics, "analytics"); + addInOrgsMap(orgsMap, buh, "buhForms"); + + render(orgsMap, orgOgrns); + } catch (error) { + console.error("Произошла критическая ошибка:", error); + } } -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 sendRequest(url) { + const response = await fetch(url); + if (!response.ok) { + alert(`Ошибка: ${response.status} ${response.statusText}`); + return null; + } - xhr.send(); + return await response.json(); } function reqsToMap(requisites) {