Small modal and request fixes

This commit is contained in:
2023-10-25 21:14:24 +03:00
parent 485bd6b9ba
commit 0a4ff61935
6 changed files with 26 additions and 14 deletions

View File

@@ -7,7 +7,7 @@
let ctx; let ctx;
let chartCanvas; let chartCanvas;
onMount(async () => { async function updateGraph() {
const token = getCookie('access_token'); const token = getCookie('access_token');
const config = { const config = {
@@ -20,7 +20,6 @@
const response = await axios.get('http://localhost:8081/incomes/personal-incomes', config); const response = await axios.get('http://localhost:8081/incomes/personal-incomes', config);
const incomeData = response.data; const incomeData = response.data;
// Create a function to group and sum incomes by category
function groupAndSumByCategory(incomes) { function groupAndSumByCategory(incomes) {
const groupedData = new Map(); const groupedData = new Map();
incomes.forEach(income => { incomes.forEach(income => {
@@ -34,10 +33,8 @@
return groupedData; return groupedData;
} }
// Group and sum incomes by category
const groupedIncomeData = groupAndSumByCategory(incomeData); const groupedIncomeData = groupAndSumByCategory(incomeData);
// Extract category names and summed values
const chartLabels = Array.from(groupedIncomeData.keys()); const chartLabels = Array.from(groupedIncomeData.keys());
const chartValues = Array.from(groupedIncomeData.values()); const chartValues = Array.from(groupedIncomeData.values());
@@ -60,7 +57,9 @@
} catch (error) { } catch (error) {
console.error('Error:', error); console.error('Error:', error);
} }
}); }
onMount(updateGraph);
</script> </script>
<div id="chart"> <div id="chart">

View File

@@ -7,8 +7,7 @@
let ctx; let ctx;
let chartCanvas; let chartCanvas;
onMount(async () => { async function updateGraph() {
const token = getCookie('access_token'); const token = getCookie('access_token');
const config = { const config = {
@@ -65,7 +64,9 @@
} catch (error) { } catch (error) {
console.error('Error:', error); console.error('Error:', error);
} }
}); }
onMount(updateGraph);
</script> </script>
<div id="chart"> <div id="chart">

View File

@@ -7,7 +7,7 @@
let ctx; let ctx;
let chartCanvas; let chartCanvas;
onMount(async () => { async function updateGraph() {
const token = getCookie('access_token'); const token = getCookie('access_token');
const config = { const config = {
@@ -50,7 +50,9 @@
} catch (error) { } catch (error) {
console.error('Error:', error); console.error('Error:', error);
} }
}); }
onMount(updateGraph);
</script> </script>
<div id="chart"> <div id="chart">

View File

@@ -8,7 +8,7 @@
let parentHeight; let parentHeight;
let listParentHeight; let listParentHeight;
onMount(async () => { async function updateInfo() {
const token = getCookie('access_token'); const token = getCookie('access_token');
const config = { const config = {
@@ -24,7 +24,8 @@
} catch (error) { } catch (error) {
console.error('Error:', error); console.error('Error:', error);
} }
}); }
onMount(updateInfo);
afterUpdate(() => { afterUpdate(() => {
parentHeight = document.querySelector('#expenseInfo').offsetHeight; parentHeight = document.querySelector('#expenseInfo').offsetHeight;

View File

@@ -9,7 +9,7 @@
let parentHeight; let parentHeight;
let listParentHeight; let listParentHeight;
onMount(async () => { async function updateInfo() {
const token = getCookie('access_token'); const token = getCookie('access_token');
const config = { const config = {
@@ -25,7 +25,8 @@
} catch (error) { } catch (error) {
console.error('Error:', error); console.error('Error:', error);
} }
}); }
onMount(updateInfo);
afterUpdate(() => { afterUpdate(() => {
parentHeight = document.querySelector('#incomeInfo').offsetHeight; parentHeight = document.querySelector('#incomeInfo').offsetHeight;

View File

@@ -4,6 +4,14 @@
import Graph3 from '../graphs/Graph3.svelte'; import Graph3 from '../graphs/Graph3.svelte';
import Expenses from "../infolists/Expenses.svelte"; import Expenses from "../infolists/Expenses.svelte";
import Incomes from "../infolists/Incomes.svelte"; import Incomes from "../infolists/Incomes.svelte";
function updateAll() {
Graph1.updateGraph();
Graph2.updateGraph();
Graph3.updateGraph();
Expenses.updateInfo();
Incomes.updateInfo();
}
</script> </script>
<div id="dataMenu"> <div id="dataMenu">