cry-klikvet-logic 0.10.137 → 0.10.138
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/calcTimeQuery.js +3 -7
- package/dist/calcTimeQuery.js.map +1 -1
- package/dist/certs.js +7 -14
- package/dist/certs.js.map +1 -1
- package/dist/davki.js +4 -8
- package/dist/davki.js.map +1 -1
- package/dist/dayjs.js +4 -9
- package/dist/dayjs.js.map +1 -1
- package/dist/ensureIndexes.js +3 -7
- package/dist/ensureIndexes.js.map +1 -1
- package/dist/idjiArtiklovKiImajoLahkoZalogo.d.ts +1 -1
- package/dist/idjiArtiklovKiImajoLahkoZalogo.d.ts.map +1 -1
- package/dist/idjiArtiklovKiImajoLahkoZalogo.js +5 -9
- package/dist/idjiArtiklovKiImajoLahkoZalogo.js.map +1 -1
- package/dist/index.d.ts +6 -11
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +60 -139
- package/dist/index.js.map +1 -1
- package/dist/izracunajNovoMaloprodajnoCeno.d.ts +1 -1
- package/dist/izracunajNovoMaloprodajnoCeno.d.ts.map +1 -1
- package/dist/izracunajNovoMaloprodajnoCeno.js +1 -5
- package/dist/izracunajNovoMaloprodajnoCeno.js.map +1 -1
- package/dist/karticaArtikla.js +11 -15
- package/dist/karticaArtikla.js.map +1 -1
- package/dist/koledar.js +7 -11
- package/dist/koledar.js.map +1 -1
- package/dist/lahkoImaZalogo.js +1 -5
- package/dist/lahkoImaZalogo.js.map +1 -1
- package/dist/maint/nastaviNbcArtiklomIzMpc.js +5 -9
- package/dist/maint/nastaviNbcArtiklomIzMpc.js.map +1 -1
- package/dist/maint/poknjiziVsoZgodovino.js +20 -28
- package/dist/maint/poknjiziVsoZgodovino.js.map +1 -1
- package/dist/maint/popraviNabaveCeneNaRacunih.js +7 -13
- package/dist/maint/popraviNabaveCeneNaRacunih.js.map +1 -1
- package/dist/maint/popraviNabavneCeneNaInventurah.js +11 -15
- package/dist/maint/popraviNabavneCeneNaInventurah.js.map +1 -1
- package/dist/models/Serijske.js +1 -2
- package/dist/models/Serijske.js.map +1 -1
- package/dist/models/SmsOddaja.js +1 -2
- package/dist/neuporabljeno.d.ts +0 -1
- package/dist/neuporabljeno.d.ts.map +1 -1
- package/dist/neuporabljeno.js +5 -10
- package/dist/neuporabljeno.js.map +1 -1
- package/dist/polnaInventura.js +16 -24
- package/dist/polnaInventura.js.map +1 -1
- package/dist/preracunajPostavkoBlagovnice.js +15 -23
- package/dist/preracunajPostavkoBlagovnice.js.map +1 -1
- package/dist/preracunajZalogo.d.ts +2 -2
- package/dist/preracunajZalogo.js +14 -21
- package/dist/preracunajZalogo.js.map +1 -1
- package/dist/prisotnostOsebe.js +1 -2
- package/dist/q-blagovnice.js +6 -13
- package/dist/q-blagovnice.js.map +1 -1
- package/dist/q-isciPoObravnavah.js +9 -17
- package/dist/q-isciPoObravnavah.js.map +1 -1
- package/dist/q-isciPoRacunih.d.ts +0 -1
- package/dist/q-isciPoRacunih.d.ts.map +1 -1
- package/dist/q-isciPoRacunih.js +9 -17
- package/dist/q-isciPoRacunih.js.map +1 -1
- package/dist/q-mojPromet.js +8 -12
- package/dist/q-mojPromet.js.map +1 -1
- package/dist/q-porabaZdravil.js +13 -20
- package/dist/q-porabaZdravil.js.map +1 -1
- package/dist/q-prodano.js +8 -12
- package/dist/q-prodano.js.map +1 -1
- package/dist/q-prodanoPorabljeno.js +5 -9
- package/dist/q-prodanoPorabljeno.js.map +1 -1
- package/dist/q-promet.d.ts +2 -2
- package/dist/q-promet.js +8 -15
- package/dist/q-promet.js.map +1 -1
- package/dist/q-racunovodji.d.ts +0 -1
- package/dist/q-racunovodji.d.ts.map +1 -1
- package/dist/q-racunovodji.js +17 -29
- package/dist/q-racunovodji.js.map +1 -1
- package/dist/q-skupineIzdelkov.js +8 -11
- package/dist/q-skupineIzdelkov.js.map +1 -1
- package/dist/q-skupineStrank.js +6 -9
- package/dist/q-skupineStrank.js.map +1 -1
- package/dist/q-strankeKlasificiraj.d.ts +1 -1
- package/dist/q-strankeKlasificiraj.d.ts.map +1 -1
- package/dist/q-strankeKlasificiraj.js +6 -12
- package/dist/q-strankeKlasificiraj.js.map +1 -1
- package/dist/q-strankeZadnjiObiski.js +5 -10
- package/dist/q-strankeZadnjiObiski.js.map +1 -1
- package/dist/q-zakljucek-blagajne.js +9 -15
- package/dist/q-zakljucek-blagajne.js.map +1 -1
- package/dist/razknjiziBlagovnico.d.ts +1 -1
- package/dist/razknjiziBlagovnico.d.ts.map +1 -1
- package/dist/razknjiziBlagovnico.js +5 -9
- package/dist/razknjiziBlagovnico.js.map +1 -1
- package/dist/razknjiziDobavnico.d.ts +1 -2
- package/dist/razknjiziDobavnico.d.ts.map +1 -1
- package/dist/razknjiziDobavnico.js +3 -7
- package/dist/razknjiziDobavnico.js.map +1 -1
- package/dist/razpisiDatum.js +2 -7
- package/dist/razpisiDatum.js.map +1 -1
- package/dist/round.js +1 -5
- package/dist/round.js.map +1 -1
- package/dist/serije.d.ts +1 -3
- package/dist/serije.d.ts.map +1 -1
- package/dist/serije.js +9 -19
- package/dist/serije.js.map +1 -1
- package/dist/smsCepljen.d.ts +1 -12
- package/dist/smsCepljen.d.ts.map +1 -1
- package/dist/smsCepljen.js +5 -9
- package/dist/smsCepljen.js.map +1 -1
- package/dist/smsCepljenjaNaDan.d.ts +1 -12
- package/dist/smsCepljenjaNaDan.d.ts.map +1 -1
- package/dist/smsCepljenjaNaDan.js +10 -17
- package/dist/smsCepljenjaNaDan.js.map +1 -1
- package/dist/smsCepljenjeBesedilo.d.ts +5 -5
- package/dist/smsCepljenjeBesedilo.js +4 -8
- package/dist/smsCepljenjeBesedilo.js.map +1 -1
- package/dist/smsMenjave.js +5 -12
- package/dist/smsMenjave.js.map +1 -1
- package/dist/smsNarocen.d.ts +1 -12
- package/dist/smsNarocen.d.ts.map +1 -1
- package/dist/smsNarocen.js +5 -9
- package/dist/smsNarocen.js.map +1 -1
- package/dist/smsNarocenBesedilo.d.ts +5 -5
- package/dist/smsNarocenBesedilo.js +4 -8
- package/dist/smsNarocenBesedilo.js.map +1 -1
- package/dist/smsNaroceniNaDan.d.ts +1 -11
- package/dist/smsNaroceniNaDan.d.ts.map +1 -1
- package/dist/smsNaroceniNaDan.js +11 -18
- package/dist/smsNaroceniNaDan.js.map +1 -1
- package/dist/spremembaZalogeZaObdobje.js +16 -23
- package/dist/spremembaZalogeZaObdobje.js.map +1 -1
- package/dist/spremeniZalogo.js +29 -40
- package/dist/spremeniZalogo.js.map +1 -1
- package/dist/spremeniZalogoNaPodlagiRacuna.js +17 -23
- package/dist/spremeniZalogoNaPodlagiRacuna.js.map +1 -1
- package/dist/spremeniZalogoZaDobavo.js +28 -34
- package/dist/spremeniZalogoZaDobavo.js.map +1 -1
- package/dist/spremeniZalogoZaInventuro.js +22 -28
- package/dist/spremeniZalogoZaInventuro.js.map +1 -1
- package/dist/spremeniZalogoZaPorabo.js +10 -17
- package/dist/spremeniZalogoZaPorabo.js.map +1 -1
- package/dist/spremeniZalogoZaPrenos.js +15 -22
- package/dist/spremeniZalogoZaPrenos.js.map +1 -1
- package/dist/strankaInfo.d.ts +1 -3
- package/dist/strankaInfo.d.ts.map +1 -1
- package/dist/strankaInfo.js +4 -7
- package/dist/strankaInfo.js.map +1 -1
- package/dist/support/poisciSpremembeMpc.js +5 -12
- package/dist/support/poisciSpremembeMpc.js.map +1 -1
- package/dist/test/dvojne-dobave.js +6 -8
- package/dist/test/dvojne-dobave.js.map +1 -1
- package/dist/test/memdb.js +15 -17
- package/dist/test/memdb.js.map +1 -1
- package/dist/test/mesane-enote.js +8 -10
- package/dist/test/mesane-enote.js.map +1 -1
- package/dist/test/prestavitev.js +18 -20
- package/dist/test/prestavitev.js.map +1 -1
- package/dist/test/serijske.js +36 -38
- package/dist/test/serijske.js.map +1 -1
- package/dist/test/sprememba-cene.js +25 -27
- package/dist/test/sprememba-cene.js.map +1 -1
- package/dist/test/sprememba-cene2.js +18 -20
- package/dist/test/sprememba-cene2.js.map +1 -1
- package/dist/test/sprememba-cene3.js +18 -20
- package/dist/test/sprememba-cene3.js.map +1 -1
- package/dist/test/sprememba-cene4.js +14 -16
- package/dist/test/sprememba-cene4.js.map +1 -1
- package/dist/test/sprememba-cene5.js +14 -16
- package/dist/test/sprememba-cene5.js.map +1 -1
- package/dist/test/sprememba-cene6.js +22 -24
- package/dist/test/sprememba-cene6.js.map +1 -1
- package/dist/test/tuja-zaloga.js +19 -21
- package/dist/test/tuja-zaloga.js.map +1 -1
- package/dist/test/zaloge.js +60 -61
- package/dist/test/zaloge.js.map +1 -1
- package/dist/test/zaloge2.js +21 -23
- package/dist/test/zaloge2.js.map +1 -1
- package/dist/types/CommandForDevice.js +1 -2
- package/dist/types/Dobavnica.js +1 -2
- package/dist/types/GlavaDokumenta.js +1 -2
- package/dist/types/Obvestilo.js +1 -2
- package/dist/types/SpecifikacijaNeuporabljenega.js +1 -2
- package/dist/types/SpecifikacijaPolneInventure.js +1 -2
- package/dist/types/SpremembaCene.js +1 -2
- package/dist/types/VrstaRazknjizbeZdravila.js +1 -2
- package/dist/types/VrstaSpremembeZaloge.js +1 -2
- package/dist/types/VrsteDokumentov.js +1 -2
- package/dist/types/VrsteDokumentov.js.map +1 -1
- package/dist/types/ZalogaDbAccessor.js +1 -2
- package/dist/types/artikel.js +5 -13
- package/dist/types/artikel.js.map +1 -1
- package/dist/types/blagajna.js +1 -2
- package/dist/types/blagovnica.js +1 -2
- package/dist/types/cepljenje.js +1 -2
- package/dist/types/diagnoza.js +1 -2
- package/dist/types/enota.js +2 -5
- package/dist/types/enota.js.map +1 -1
- package/dist/types/karence.js +1 -2
- package/dist/types/lokacija.js +1 -2
- package/dist/types/nalepka.js +1 -2
- package/dist/types/naprava.js +1 -2
- package/dist/types/narocen.js +1 -2
- package/dist/types/naslov.js +1 -2
- package/dist/types/nastavitve.js +1 -2
- package/dist/types/obravnava.js +2 -5
- package/dist/types/obravnava.js.map +1 -1
- package/dist/types/pacient.js +1 -2
- package/dist/types/partnerji.js +1 -2
- package/dist/types/partnerji.js.map +1 -1
- package/dist/types/pasma.js +1 -2
- package/dist/types/podpis.js +1 -2
- package/dist/types/poslovalnica.js +1 -2
- package/dist/types/protokol.js +1 -2
- package/dist/types/racun.js +1 -2
- package/dist/types/shared.js +1 -2
- package/dist/types/skladisce.js +1 -2
- package/dist/types/stranka.js +1 -2
- package/dist/types/uporabnik.js +1 -2
- package/dist/types/vrsta.js +1 -2
- package/dist/types/vrstaObravnave.js +1 -2
- package/dist/types/zaloga.js +1 -2
- package/dist/vrsteDokumentov.js +5 -8
- package/dist/vrsteDokumentov.js.map +1 -1
- package/dist/vsotaDobavZaObdobje.d.ts +1 -1
- package/dist/vsotaDobavZaObdobje.d.ts.map +1 -1
- package/dist/vsotaDobavZaObdobje.js +8 -15
- package/dist/vsotaDobavZaObdobje.js.map +1 -1
- package/dist/zakljuciBlagovnico.d.ts +1 -2
- package/dist/zakljuciBlagovnico.d.ts.map +1 -1
- package/dist/zakljuciBlagovnico.js +6 -10
- package/dist/zakljuciBlagovnico.js.map +1 -1
- package/dist/zalogaDbAccessorInMem.js +9 -15
- package/dist/zalogaDbAccessorInMem.js.map +1 -1
- package/dist/zalogaNaDan.d.ts +0 -1
- package/dist/zalogaNaDan.d.ts.map +1 -1
- package/dist/zalogaNaDan.js +8 -15
- package/dist/zalogaNaDan.js.map +1 -1
- package/dist/zalogaNaDanIzracunana.js +8 -15
- package/dist/zalogaNaDanIzracunana.js.map +1 -1
- package/dist/zalogaPoDnevih.js +7 -14
- package/dist/zalogaPoDnevih.js.map +1 -1
- package/dist/zapisiZalogoPoDnevih.js +8 -15
- package/dist/zapisiZalogoPoDnevih.js.map +1 -1
- package/dist/zbrisiZalogoArtiklovKiJeNeMorejoImeti.js +6 -10
- package/dist/zbrisiZalogoArtiklovKiJeNeMorejoImeti.js.map +1 -1
- package/dist/zeleniPribitek.js +1 -5
- package/dist/zeleniPribitek.js.map +1 -1
- package/package.json +2 -1
- package/tsconfig.tsbuildinfo +1 -1
package/dist/polnaInventura.js
CHANGED
@@ -1,17 +1,11 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
};
|
5
|
-
|
6
|
-
exports.zakljucekPolneInventureSestaviInZapisi = exports.zakljucekPolneInventure = void 0;
|
7
|
-
const bson_objectid_1 = __importDefault(require("bson-objectid"));
|
8
|
-
const cry_db_1 = require("cry-db");
|
9
|
-
const cry_helpers_1 = require("cry-helpers");
|
10
|
-
const razpisiDatum_1 = require("./razpisiDatum");
|
11
|
-
const dayjs_1 = __importDefault(require("./dayjs"));
|
1
|
+
import ObjectID from "bson-objectid";
|
2
|
+
import { Mongo, Repo } from "cry-db";
|
3
|
+
import { arrayToObject, inBatches } from "cry-helpers";
|
4
|
+
import { razpisiDatum } from "./razpisiDatum";
|
5
|
+
import dayjs from "./dayjs";
|
12
6
|
const POSTAVK_NA_INVENTURO = 100;
|
13
|
-
async function zakljucekPolneInventure({ tenant, od, razknjizba, skladisce_id, server, izvedel, izlociTisteBrezZaloge, postavkNaList }) {
|
14
|
-
let mongo = new
|
7
|
+
export async function zakljucekPolneInventure({ tenant, od, razknjizba, skladisce_id, server, izvedel, izlociTisteBrezZaloge, postavkNaList }) {
|
8
|
+
let mongo = new Mongo(tenant, server);
|
15
9
|
mongo.setAudit({ tenant, app: "logic/zakljucekPolneInventure" });
|
16
10
|
try {
|
17
11
|
let ret = await _zakljucekPolneInventure(mongo, { tenant, od, razknjizba, skladisce_id, izvedel, izlociTisteBrezZaloge, postavkNaList });
|
@@ -24,13 +18,12 @@ async function zakljucekPolneInventure({ tenant, od, razknjizba, skladisce_id, s
|
|
24
18
|
throw err;
|
25
19
|
}
|
26
20
|
}
|
27
|
-
exports.zakljucekPolneInventure = zakljucekPolneInventure;
|
28
21
|
async function _zakljucekPolneInventure(mongo, { tenant, od, razknjizba, skladisce_id, izvedel, izlociTisteBrezZaloge, postavkNaList }) {
|
29
22
|
let skladisce = await mongo.findById("skladisca", skladisce_id);
|
30
23
|
if (!skladisce)
|
31
24
|
throw new Error(`zakljucekPolneInventure: skladisce ${skladisce_id} ne obstaja v bazi ${tenant}.`);
|
32
25
|
let kandidati = await mongo.find("artikli", { kategorija: { $in: ["izdelek", "zdravilo"] } });
|
33
|
-
let zaloge =
|
26
|
+
let zaloge = arrayToObject(await mongo.find("zaloga", { skladisce_id }), "artikel_id");
|
34
27
|
let idji_popisanih = new Set((await mongo.aggregate("blagovnice", [
|
35
28
|
{ $match: {
|
36
29
|
vrsta: "inventura",
|
@@ -72,8 +65,8 @@ async function _zakljucekPolneInventure(mongo, { tenant, od, razknjizba, skladis
|
|
72
65
|
if (izlociTisteBrezZaloge)
|
73
66
|
postavke = postavke.filter(p => p.kolicinaPrej !== 0);
|
74
67
|
// uredi postavke po dobaviteljih
|
75
|
-
let partnerji =
|
76
|
-
let artikli =
|
68
|
+
let partnerji = arrayToObject(await mongo.findAll("partnerji", {}, { project: { firma: 1, ime: 1, priimek: 1 } }), "_id");
|
69
|
+
let artikli = arrayToObject(await mongo.findAll("artikli", { kategorija: { $in: ["izdelek", "zdravilo"] } }, { project: { zadnjiDobavitelj: 1 } }), "_id");
|
77
70
|
postavke.forEach(p => {
|
78
71
|
let d = partnerji[(artikli[p.artikel_id]?.zadnjiDobavitelj) || ""];
|
79
72
|
if (d)
|
@@ -85,30 +78,30 @@ async function _zakljucekPolneInventure(mongo, { tenant, od, razknjizba, skladis
|
|
85
78
|
postavkNaList = postavkNaList || POSTAVK_NA_INVENTURO;
|
86
79
|
let listi = [];
|
87
80
|
let n = 0;
|
88
|
-
for (let list of
|
81
|
+
for (let list of inBatches(postavke, postavkNaList)) {
|
89
82
|
let inventurniList = {
|
90
83
|
vrsta: "inventura",
|
91
84
|
status: "odprta",
|
92
|
-
_id: new
|
85
|
+
_id: new ObjectID().toHexString(),
|
93
86
|
skladisce_id: skladisce?._id,
|
94
87
|
lokacija_id: skladisce?.lokacija_id,
|
95
88
|
datum: new Date(),
|
96
89
|
zapSt: "SEQ_NEXT",
|
97
90
|
izvedel,
|
98
|
-
opomba: `nepopisani (${++n}) med ${(
|
91
|
+
opomba: `nepopisani (${++n}) med ${dayjs(od).format("D.M.YYYY")} in ${dayjs().format("D.M.YYYY HH:mm")}`,
|
99
92
|
postavke: list,
|
100
93
|
dav: 0,
|
101
94
|
nbc: 0,
|
102
95
|
davki: [],
|
103
|
-
...
|
96
|
+
...razpisiDatum(new Date()),
|
104
97
|
};
|
105
98
|
listi.push(inventurniList);
|
106
99
|
}
|
107
100
|
return listi;
|
108
101
|
}
|
109
|
-
async function zakljucekPolneInventureSestaviInZapisi({ tenant, od, razknjizba, skladisce_id, server, izvedel, izlociTisteBrezZaloge, postavkNaList }) {
|
102
|
+
export async function zakljucekPolneInventureSestaviInZapisi({ tenant, od, razknjizba, skladisce_id, server, izvedel, izlociTisteBrezZaloge, postavkNaList }) {
|
110
103
|
let listi = await zakljucekPolneInventure({ tenant, od, razknjizba, skladisce_id, server, izvedel, izlociTisteBrezZaloge, postavkNaList });
|
111
|
-
let repo = new
|
104
|
+
let repo = new Repo("odprteBlagovnice", tenant, server);
|
112
105
|
repo.setAudit({ tenant, app: "logic/zakljucekPolneInventureSestaviInZapisi" });
|
113
106
|
repo.useRevisions(true);
|
114
107
|
for await (let list of listi) {
|
@@ -117,7 +110,6 @@ async function zakljucekPolneInventureSestaviInZapisi({ tenant, od, razknjizba,
|
|
117
110
|
await repo.close();
|
118
111
|
return listi;
|
119
112
|
}
|
120
|
-
exports.zakljucekPolneInventureSestaviInZapisi = zakljucekPolneInventureSestaviInZapisi;
|
121
113
|
// (async function name() {
|
122
114
|
// let i = await zakljucekPolneInventure({
|
123
115
|
// tenant: "vet",
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"polnaInventura.js","sourceRoot":"","sources":["../src/polnaInventura.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"polnaInventura.js","sourceRoot":"","sources":["../src/polnaInventura.ts"],"names":[],"mappings":"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"}
|
@@ -1,8 +1,5 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
exports.izracunajSestevkeDobave = exports.izracunajSestevkeBlagovniceRazenDobave = exports.izracunajDavkeBlagovnice = exports.preracunajPostavkoBlagovniceRazenDobave = exports.preracunajPostavkoDobave = void 0;
|
4
|
-
const cry_helpers_1 = require("cry-helpers");
|
5
|
-
function preracunajPostavkoDobave(postavka) {
|
1
|
+
import { round2 } from "cry-helpers";
|
2
|
+
export function preracunajPostavkoDobave(postavka) {
|
6
3
|
postavka.nbcN = postavka.rbt
|
7
4
|
? (postavka.nbc0 * (1 - (postavka.rbt || 0)))
|
8
5
|
: postavka.nbc0;
|
@@ -10,45 +7,40 @@ function preracunajPostavkoDobave(postavka) {
|
|
10
7
|
postavka.tdav = postavka.nbcN * postavka.dst * postavka.kolicina;
|
11
8
|
postavka.tnbc = postavka.nbcN * postavka.kolicina;
|
12
9
|
}
|
13
|
-
|
14
|
-
function preracunajPostavkoBlagovniceRazenDobave(postavka) {
|
10
|
+
export function preracunajPostavkoBlagovniceRazenDobave(postavka) {
|
15
11
|
postavka.tnbc = postavka.nbc * postavka.kolicina;
|
16
12
|
postavka.tdav = postavka.nbc * postavka.kolicina * postavka.dst;
|
17
13
|
}
|
18
|
-
|
19
|
-
function izracunajDavkeBlagovnice(postavke) {
|
14
|
+
export function izracunajDavkeBlagovnice(postavke) {
|
20
15
|
let d = [];
|
21
16
|
Object.values(postavke).forEach(p => {
|
22
17
|
d[p.dst] = d[p.dst] || { davek: 0, osnova: 0, dst: p.dst };
|
23
|
-
d[p.dst].osnova =
|
18
|
+
d[p.dst].osnova = round2(d[p.dst].osnova + round2(p.tnbc));
|
24
19
|
});
|
25
|
-
Object.values(d).forEach(x => x.davek =
|
20
|
+
Object.values(d).forEach(x => x.davek = round2(x.osnova * x.dst));
|
26
21
|
return Object.values(d);
|
27
22
|
}
|
28
|
-
|
29
|
-
function izracunajSestevkeBlagovniceRazenDobave(postavke) {
|
23
|
+
export function izracunajSestevkeBlagovniceRazenDobave(postavke) {
|
30
24
|
let d = { nbc: 0, pop: 0, dav: 0, prc: 0, davki: [] };
|
31
25
|
Object.values(postavke).forEach(p => {
|
32
|
-
d.pop =
|
33
|
-
d.nbc =
|
26
|
+
d.pop = round2(d.pop + 0);
|
27
|
+
d.nbc = round2(d.nbc + round2(p.nbc * p.kolicina));
|
34
28
|
});
|
35
29
|
d.davki = izracunajDavkeBlagovnice(postavke);
|
36
30
|
d.dav = d.davki.reduce((p, c) => p + c.davek, 0);
|
37
|
-
d.prc =
|
31
|
+
d.prc = round2(d.nbc + d.dav);
|
38
32
|
return d;
|
39
33
|
}
|
40
|
-
|
41
|
-
function izracunajSestevkeDobave(postavke) {
|
34
|
+
export function izracunajSestevkeDobave(postavke) {
|
42
35
|
let d = { nbc0: 0, nbc: 0, pop: 0, dav: 0, prc: 0, davki: [] };
|
43
36
|
Object.values(postavke).forEach(p => {
|
44
|
-
d.nbc0 =
|
45
|
-
d.nbc =
|
46
|
-
d.pop =
|
37
|
+
d.nbc0 = round2(d.nbc0 + round2(p.nbc0 * p.kolicina));
|
38
|
+
d.nbc = round2(d.nbc + round2(p.nbcN * p.kolicina));
|
39
|
+
d.pop = round2(d.pop + round2(p.nbc0 * p.rbt * p.kolicina));
|
47
40
|
});
|
48
41
|
d.davki = izracunajDavkeBlagovnice(postavke);
|
49
42
|
d.dav = d.davki.reduce((p, c) => p + c.davek, 0);
|
50
|
-
d.prc =
|
43
|
+
d.prc = round2(d.nbc + d.dav);
|
51
44
|
return d;
|
52
45
|
}
|
53
|
-
exports.izracunajSestevkeDobave = izracunajSestevkeDobave;
|
54
46
|
//# sourceMappingURL=preracunajPostavkoBlagovnice.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"preracunajPostavkoBlagovnice.js","sourceRoot":"","sources":["../src/preracunajPostavkoBlagovnice.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"preracunajPostavkoBlagovnice.js","sourceRoot":"","sources":["../src/preracunajPostavkoBlagovnice.ts"],"names":[],"mappings":"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"}
|
@@ -58,7 +58,7 @@ export declare function preracunajNabavo(preracun: {
|
|
58
58
|
stara_nbc: number;
|
59
59
|
nova_nbc: number;
|
60
60
|
}): {
|
61
|
-
vrstaSpremembe:
|
61
|
+
vrstaSpremembe: any;
|
62
62
|
nbc: {
|
63
63
|
stara: number;
|
64
64
|
nova: number;
|
@@ -94,7 +94,7 @@ declare function preracunajZalogoKolicinsko(preracun: {
|
|
94
94
|
};
|
95
95
|
};
|
96
96
|
declare function preracunajZalogoObNabavi(preracun: PodatkiPreracunaZalogeSZprememboCene): {
|
97
|
-
vrstaSpremembe:
|
97
|
+
vrstaSpremembe: any;
|
98
98
|
nbc: {
|
99
99
|
stara: number;
|
100
100
|
nova: number;
|
package/dist/preracunajZalogo.js
CHANGED
@@ -1,37 +1,32 @@
|
|
1
|
-
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.vpisiSprememboZalogePoNabavi = exports.vpisiSprememboZaloge = exports.preracunajNabavo = exports.preracunajInventuro = exports.preracunajPorabo = void 0;
|
1
|
+
import { VrstaSpremembeZaloge } from "./types/VrstaSpremembeZaloge";
|
4
2
|
let round = (num, to = 6) => Number(Number(num || 0).toFixed(to));
|
5
|
-
function preracunajPorabo(preracun) {
|
6
|
-
preracun.vrstaSpremembe = preracun.vrstaSpremembe ||
|
3
|
+
export function preracunajPorabo(preracun) {
|
4
|
+
preracun.vrstaSpremembe = preracun.vrstaSpremembe || VrstaSpremembeZaloge.PORABA;
|
7
5
|
return preracunajZalogoKolicinsko(preracun);
|
8
6
|
}
|
9
|
-
|
10
|
-
|
11
|
-
preracun.vrstaSpremembe = 0 /* VrstaSpremembeZaloge.NASTAVI */;
|
7
|
+
export function preracunajInventuro(preracun) {
|
8
|
+
preracun.vrstaSpremembe = VrstaSpremembeZaloge.NASTAVI;
|
12
9
|
return preracunajZalogoKolicinsko(preracun);
|
13
10
|
}
|
14
|
-
|
15
|
-
|
16
|
-
preracun.vrstaSpremembe = 1 /* VrstaSpremembeZaloge.NABAVA */;
|
11
|
+
export function preracunajNabavo(preracun) {
|
12
|
+
preracun.vrstaSpremembe = VrstaSpremembeZaloge.NABAVA;
|
17
13
|
return preracunajZalogoObNabavi(preracun);
|
18
14
|
}
|
19
|
-
exports.preracunajNabavo = preracunajNabavo;
|
20
15
|
function preracunajZalogoKolicinsko(preracun) {
|
21
16
|
let { vrstaSpremembe, zaloga, kolicina, stara_nbc } = preracun;
|
22
17
|
let stara_zaloga = zaloga.zaloga;
|
23
18
|
let nova_zaloga;
|
24
19
|
let spremeba_zaloge;
|
25
20
|
switch (vrstaSpremembe) {
|
26
|
-
case
|
21
|
+
case VrstaSpremembeZaloge.PORABA:
|
27
22
|
spremeba_zaloge = -kolicina;
|
28
23
|
nova_zaloga = stara_zaloga + spremeba_zaloge;
|
29
24
|
break;
|
30
|
-
case
|
25
|
+
case VrstaSpremembeZaloge.NABAVA:
|
31
26
|
spremeba_zaloge = kolicina;
|
32
27
|
nova_zaloga = stara_zaloga + spremeba_zaloge;
|
33
28
|
break;
|
34
|
-
case
|
29
|
+
case VrstaSpremembeZaloge.NASTAVI:
|
35
30
|
spremeba_zaloge = kolicina - stara_zaloga;
|
36
31
|
nova_zaloga = kolicina;
|
37
32
|
break;
|
@@ -39,7 +34,7 @@ function preracunajZalogoKolicinsko(preracun) {
|
|
39
34
|
let stara_vrednost_zaloge = round(zaloga.vrednost);
|
40
35
|
let sprememba_vrednosti_zaloge = round(stara_nbc * spremeba_zaloge);
|
41
36
|
let nova_vrednost_zaloge = round(zaloga.vrednost + sprememba_vrednosti_zaloge);
|
42
|
-
if (vrstaSpremembe ===
|
37
|
+
if (vrstaSpremembe === VrstaSpremembeZaloge.NASTAVI) {
|
43
38
|
nova_vrednost_zaloge = round(nova_zaloga * stara_nbc);
|
44
39
|
sprememba_vrednosti_zaloge = round(nova_vrednost_zaloge - stara_vrednost_zaloge);
|
45
40
|
}
|
@@ -70,7 +65,7 @@ function preracunajZalogoObNabavi(preracun) {
|
|
70
65
|
let sprememba_vrednosti_zaloge = nova_nbc * sprememba_zaloge;
|
71
66
|
let nova_vrednost_zaloge = stara_vrednost_zaloge + sprememba_vrednosti_zaloge;
|
72
67
|
let preracunana_nova_nbc = stara_nbc;
|
73
|
-
if (vrstaSpremembe ===
|
68
|
+
if (vrstaSpremembe === VrstaSpremembeZaloge.NABAVA) {
|
74
69
|
if (nova_vrednost_zaloge > .1 && nova_zaloga > .1 && stara_zaloga > .1) {
|
75
70
|
preracunana_nova_nbc = nova_vrednost_zaloge / nova_zaloga;
|
76
71
|
preracunana_nova_nbc = Math.abs(preracunana_nova_nbc);
|
@@ -94,17 +89,15 @@ function preracunajZalogoObNabavi(preracun) {
|
|
94
89
|
}
|
95
90
|
};
|
96
91
|
}
|
97
|
-
function vpisiSprememboZaloge(zaloga, sprememba) {
|
92
|
+
export function vpisiSprememboZaloge(zaloga, sprememba) {
|
98
93
|
zaloga.vrednost = sprememba.vrednostZaloge.nova;
|
99
94
|
zaloga.zaloga = sprememba.zaloga.nova;
|
100
95
|
return zaloga;
|
101
96
|
}
|
102
|
-
|
103
|
-
function vpisiSprememboZalogePoNabavi(zaloga, sprememba) {
|
97
|
+
export function vpisiSprememboZalogePoNabavi(zaloga, sprememba) {
|
104
98
|
zaloga.vrednost = sprememba.vrednostZaloge.nova;
|
105
99
|
zaloga.zaloga = sprememba.zaloga.nova;
|
106
100
|
zaloga.nbc = sprememba.nbc.nova;
|
107
101
|
return zaloga;
|
108
102
|
}
|
109
|
-
exports.vpisiSprememboZalogePoNabavi = vpisiSprememboZalogePoNabavi;
|
110
103
|
//# sourceMappingURL=preracunajZalogo.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"preracunajZalogo.js","sourceRoot":"","sources":["../src/preracunajZalogo.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"preracunajZalogo.js","sourceRoot":"","sources":["../src/preracunajZalogo.ts"],"names":[],"mappings":"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"}
|
package/dist/prisotnostOsebe.js
CHANGED
package/dist/q-blagovnice.js
CHANGED
@@ -1,25 +1,18 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
exports.poisciBlagovnice = void 0;
|
7
|
-
const cry_db_1 = require("cry-db");
|
8
|
-
const dayjs_1 = __importDefault(require("./dayjs"));
|
9
|
-
async function poisciBlagovnice(spec) {
|
10
|
-
let odDne = (0, dayjs_1.default)(spec.odDne).startOf("day").toDate();
|
11
|
-
let doDne = (0, dayjs_1.default)(spec.doDne).endOf("day").toDate();
|
1
|
+
import { Repo } from "cry-db";
|
2
|
+
import dayjs from "./dayjs";
|
3
|
+
export async function poisciBlagovnice(spec) {
|
4
|
+
let odDne = dayjs(spec.odDne).startOf("day").toDate();
|
5
|
+
let doDne = dayjs(spec.doDne).endOf("day").toDate();
|
12
6
|
let query = { datum: { $gte: odDne, $lt: doDne } };
|
13
7
|
if (spec.skladisca?.length)
|
14
8
|
query.skladisce_id = { $in: spec.skladisca };
|
15
9
|
if (spec.vrste?.length)
|
16
10
|
query.vrsta = { $in: spec.vrste };
|
17
|
-
let repo = new
|
11
|
+
let repo = new Repo("blagovnice", spec.tenant);
|
18
12
|
let ret = await repo.find(query, { sort: { datum: -1 } });
|
19
13
|
await repo.close();
|
20
14
|
return ret;
|
21
15
|
}
|
22
|
-
exports.poisciBlagovnice = poisciBlagovnice;
|
23
16
|
// (async function() {
|
24
17
|
// console.time('aggregation')
|
25
18
|
// let res = await poisciBlagovnice({
|
package/dist/q-blagovnice.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"q-blagovnice.js","sourceRoot":"","sources":["../src/q-blagovnice.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"q-blagovnice.js","sourceRoot":"","sources":["../src/q-blagovnice.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,SAAS,CAAC;AAU5B,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,IAAsB;IAEzD,IAAI,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC;IACtD,IAAI,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC;IAEpD,IAAI,KAAK,GAAwB,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC;IACxE,IAAI,IAAI,CAAC,SAAS,EAAE,MAAM;QAAE,KAAK,CAAC,YAAY,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,EAAE,CAAA;IACxE,IAAI,IAAI,CAAC,KAAK,EAAE,MAAM;QAAE,KAAK,CAAC,KAAK,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,CAAA;IAEzD,IAAI,IAAI,GAAG,IAAI,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IAC9C,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IACzD,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;IACnB,OAAO,GAAG,CAAA;AACd,CAAC;AAED,uBAAuB;AACvB,kCAAkC;AAElC,yCAAyC;AACzC,yBAAyB;AACzB,uDAAuD;AACvD,WAAW;AACX,8BAA8B;AAG9B,sBAAsB;AACtB,QAAQ"}
|
@@ -1,14 +1,8 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
-
};
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
-
exports.createCsv = exports.execPipeline = exports.createAggregationPipeline = void 0;
|
7
|
-
const assert_1 = __importDefault(require("assert"));
|
8
|
-
const cry_helpers_1 = require("cry-helpers");
|
1
|
+
import assert from 'assert';
|
2
|
+
import { Log } from 'cry-helpers';
|
9
3
|
const Repo = require('cry-db').Repo;
|
10
|
-
|
11
|
-
let log = new
|
4
|
+
import { performance } from 'perf_hooks';
|
5
|
+
let log = new Log(['KLIKVET', 'KLIKVET-RACUNI']);
|
12
6
|
/**
|
13
7
|
* Sestavi aggregation pipeline za iskanje po računih
|
14
8
|
* @param {Object} parametri iskanja
|
@@ -68,23 +62,22 @@ limit = 1000, }) {
|
|
68
62
|
log.trace("aggregation pipeline created", res);
|
69
63
|
return res;
|
70
64
|
}
|
71
|
-
exports.createAggregationPipeline = createAggregationPipeline;
|
72
65
|
/**
|
73
66
|
* Izvede aggregation pipeline za iskanje po računihrouter.mode
|
74
67
|
* @param {array} pipeline
|
75
68
|
* @param {string} tenant
|
76
69
|
*/
|
77
70
|
async function execPipeline(tenant, pipeline) {
|
78
|
-
(
|
79
|
-
(
|
71
|
+
assert(tenant);
|
72
|
+
assert(pipeline);
|
80
73
|
log.trace("Exec pipeline for tenant", tenant, pipeline);
|
81
74
|
for (let stage of pipeline)
|
82
75
|
log.trace(" ... stage ", stage);
|
83
76
|
let repo = new Repo('obravnave', tenant);
|
84
77
|
try {
|
85
|
-
let start =
|
78
|
+
let start = performance.now();
|
86
79
|
let ret = await repo.aggregate(pipeline);
|
87
|
-
let end =
|
80
|
+
let end = performance.now();
|
88
81
|
await repo.close();
|
89
82
|
return {
|
90
83
|
ok: true,
|
@@ -100,7 +93,6 @@ async function execPipeline(tenant, pipeline) {
|
|
100
93
|
};
|
101
94
|
}
|
102
95
|
}
|
103
|
-
exports.execPipeline = execPipeline;
|
104
96
|
function createCsv(ret) {
|
105
97
|
let lines = [];
|
106
98
|
if (ret.length) {
|
@@ -120,7 +112,7 @@ function createCsv(ret) {
|
|
120
112
|
}
|
121
113
|
return lines;
|
122
114
|
}
|
123
|
-
|
115
|
+
export { createAggregationPipeline, execPipeline, createCsv };
|
124
116
|
(async function () {
|
125
117
|
console.time('aggregation');
|
126
118
|
let pipeline = createAggregationPipeline({
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"q-isciPoObravnavah.js","sourceRoot":"","sources":["../src/q-isciPoObravnavah.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"q-isciPoObravnavah.js","sourceRoot":"","sources":["../src/q-isciPoObravnavah.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAClC,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,IAAI,GAAG,GAAG,IAAI,GAAG,CAAC,CAAC,SAAS,EAAC,gBAAgB,CAAC,CAAC,CAAA;AAO/C;;;GAGG;AACH,SAAS,yBAAyB,CAAC;AAE/B,WAAW;AACX,KAAK,GAAG,IAAI,GAEO;IAEnB,IAAI,QAAQ,GAAG,EAAE,CAAA;IAEjB,gCAAgC;IAChC,IAAI,IAAI,CAAC,sBAAsB,EAAE;QAC7B,kBAAkB;QAClB,iBAAiB;QACjB,2BAA2B;QAC3B,iCAAiC;QACjC,+BAA+B;QAC/B,wBAAwB;QACxB,QAAQ;QACR,MAAM;QACN,kBAAkB;QAClB,iBAAiB;QACjB,4BAA4B;QAC5B,4CAA4C;QAC5C,+BAA+B;QAC/B,wBAAwB;QACxB,QAAQ;QACR,MAAM;QACN,kBAAkB;QAClB,cAAc;QACd,eAAe;QACf,yBAAyB;QACzB,yBAAyB;QACzB,0CAA0C;QAC1C,8CAA8C;QAC9C,4CAA4C;QAC5C,4CAA4C;QAC5C,8CAA8C;QAC9C,2CAA2C;QAC3C,4CAA4C;QAC5C,2DAA2D;QAC3D,gBAAgB;QAChB,YAAY;QACZ,QAAQ;QACR,MAAM;QACN,yHAAyH;QACzH,wDAAwD;KAC3D;IAED,yIAAyI;IACzI,4CAA4C;IAC5C,GAAG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAA;IAEhC,IAAI,GAAG,GAAG;QACN,QAAQ;QACR,OAAO,EAAE;YACL,KAAK;SACR;KACJ,CAAA;IAED,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAC,GAAG,CAAC,CAAA;IAC7C,OAAO,GAAG,CAAA;AACd,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,YAAY,CAAC,MAAa,EAAC,QAAiB;IAEvD,MAAM,CAAC,MAAM,CAAC,CAAC;IACf,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEjB,GAAG,CAAC,KAAK,CAAC,0BAA0B,EAAC,MAAM,EAAC,QAAQ,CAAC,CAAA;IACrD,KAAI,IAAI,KAAK,IAAI,QAAQ;QAAE,GAAG,CAAC,KAAK,CAAC,cAAc,EAAC,KAAK,CAAC,CAAA;IAE1D,IAAI,IAAI,GAAG,IAAI,IAAI,CAAC,WAAW,EAAC,MAAM,CAAC,CAAA;IACvC,IAAI;QACA,IAAI,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAA;QAC7B,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QACxC,IAAI,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,CAAA;QAC3B,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QAEnB,OAAO;YACH,EAAE,EAAE,IAAI;YACR,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,GAAG,GAAC,KAAK;SACzB,CAAA;KACJ;IAAC,OAAM,GAAG,EAAE;QACT,GAAG,CAAC,KAAK,CAAC,wCAAwC,EAAC,GAAG,CAAC,CAAC;QAExD,OAAO;YACH,EAAE,EAAE,KAAK;YACT,KAAK,EAAE,GAAG;SACb,CAAA;KACJ;AACL,CAAC;AAED,SAAS,SAAS,CAAC,GAAO;IAEtB,IAAI,KAAK,GAAC,EAAE,CAAA;IACZ,IAAG,GAAG,CAAC,MAAM,EAAE;QACX,UAAU;QACV,IAAI,IAAI,GAAc,EAAE,CAAA;QACxB,IAAI,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACvE,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,EAAC,GAAG,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;QAC7C,YAAY;QACZ,KAAI,IAAI,IAAI,IAAI,GAAG,EAAE;YACjB,IAAI,CAAC,GAAG,EAAE,CAAA;YACV,8GAA8G;YAC9G,KAAK,IAAI,GAAG,IAAI,IAAI;gBAAE,IAAI,GAAG,IAAE,KAAK;oBAAE,CAAC,CAAC,IAAI,CAAC,GAAG,GAAC,IAAI,CAAC,GAAG,CAAC,GAAC,GAAG,CAAC,CAAA;YAC/D,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;SAC1B;KACJ;IACD,OAAO,KAAK,CAAA;AAChB,CAAC;AAED,OAAO,EACH,yBAAyB,EACzB,YAAY,EACZ,SAAS,EACZ,CAAC;AAEF,CAAC,KAAK;IACF,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAE3B,IAAI,QAAQ,GAAG,yBAAyB,CAAC;QACrC,GAAG,EAAE,QAAQ;QACb,KAAK,EAAE,CAAC;KACX,CAAC,CAAA;IAEF,KAAK,IAAI,CAAC,IAAI,QAAQ,CAAC,QAAQ;QAAE,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;IAE5E,IAAI,MAAM,GAAG,MAAM,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAA;IACzD,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IACjD,KAAI,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI;QAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;IAEjD,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAE/C,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;IAC9B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACnB,CAAC,CAAC,EAAE,CAAC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"q-isciPoRacunih.d.ts","sourceRoot":"","sources":["../src/q-isciPoRacunih.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"q-isciPoRacunih.d.ts","sourceRoot":"","sources":["../src/q-isciPoRacunih.ts"],"names":[],"mappings":"AAQA,aAAK,WAAW,GAAG,OAAO,CAAC;IACvB,KAAK,EAAE,IAAI,CAAC;IACZ,KAAK,EAAE,IAAI,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;CACjB,CAAC,CAAC;AAEH;;;GAGG;AACH,iBAAS,yBAAyB,CAAC,EAC/B,KAAK,EACL,KAAK,EACL,QAAQ,EACR,MAAM,EACN,KAAK,EACL,OAAO,EACP,OAAO,EACP,GAAG,EACH,OAAO,EACP,UAAU,EACV,eAAe,EACf,aAAa,EACb,KAAU,GACb,EAAG,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgEd;AAeD;;;;GAIG;AACH,iBAAe,YAAY,CAAC,MAAM,EAAC,MAAM,EAAC,QAAQ,EAAC,MAAM,EAAE;;;;;;;;;;GA4B1D;AAED,iBAAS,SAAS,CAAC,GAAG,EAAC,GAAG,YAiBzB;AAED,OAAO,EACH,yBAAyB,EACzB,YAAY,EACZ,SAAS,EACZ,CAAC"}
|
package/dist/q-isciPoRacunih.js
CHANGED
@@ -1,14 +1,8 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
-
};
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
-
exports.createCsv = exports.execPipeline = exports.createAggregationPipeline = void 0;
|
7
|
-
const assert_1 = __importDefault(require("assert"));
|
8
|
-
const cry_helpers_1 = require("cry-helpers");
|
1
|
+
import assert from 'assert';
|
2
|
+
import { Log } from 'cry-helpers';
|
9
3
|
const Repo = require('cry-db').Repo;
|
10
|
-
|
11
|
-
let log = new
|
4
|
+
import { performance } from 'perf_hooks';
|
5
|
+
let log = new Log(['KLIKVET', 'KLIKVET-RACUNI']);
|
12
6
|
/**
|
13
7
|
* Sestavi aggregation pipeline za iskanje po računih
|
14
8
|
* @param {Object} parametri iskanja
|
@@ -77,7 +71,6 @@ function createAggregationPipeline({ odDne, doDne, stevilka, pripis, izdal, stra
|
|
77
71
|
log.trace("aggregation pipeline created", res);
|
78
72
|
return res;
|
79
73
|
}
|
80
|
-
exports.createAggregationPipeline = createAggregationPipeline;
|
81
74
|
function prepareForRegex(x) {
|
82
75
|
return x.replace(/(\/|-|\+|\,|\s)+/g, ".*");
|
83
76
|
}
|
@@ -94,16 +87,16 @@ function toArray(x) {
|
|
94
87
|
* @param {string} tenant
|
95
88
|
*/
|
96
89
|
async function execPipeline(tenant, pipeline) {
|
97
|
-
(
|
98
|
-
(
|
90
|
+
assert(tenant);
|
91
|
+
assert(pipeline);
|
99
92
|
log.trace("Exec pipeline for tenant", tenant, pipeline);
|
100
93
|
for (let stage of pipeline)
|
101
94
|
log.trace(" ... stage ", stage);
|
102
95
|
let repo = new Repo('racuni', tenant);
|
103
96
|
try {
|
104
|
-
let start =
|
97
|
+
let start = performance.now();
|
105
98
|
let ret = await repo.aggregate(pipeline);
|
106
|
-
let end =
|
99
|
+
let end = performance.now();
|
107
100
|
await repo.close();
|
108
101
|
return {
|
109
102
|
ok: true,
|
@@ -119,7 +112,6 @@ async function execPipeline(tenant, pipeline) {
|
|
119
112
|
};
|
120
113
|
}
|
121
114
|
}
|
122
|
-
exports.execPipeline = execPipeline;
|
123
115
|
function createCsv(ret) {
|
124
116
|
let lines = [];
|
125
117
|
if (ret.length) {
|
@@ -139,7 +131,7 @@ function createCsv(ret) {
|
|
139
131
|
}
|
140
132
|
return lines;
|
141
133
|
}
|
142
|
-
|
134
|
+
export { createAggregationPipeline, execPipeline, createCsv };
|
143
135
|
// (async function() {
|
144
136
|
// console.time('aggregation')
|
145
137
|
// let pipeline = createAggregationPipeline({
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"q-isciPoRacunih.js","sourceRoot":"","sources":["../src/q-isciPoRacunih.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"q-isciPoRacunih.js","sourceRoot":"","sources":["../src/q-isciPoRacunih.ts"],"names":[],"mappings":"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"}
|
package/dist/q-mojPromet.js
CHANGED
@@ -1,10 +1,7 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
const cry_db_1 = require("cry-db");
|
6
|
-
const perf_hooks_1 = require("perf_hooks");
|
7
|
-
let log = new cry_helpers_1.Log(['KLIKVET', 'KLIKVET-PROMET']);
|
1
|
+
import { Log } from 'cry-helpers';
|
2
|
+
import { Repo } from "cry-db";
|
3
|
+
import { performance } from 'perf_hooks';
|
4
|
+
let log = new Log(['KLIKVET', 'KLIKVET-PROMET']);
|
8
5
|
function createAggregationPipeline({ odDne, doDne, stevilka, username, rounding = 0, brezDavka = false, kategorije = [], }) {
|
9
6
|
// COMPOSE PIPELINE NOW
|
10
7
|
let pipeline = [];
|
@@ -98,15 +95,14 @@ function createAggregationPipeline({ odDne, doDne, stevilka, username, rounding
|
|
98
95
|
log.trace("aggregation pipeline created", pipeline);
|
99
96
|
return { pipeline, match: match.$match };
|
100
97
|
}
|
101
|
-
exports.createAggregationPipeline = createAggregationPipeline;
|
102
98
|
async function execPipeline(pipeline, tenant) {
|
103
99
|
if (!tenant)
|
104
100
|
throw new Error("q-prodano: must specify tenant");
|
105
|
-
let repo = new
|
101
|
+
let repo = new Repo('racuni', tenant);
|
106
102
|
try {
|
107
|
-
let start =
|
103
|
+
let start = performance.now();
|
108
104
|
let ret = await repo.aggregate(pipeline);
|
109
|
-
let end =
|
105
|
+
let end = performance.now();
|
110
106
|
await repo.close();
|
111
107
|
return {
|
112
108
|
ok: true,
|
@@ -123,7 +119,7 @@ async function execPipeline(pipeline, tenant) {
|
|
123
119
|
};
|
124
120
|
}
|
125
121
|
}
|
126
|
-
|
122
|
+
export { createAggregationPipeline, execPipeline, };
|
127
123
|
// (async function() {
|
128
124
|
// console.time('aggregation')
|
129
125
|
// let pipeline = createAggregationPipeline({
|