nikola/personal_website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Nikola Petrov 2023-10-09 18:56:29 +02:00
parent d12d0d10f8
commit 7606654e30
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
controllers/cashTransactionController.js
View File

@ -1,4 +1,6 @@
var cashTransactionModel = require('../models/cashTransactionModel.js'); var cashTransactionModel = require('../models/cashTransactionModel.js');
const types = ['ZAVRNITEV POS NAKUP', 'POS NAKUP', 'BA DVIG', 'priliv', 'SDD', 'SPLET/TEL NAKUP', 'PREDAVTORIZACIJE'];
module.exports = { module.exports = {
list: async function (req, res) { list: async function (req, res) {
@ -17,7 +19,9 @@ module.exports = {
transactions = await cashTransactionModel.find({}, { _id: 0, __v: 0 }); transactions = await cashTransactionModel.find({}, { _id: 0, __v: 0 });
} }
return res.json(transactions); const data = { transactions: transactions, types: types };
return res.json(data);
} catch (err) { } catch (err) {
return res.status(500).json({ return res.status(500).json({
message: 'Error when getting transactions.', message: 'Error when getting transactions.',
@ -37,7 +41,7 @@ module.exports = {
month: 0, month: 0,
year: 0, year: 0,
amount: 0, amount: 0,
type: 0, type: -1,
company: "", company: "",
}); });
@ -45,15 +49,14 @@ module.exports = {
const amountPattern = /\d{1,3}(?:[.]\d{3})*(?:[.,]\d{2})(?=\sEUR)/; const amountPattern = /\d{1,3}(?:[.]\d{3})*(?:[.,]\d{2})(?=\sEUR)/;
const companyPattern1 = /(?<=(UR,|\sod)\s).*?(?=\s(na\s|za\s|Inf))/; const companyPattern1 = /(?<=(UR,|\sod)\s).*?(?=\s(na\s|za\s|Inf))/;
if (rawString.includes("ZAVRNITEV POS NAKUP")) transaction.type = 2; for (var i = 0; i < types.length; i++) {
else if (rawString.includes("POS NAKUP")) transaction.type = 1; if (rawString.includes(types[i])) {
else if (rawString.includes("BA DVIG")) transaction.type = 3; transaction.type = i;
else if (rawString.includes("priliv")) transaction.type = 4; break;
else if (rawString.includes("SDD")) transaction.type = 5; }
else if (rawString.includes("SPLET/TEL NAKUP")) transaction.type = 6; }
else if (rawString.includes("PREDAVTORIZACIJE")) transaction.type = 7;
if (transaction.type != 0) { if (transaction.type != -1) {
const amountMatch = rawString.match(amountPattern); const amountMatch = rawString.match(amountPattern);
if (amountMatch) { if (amountMatch) {
const amount = amountMatch[0].replace('.', '').replace(',', '.'); const amount = amountMatch[0].replace('.', '').replace(',', '.');
@ -81,7 +84,7 @@ module.exports = {
}, },
delete: async function (req, res) { delete: async function (req, res) {
cashTransactionModel.deleteMany({ type: 0 }) cashTransactionModel.deleteMany({ type: -1 })
.then(data => { .then(data => {
res.status(201).json({ message: "OK" }); res.status(201).json({ message: "OK" });
}); });

7
views/cash.hbs
View File

@ -19,7 +19,7 @@
</header> </header>
<main class="bg-body-tertiary pt-5 pb-5"> <main class="bg-body-tertiary pt-5 pb-5">
<div class="container"> <div class="container position-relative">
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>
@ -35,6 +35,9 @@
<tbody id="tbody"> <tbody id="tbody">
</tbody> </tbody>
</table> </table>
<div><canvas id="acquisitions"></canvas></div> <div class="row">
<div class="w-50 mx-auto"><canvas id="acquisitions"></canvas></div>
</div>
</div> </div>
</main> </main>