Skip to content

Вяткин Сергей #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ohtoe02 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Вяткин Сергей #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 27 additions & 39 deletions static/focus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,31 @@ const API = {
buhForms: "/api3/buh",
};

function run() {
sendRequest(API.organizationList, (orgOgrns) => {
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);
});
});
});
async function run() {
const orgOgrns = await sendRequest(API.organizationList);
const 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);
});
}

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();
async function sendRequest(url) {
return fetch(url)
.then((response) => {
if (response.ok)
return response.json();
alert("Ошибка HTTP: " + response.status);
});
}

function reqsToMap(requisites) {
Expand All @@ -46,9 +40,8 @@ function reqsToMap(requisites) {
}

function addInOrgsMap(orgsMap, additionalInfo, key) {
for (const item of additionalInfo) {
for (const item of additionalInfo)
orgsMap[item.ogrn][key] = item[key];
}
}

function render(organizationsInfo, organizationsOrder) {
Expand Down Expand Up @@ -86,11 +79,10 @@ 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 {
} else
money.textContent = "—";
}

const addressFromServer = orgInfo.UL.legalAddress.parsedAddressRF;
address.textContent = createAddress(addressFromServer);
Expand All @@ -113,18 +105,14 @@ function formatMoney(money) {

function createAddress(address) {
const addressToRender = [];
if (address.regionName) {
if (address.regionName)
addressToRender.push(createAddressItem("regionName"));
}
if (address.city) {
if (address.city)
addressToRender.push(createAddressItem("city"));
}
if (address.street) {
if (address.street)
addressToRender.push(createAddressItem("street"));
}
if (address.house) {
if (address.house)
addressToRender.push(createAddressItem("house"));
}

return addressToRender.join(", ");

Expand Down