From bb521bb190c128afef9d6289a49a68245b4c7e0f Mon Sep 17 00:00:00 2001
From: Honk <lennoninmyheart@gmail.com>
Date: Thu, 25 Nov 2021 18:05:58 +0500
Subject: [PATCH 1/2] =?UTF-8?q?=D0=90=D0=BD=D0=BD=D0=B0=20=D0=9D=D0=B0?=
 =?UTF-8?q?=D0=B7=D0=B0=D1=80=D0=BE=D0=B2=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Все :)
---
 static/focus.js | 48 ++++++++++++++++++++++--------------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/static/focus.js b/static/focus.js
index 4b43735..c8f14a1 100644
--- a/static/focus.js
+++ b/static/focus.js
@@ -5,37 +5,33 @@ 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 orgns = 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();
 
-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));
-            }
-        }
-    };
-
-    xhr.send();
+function sendRequest(url, _) {
+    let response = await fetch(url);
+    if (response.ok) {
+        return await response.json();
+    } else {
+        throw new Error("Ошибка: " + response.status)
+    }
 }
 
 function reqsToMap(requisites) {

From cb1542886570f5f19cdc3f7e7e028303039739bb Mon Sep 17 00:00:00 2001
From: Honk <lennoninmyheart@gmail.com>
Date: Fri, 24 Dec 2021 18:14:46 +0500
Subject: [PATCH 2/2] update

!!
---
 static/focus.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/static/focus.js b/static/focus.js
index c8f14a1..e64a7d5 100644
--- a/static/focus.js
+++ b/static/focus.js
@@ -7,7 +7,7 @@ const API = {
 
 async function run() {
     let orgOgrns = await sendRequest(API.organizationList)
-    let orgns = orgOgrns.join(",");
+    let ogrns = orgOgrns.join(",");
 
     Promise.all([
         sendRequest(`${API.orgReqs}?ogrn=${ogrns}`),
@@ -25,12 +25,12 @@ async function run() {
 
 run();
 
-function sendRequest(url, _) {
+async function sendRequest(url, _) {
     let response = await fetch(url);
     if (response.ok) {
         return await response.json();
     } else {
-        throw new Error("Ошибка: " + response.status)
+        throw new Error("Ошибка HTTP: " + response.status)
     }
 }
 
@@ -82,7 +82,7 @@ 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 = "—";
@@ -127,4 +127,4 @@ function createAddress(address) {
     function createAddressItem(key) {
         return `${address[key].topoShortName}. ${address[key].topoValue}`;
     }
-}
+}
\ No newline at end of file