cry-klikvet-logic 1.0.225 → 1.0.226

package/dist/karticaArtikla.mjs

@@ -1,83 +1,72 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { Mongo } from "cry-db";
 import { smerPoslovnegaDogodka } from "./vrsteDokumentov.mjs";
 import { knjiziPoEnotiNabave } from "./spremeniZalogo.mjs";
-export function karticaArtikla(_id, db, razknjizba, skladisca) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let zdruzeno = [];
-        let vrstaRazknjizbe;
-        let artikel;
-        const mongo = new Mongo(db);
-        try {
-            artikel = yield mongo.findById("artikli", _id);
-            if (!artikel) {
-                yield mongo.close();
-                return [];
-            }
-            vrstaRazknjizbe = artikel.zalogoRazknjizi || razknjizba;
-            let racuni = yield pridobiRacune(mongo, _id);
-            let blagovnice = yield pridobiBlagovnice(mongo, _id);
-            zdruzeno = [
-                ...racuni,
-                ...blagovnice
-            ];
-        }
-        catch (err) {
-            yield mongo.close();
-            console.error(`karticaArtikla: ${err.message || err}`);
+export async function karticaArtikla(_id, db, razknjizba, skladisca) {
+    let zdruzeno = [];
+    let vrstaRazknjizbe;
+    let artikel;
+    const mongo = new Mongo(db);
+    try {
+        artikel = await mongo.findById("artikli", _id);
+        if (!artikel) {
+            await mongo.close();
             return [];
         }
-        yield mongo.close();
-        zdruzeno.sort((a, b) => a.datum.valueOf() - b.datum.valueOf());
-        let zaloga = 0;
-        let vrednostZaloge = 0;
-        let nbc = 0;
-        let mpc = 0;
-        if (skladisca)
-            zdruzeno = zdruzeno.filter(d => skladisca.includes(d.skladisce_id.toString()));
-        for (let dokument of zdruzeno) {
-            let smer = smerPoslovnegaDogodka[dokument.vrsta];
-            dokument.enotaFaktor = dokument.enotaFaktor || 1;
-            // NE SPREMINJAJ VRSTNEGA REDA VRSIC!
+        vrstaRazknjizbe = artikel.zalogoRazknjizi || razknjizba;
+        let racuni = await pridobiRacune(mongo, _id);
+        let blagovnice = await pridobiBlagovnice(mongo, _id);
+        zdruzeno = [
+            ...racuni,
+            ...blagovnice
+        ];
+    }
+    catch (err) {
+        await mongo.close();
+        console.error(`karticaArtikla: ${err.message || err}`);
+        return [];
+    }
+    await mongo.close();
+    zdruzeno.sort((a, b) => a.datum.valueOf() - b.datum.valueOf());
+    let zaloga = 0;
+    let vrednostZaloge = 0;
+    let nbc = 0;
+    let mpc = 0;
+    if (skladisca)
+        zdruzeno = zdruzeno.filter(d => skladisca.includes(d.skladisce_id.toString()));
+    for (let dokument of zdruzeno) {
+        let smer = smerPoslovnegaDogodka[dokument.vrsta];
+        dokument.enotaFaktor = dokument.enotaFaktor || 1;
+        // NE SPREMINJAJ VRSTNEGA REDA VRSIC!
+        nbc = dokument.nbc;
+        if (knjiziPoEnotiNabave(dokument.vrsta)) {
+            nbc = (dokument.nbc / dokument.enotaFaktor);
+        }
+        else {
+            dokument.enotaFaktor ||= 1;
+        }
+        if (dokument.vrsta === "prodaja")
+            mpc = dokument.mpc;
+        let spremeniZalogo = spreminajZalogo(dokument, vrstaRazknjizbe, artikel);
+        if (spremeniZalogo)
+            vrednostZaloge += smer * dokument.kolicina * nbc * dokument.enotaFaktor;
+        let staraZaloga = zaloga;
+        if (spremeniZalogo)
+            zaloga += (smer * dokument.kolicina * dokument.enotaFaktor);
+        if (dokument.vrsta === "dobava" && staraZaloga >= .1 && zaloga > .1 && vrednostZaloge > .1)
+            nbc = vrednostZaloge / zaloga;
+        if (dokument.vrsta === "dobava" && artikel.kategorija === "potrošni material")
             nbc = dokument.nbc;
-            if (knjiziPoEnotiNabave(dokument.vrsta)) {
-                nbc = (dokument.nbc / dokument.enotaFaktor);
-            }
-            else {
-                dokument.enotaFaktor || (dokument.enotaFaktor = 1);
-            }
-            if (dokument.vrsta === "prodaja")
-                mpc = dokument.mpc;
-            let spremeniZalogo = spreminajZalogo(dokument, vrstaRazknjizbe, artikel);
-            if (spremeniZalogo)
-                vrednostZaloge += smer * dokument.kolicina * nbc * dokument.enotaFaktor;
-            let staraZaloga = zaloga;
-            if (spremeniZalogo)
-                zaloga += (smer * dokument.kolicina * dokument.enotaFaktor);
-            if (dokument.vrsta === "dobava" && staraZaloga >= .1 && zaloga > .1 && vrednostZaloge > .1)
-                nbc = vrednostZaloge / zaloga;
-            if (dokument.vrsta === "dobava" && artikel.kategorija === "potrošni material")
-                nbc = dokument.nbc;
-            if (dokument.vrsta === "inventura") {
-                zaloga = dokument.popisanaKolicina || 0;
-                vrednostZaloge = zaloga * nbc;
-            }
-            dokument.nbc = nbc;
-            dokument.mpc = mpc;
-            dokument.smer = smer;
-            dokument.zaloga = zaloga;
-            dokument.vrednostZaloge = vrednostZaloge;
+        if (dokument.vrsta === "inventura") {
+            zaloga = dokument.popisanaKolicina || 0;
+            vrednostZaloge = zaloga * nbc;
         }
-        return zdruzeno.reverse();
-    });
+        dokument.nbc = nbc;
+        dokument.mpc = mpc;
+        dokument.smer = smer;
+        dokument.zaloga = zaloga;
+        dokument.vrednostZaloge = vrednostZaloge;
+    }
+    return zdruzeno.reverse();
 }
 function spreminajZalogo(dokument, vrstaRazknjizbe, artikel) {
     return ((artikel) => {
@@ -107,78 +96,74 @@ function spreminajZalogo(dokument, vrstaRazknjizbe, artikel) {
         }
     })(artikel);
 }
-function pridobiRacune(mongo, _id) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return yield mongo.aggregate("racuni", [
-            {
-                $match: {
-                    "postavke.artikel_id": Mongo.objectid(_id)
-                }
-            },
-            {
-                $unwind: "$postavke"
-            },
-            {
-                $match: {
-                    "postavke.artikel_id": Mongo.objectid(_id),
-                },
-            },
-            {
-                $project: {
-                    dokument_id: "$_id",
-                    datum: 1,
-                    lokacija_id: 1,
-                    blagajna_id: 1,
-                    skladisce_id: 1,
-                    stevilka: 1,
-                    enota: "$postavke.enota",
-                    kolicina: "$postavke.kolicina",
-                    davek: "$postavke.tdav",
-                    nbc: "$postavke.nbc",
-                    mpc: "$postavke.mpc0",
-                    vrsta: "prodaja",
-                }
+async function pridobiRacune(mongo, _id) {
+    return await mongo.aggregate("racuni", [
+        {
+            $match: {
+                "postavke.artikel_id": Mongo.objectid(_id)
+            }
+        },
+        {
+            $unwind: "$postavke"
+        },
+        {
+            $match: {
+                "postavke.artikel_id": Mongo.objectid(_id),
             },
-        ]);
-    });
+        },
+        {
+            $project: {
+                dokument_id: "$_id",
+                datum: 1,
+                lokacija_id: 1,
+                blagajna_id: 1,
+                skladisce_id: 1,
+                stevilka: 1,
+                enota: "$postavke.enota",
+                kolicina: "$postavke.kolicina",
+                davek: "$postavke.tdav",
+                nbc: "$postavke.nbc",
+                mpc: "$postavke.mpc0",
+                vrsta: "prodaja",
+            }
+        },
+    ]);
 }
-function pridobiBlagovnice(mongo, _id) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return yield mongo.aggregate("blagovnice", [
-            {
-                $match: {
-                    "postavke.artikel_id": Mongo.objectid(_id),
-                    vrsta: { $ne: "naročilo" }
-                },
+async function pridobiBlagovnice(mongo, _id) {
+    return await mongo.aggregate("blagovnice", [
+        {
+            $match: {
+                "postavke.artikel_id": Mongo.objectid(_id),
+                vrsta: { $ne: "naročilo" }
             },
-            {
-                $unwind: "$postavke"
+        },
+        {
+            $unwind: "$postavke"
+        },
+        {
+            $match: {
+                "postavke.artikel_id": Mongo.objectid(_id),
             },
-            {
-                $match: {
-                    "postavke.artikel_id": Mongo.objectid(_id),
-                },
-            },
-            {
-                $project: {
-                    dokument_id: "$_id",
-                    datum: 1,
-                    lokacija_id: 1,
-                    skladisce_id: 1,
-                    vrsta: 1,
-                    dobavitelj_id: 1,
-                    enota: "$postavke.enota",
-                    enotaFaktor: "$postavke.enotaFaktor",
-                    kolicina: "$postavke.kolicina",
-                    davek: "$postavke.tdav",
-                    nbcN: "$postavke.nbcN",
-                    nbc: "$postavke.nbc",
-                    popisanaKolicina: "$postavke.popisanaKolicina",
-                    stevilka: "$dokumentDobavitelja",
-                }
-            },
-        ]);
-    });
+        },
+        {
+            $project: {
+                dokument_id: "$_id",
+                datum: 1,
+                lokacija_id: 1,
+                skladisce_id: 1,
+                vrsta: 1,
+                dobavitelj_id: 1,
+                enota: "$postavke.enota",
+                enotaFaktor: "$postavke.enotaFaktor",
+                kolicina: "$postavke.kolicina",
+                davek: "$postavke.tdav",
+                nbcN: "$postavke.nbcN",
+                nbc: "$postavke.nbc",
+                popisanaKolicina: "$postavke.popisanaKolicina",
+                stevilka: "$dokumentDobavitelja",
+            }
+        },
+    ]);
 }
 // (async function() {
 //     console.time("čas")

package/dist/karticaArtikla.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"karticaArtikla.mjs","sourceRoot":"","sources":["../src/karticaArtikla.mts"],"names":[],"mappings":"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"}
+{"version":3,"file":"karticaArtikla.mjs","sourceRoot":"","sources":["../src/karticaArtikla.mts"],"names":[],"mappings":"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"}

package/dist/koledar.mjs

@@ -1,40 +1,29 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { Mongo } from "cry-db";
 import { arrayToObject } from "cry-helpers";
-export function koledarVeterinarja(tenant, _id) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let mongo = new Mongo(tenant);
-        let user = yield mongo.findById("users", _id);
-        if (!user)
-            return [];
-        let dogodki = yield mongo.find("naroceni", { veterinar: user.username, _deleted: { $exists: false } });
-        if (!dogodki.length)
-            return [];
-        let stranke = arrayToObject(yield mongo.find("stranke", {
-            _id: { $in: dogodki.map(e => e.stranka_id) }
-        }), "_id");
-        let pacienti = arrayToObject(yield mongo.find("pacienti", {
-            _id: { $in: dogodki.map(e => e.pacient_id) }
-        }), "_id");
-        let lokacije = arrayToObject(yield mongo.find("lokacije", {
-            _id: { $in: dogodki.map(e => e.lokacija_id) }
-        }), "_id");
-        return dogodki.map(narocen => {
-            return {
-                narocen,
-                stranka: stranke[narocen.stranka_id],
-                pacient: pacienti[narocen.pacient_id],
-                lokacija: lokacije[narocen.lokacija_id],
-            };
-        });
+export async function koledarVeterinarja(tenant, _id) {
+    let mongo = new Mongo(tenant);
+    let user = await mongo.findById("users", _id);
+    if (!user)
+        return [];
+    let dogodki = await mongo.find("naroceni", { veterinar: user.username, _deleted: { $exists: false } });
+    if (!dogodki.length)
+        return [];
+    let stranke = arrayToObject(await mongo.find("stranke", {
+        _id: { $in: dogodki.map(e => e.stranka_id) }
+    }), "_id");
+    let pacienti = arrayToObject(await mongo.find("pacienti", {
+        _id: { $in: dogodki.map(e => e.pacient_id) }
+    }), "_id");
+    let lokacije = arrayToObject(await mongo.find("lokacije", {
+        _id: { $in: dogodki.map(e => e.lokacija_id) }
+    }), "_id");
+    return dogodki.map(narocen => {
+        return {
+            narocen,
+            stranka: stranke[narocen.stranka_id],
+            pacient: pacienti[narocen.pacient_id],
+            lokacija: lokacije[narocen.lokacija_id],
+        };
     });
 }
 // (async function() {

package/dist/koledar.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"koledar.mjs","sourceRoot":"","sources":["../src/koledar.mts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAc5C,MAAM,UAAgB,kBAAkB,CACpC,MAAc,EACd,GAAW;;QAGX,IAAI,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;QAE9B,IAAI,IAAI,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAY,OAAO,EAAE,GAAG,CAAC,CAAC;QACzD,IAAI,CAAC,IAAI;YAAE,OAAO,EAAE,CAAA;QAEpB,IAAI,OAAO,GAAG,MAAM,KAAK,CAAC,IAAI,CAAU,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QAChH,IAAI,CAAC,OAAO,CAAC,MAAM;YAAE,OAAO,EAAE,CAAA;QAE9B,IAAI,OAAO,GAAG,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,CAAU,SAAS,EAAE;YAC7D,GAAG,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,CAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE;SAC/C,CAAC,EAAE,KAAK,CAAC,CAAC;QAEZ,IAAI,QAAQ,GAAG,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,CAAU,UAAU,EAAE;YAC/D,GAAG,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE;SAC/C,CAAC,EAAE,KAAK,CAAC,CAAC;QAEX,IAAI,QAAQ,GAAG,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,CAAW,UAAU,EAAE;YAChE,GAAG,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE;SAChD,CAAC,EAAE,KAAK,CAAC,CAAC;QAEX,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YACzB,OAAO;gBACH,OAAO;gBACP,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;gBACpC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC;gBACrC,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC;aACrB,CAAA;QAC1B,CAAC,CAAC,CAAC;IACP,CAAC;CAAA;AAED,sBAAsB;AAEtB,sFAAsF;AACtF,oCAAoC;AAEpC,sBAAsB;AACtB,QAAQ"}
+{"version":3,"file":"koledar.mjs","sourceRoot":"","sources":["../src/koledar.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAc5C,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACpC,MAAc,EACd,GAAW;IAGX,IAAI,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;IAE9B,IAAI,IAAI,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAY,OAAO,EAAE,GAAG,CAAC,CAAC;IACzD,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAA;IAEpB,IAAI,OAAO,GAAG,MAAM,KAAK,CAAC,IAAI,CAAU,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IAChH,IAAI,CAAC,OAAO,CAAC,MAAM;QAAE,OAAO,EAAE,CAAA;IAE9B,IAAI,OAAO,GAAG,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,CAAU,SAAS,EAAE;QAC7D,GAAG,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,CAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE;KAC/C,CAAC,EAAE,KAAK,CAAC,CAAC;IAEZ,IAAI,QAAQ,GAAG,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,CAAU,UAAU,EAAE;QAC/D,GAAG,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE;KAC/C,CAAC,EAAE,KAAK,CAAC,CAAC;IAEX,IAAI,QAAQ,GAAG,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,CAAW,UAAU,EAAE;QAChE,GAAG,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE;KAChD,CAAC,EAAE,KAAK,CAAC,CAAC;IAEX,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QACzB,OAAO;YACH,OAAO;YACP,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;YACpC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC;YACrC,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC;SACrB,CAAA;IAC1B,CAAC,CAAC,CAAC;AACP,CAAC;AAED,sBAAsB;AAEtB,sFAAsF;AACtF,oCAAoC;AAEpC,sBAAsB;AACtB,QAAQ"}

package/dist/maint/nastaviNbcArtiklomIzMpc.mjs

@@ -1,63 +1,32 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __asyncValues = (this && this.__asyncValues) || function (o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-};
 import { round4 } from "cry-helpers";
-export function nastaviNbcArtiklomIzMpc(mongo) {
-    var _a, e_1, _b, _c;
-    return __awaiter(this, void 0, void 0, function* () {
-        let nastavitve = yield mongo.findOne("nastavitve", {});
-        let artikli = yield mongo.find("artikli", {});
-        try {
-            for (var _d = true, artikli_1 = __asyncValues(artikli), artikli_1_1; artikli_1_1 = yield artikli_1.next(), _a = artikli_1_1.done, !_a; _d = true) {
-                _c = artikli_1_1.value;
-                _d = false;
-                let a = _c;
-                if (a.kategorija === "storitev")
-                    continue;
-                a.nbc = a.nbc || a.zadnjaNbc;
-                if (!a.nbc && a.mpc) {
-                    let mar = a.zeleniPribitek;
-                    if (!mar && a.kategorija === "izdelek")
-                        mar = (nastavitve === null || nastavitve === void 0 ? void 0 : nastavitve.pribitekCeneNaIzdelke) || 0;
-                    if (!mar && a.kategorija === "potrošni material")
-                        mar = (nastavitve === null || nastavitve === void 0 ? void 0 : nastavitve.pribitekCeneNaIzdelke) || 0;
-                    if (!mar && a.kategorija === "zdravilo")
-                        mar = (nastavitve === null || nastavitve === void 0 ? void 0 : nastavitve.pribitekCeneNaZdravila) || 0;
-                    a.nbc = round4(a.mpc / (1 + (mar || 0)) / (1 + (a.dst || 0)));
-                }
-                a.zadnjaNbc = a.zadnjaNbc || a.nbc;
-                console.log(a.naziv);
-                yield mongo.upsert("artikli", { _id: a._id }, {
-                    $set: {
-                        nbc: a.nbc,
-                        zadnjaNbc: a.zadnjaNbc,
-                    },
-                    $inc: { _rev: 1 },
-                    $currentDate: { _ts: { $type: "timestamp" } }
-                });
-            }
+export async function nastaviNbcArtiklomIzMpc(mongo) {
+    let nastavitve = await mongo.findOne("nastavitve", {});
+    let artikli = await mongo.find("artikli", {});
+    for await (let a of artikli) {
+        if (a.kategorija === "storitev")
+            continue;
+        a.nbc = a.nbc || a.zadnjaNbc;
+        if (!a.nbc && a.mpc) {
+            let mar = a.zeleniPribitek;
+            if (!mar && a.kategorija === "izdelek")
+                mar = nastavitve?.pribitekCeneNaIzdelke || 0;
+            if (!mar && a.kategorija === "potrošni material")
+                mar = nastavitve?.pribitekCeneNaIzdelke || 0;
+            if (!mar && a.kategorija === "zdravilo")
+                mar = nastavitve?.pribitekCeneNaZdravila || 0;
+            a.nbc = round4(a.mpc / (1 + (mar || 0)) / (1 + (a.dst || 0)));
         }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (!_d && !_a && (_b = artikli_1.return)) yield _b.call(artikli_1);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-    });
+        a.zadnjaNbc = a.zadnjaNbc || a.nbc;
+        console.log(a.naziv);
+        await mongo.upsert("artikli", { _id: a._id }, {
+            $set: {
+                nbc: a.nbc,
+                zadnjaNbc: a.zadnjaNbc,
+            },
+            $inc: { _rev: 1 },
+            $currentDate: { _ts: { $type: "timestamp" } }
+        });
+    }
 }
 // (async function go() {
 //     let server =""

package/dist/maint/nastaviNbcArtiklomIzMpc.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"nastaviNbcArtiklomIzMpc.mjs","sourceRoot":"","sources":["../../src/maint/nastaviNbcArtiklomIzMpc.mts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAIrC,MAAM,UAAgB,uBAAuB,CACzC,KAAY;;;QAGZ,IAAI,UAAU,GAAG,MAAM,KAAK,CAAC,OAAO,CAAa,YAAY,EAAE,EAAE,CAAC,CAAC;QACnE,IAAI,OAAO,GAAG,MAAM,KAAK,CAAC,IAAI,CAAiB,SAAS,EAAE,EAAE,CAAC,CAAC;;YAC9D,KAAoB,eAAA,YAAA,cAAA,OAAO,CAAA,aAAA,+EAAE;gBAAT,uBAAO;gBAAP,WAAO;gBAAhB,IAAI,CAAC,KAAA,CAAA;gBAEZ,IAAI,CAAC,CAAC,UAAU,KAAK,UAAU;oBAAE,SAAS;gBAC1C,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,SAAS,CAAC;gBAE7B,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,EAAE;oBACjB,IAAI,GAAG,GAAG,CAAC,CAAC,cAAc,CAAC;oBAC3B,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,UAAU,KAAK,SAAS;wBAAE,GAAG,GAAG,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,qBAAqB,KAAI,CAAC,CAAC;oBACrF,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,UAAU,KAAK,mBAAmB;wBAAE,GAAG,GAAG,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,qBAAqB,KAAI,CAAC,CAAC;oBAC/F,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,UAAU,KAAK,UAAU;wBAAE,GAAG,GAAG,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,sBAAsB,KAAI,CAAC,CAAC;oBACvF,CAAC,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;iBACjE;gBAED,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,GAAG,CAAC;gBAEnC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;gBAEpB,MAAM,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE;oBAC1C,IAAI,EAAE;wBACF,GAAG,EAAE,CAAC,CAAC,GAAG;wBACV,SAAS,EAAE,CAAC,CAAC,SAAS;qBACzB;oBACD,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE;oBACjB,YAAY,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE;iBAChD,CAAE,CAAC;aACP;;;;;;;;;;CAEJ;AAGD,yBAAyB;AAEzB,qBAAqB;AACrB,uGAAuG;AAEvG,qCAAqC;AACrC,mCAAmC;AACnC,SAAS;AACT,sBAAsB;AACtB,OAAO"}
+{"version":3,"file":"nastaviNbcArtiklomIzMpc.mjs","sourceRoot":"","sources":["../../src/maint/nastaviNbcArtiklomIzMpc.mts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAIrC,MAAM,CAAC,KAAK,UAAU,uBAAuB,CACzC,KAAY;IAGZ,IAAI,UAAU,GAAG,MAAM,KAAK,CAAC,OAAO,CAAa,YAAY,EAAE,EAAE,CAAC,CAAC;IACnE,IAAI,OAAO,GAAG,MAAM,KAAK,CAAC,IAAI,CAAiB,SAAS,EAAE,EAAE,CAAC,CAAC;IAC9D,IAAI,KAAK,EAAE,IAAI,CAAC,IAAI,OAAO,EAAE;QAEzB,IAAI,CAAC,CAAC,UAAU,KAAK,UAAU;YAAE,SAAS;QAC1C,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,SAAS,CAAC;QAE7B,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,EAAE;YACjB,IAAI,GAAG,GAAG,CAAC,CAAC,cAAc,CAAC;YAC3B,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,UAAU,KAAK,SAAS;gBAAE,GAAG,GAAG,UAAU,EAAE,qBAAqB,IAAI,CAAC,CAAC;YACrF,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,UAAU,KAAK,mBAAmB;gBAAE,GAAG,GAAG,UAAU,EAAE,qBAAqB,IAAI,CAAC,CAAC;YAC/F,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,UAAU,KAAK,UAAU;gBAAE,GAAG,GAAG,UAAU,EAAE,sBAAsB,IAAI,CAAC,CAAC;YACvF,CAAC,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;SACjE;QAED,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,GAAG,CAAC;QAEnC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QAEpB,MAAM,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE;YAC1C,IAAI,EAAE;gBACF,GAAG,EAAE,CAAC,CAAC,GAAG;gBACV,SAAS,EAAE,CAAC,CAAC,SAAS;aACzB;YACD,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE;YACjB,YAAY,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE;SAChD,CAAE,CAAC;KACP;AAEL,CAAC;AAGD,yBAAyB;AAEzB,qBAAqB;AACrB,uGAAuG;AAEvG,qCAAqC;AACrC,mCAAmC;AACnC,SAAS;AACT,sBAAsB;AACtB,OAAO"}

package/dist/maint/poisciNapakeVSpremembiZaloge.mjs

@@ -1,69 +1,58 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { Mongo } from "cry-db";
 import { arrayToObject, round2 } from "cry-helpers";
-export function poisciNapakeVSpremembiZaloge(db, server) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const mongo = new Mongo(db, server);
-        let spremembe = yield mongo.find("spremembaZaloge", {}, { sort: { artikel_id: 1, datum: 1 } });
-        let zaloge = yield mongo.find("zaloga", {});
-        let artikli = yield mongo.find("artikel", {});
-        let artikliObj = arrayToObject(artikli, "_id");
-        let tekoce = {};
-        let sumSprememb = 0;
-        for (let s of spremembe) {
-            if (!s.artikel_id) {
-                console.log('sprememba brez artikla', s);
+export async function poisciNapakeVSpremembiZaloge(db, server) {
+    const mongo = new Mongo(db, server);
+    let spremembe = await mongo.find("spremembaZaloge", {}, { sort: { artikel_id: 1, datum: 1 } });
+    let zaloge = await mongo.find("zaloga", {});
+    let artikli = await mongo.find("artikel", {});
+    let artikliObj = arrayToObject(artikli, "_id");
+    let tekoce = {};
+    let sumSprememb = 0;
+    for (let s of spremembe) {
+        if (!s.artikel_id) {
+            console.log('sprememba brez artikla', s);
+            continue;
+        }
+        // if (s.artikel_id.toString() !== "63b3d4c6f3b4501b5cbc32be") continue;
+        let prej = tekoce[s.artikel_id];
+        let spr = s.vrednostZaloge.sprememba;
+        let zdaj = (prej || 0) + spr;
+        let nova = s.vrednostZaloge.stara + s.vrednostZaloge.sprememba;
+        sumSprememb += spr;
+        if (Math.abs(round2(zdaj - s.vrednostZaloge.nova)) > .1)
+            console.log(s._id.toString(), s.vrstaDogodka, s.artikel_id, zdaj, s.vrednostZaloge.nova);
+        if (Math.abs(round2(zdaj - nova)) > .1)
+            console.log("r2", s.artikel_id, zdaj, nova);
+        // else console.log('ok',s.vrstaDogodka,s._id.toString());
+        tekoce[s.artikel_id] = zdaj;
+    }
+    let sumNapak = 0;
+    let sporni = [];
+    if (true) {
+        for (let zaloga of zaloge) {
+            let izr = tekoce[zaloga.artikel_id];
+            if (izr === undefined || isNaN(izr)) {
+                console.log('NI IZRAČUNA', zaloga.artikel_id);
                 continue;
             }
-            // if (s.artikel_id.toString() !== "63b3d4c6f3b4501b5cbc32be") continue;
-            let prej = tekoce[s.artikel_id];
-            let spr = s.vrednostZaloge.sprememba;
-            let zdaj = (prej || 0) + spr;
-            let nova = s.vrednostZaloge.stara + s.vrednostZaloge.sprememba;
-            sumSprememb += spr;
-            if (Math.abs(round2(zdaj - s.vrednostZaloge.nova)) > .1)
-                console.log(s._id.toString(), s.vrstaDogodka, s.artikel_id, zdaj, s.vrednostZaloge.nova);
-            if (Math.abs(round2(zdaj - nova)) > .1)
-                console.log("r2", s.artikel_id, zdaj, nova);
-            // else console.log('ok',s.vrstaDogodka,s._id.toString());
-            tekoce[s.artikel_id] = zdaj;
-        }
-        let sumNapak = 0;
-        let sporni = [];
-        if (true) {
-            for (let zaloga of zaloge) {
-                let izr = tekoce[zaloga.artikel_id];
-                if (izr === undefined || isNaN(izr)) {
-                    console.log('NI IZRAČUNA', zaloga.artikel_id);
-                    continue;
-                }
-                if (Math.abs(round2(zaloga.vrednost - izr)) > .1) {
-                    let a = artikliObj[zaloga.artikel_id.toString()];
-                    if (!a)
-                        console.log('ni artikla', sumNapak, zaloga.artikel_id);
-                    else
-                        sporni.push(a._id);
-                    console.error("delta", (a === null || a === void 0 ? void 0 : a.kategorija) || "?", (a === null || a === void 0 ? void 0 : a.naziv) || "?", zaloga.vrednost, tekoce[zaloga.artikel_id]);
-                    sumNapak += zaloga.vrednost - izr;
-                }
-                delete tekoce[zaloga.artikel_id];
+            if (Math.abs(round2(zaloga.vrednost - izr)) > .1) {
+                let a = artikliObj[zaloga.artikel_id.toString()];
+                if (!a)
+                    console.log('ni artikla', sumNapak, zaloga.artikel_id);
+                else
+                    sporni.push(a._id);
+                console.error("delta", a?.kategorija || "?", a?.naziv || "?", zaloga.vrednost, tekoce[zaloga.artikel_id]);
+                sumNapak += zaloga.vrednost - izr;
             }
-            if (Object.keys(tekoce).length)
-                console.log("preveč izračuna", tekoce);
-            console.log('tekoce', tekoce);
+            delete tekoce[zaloga.artikel_id];
         }
-        console.log('sumSprememb', sumSprememb);
-        console.log('sumNapak', sumNapak);
-        console.log('sporni', sporni);
-    });
+        if (Object.keys(tekoce).length)
+            console.log("preveč izračuna", tekoce);
+        console.log('tekoce', tekoce);
+    }
+    console.log('sumSprememb', sumSprememb);
+    console.log('sumNapak', sumNapak);
+    console.log('sporni', sporni);
 }
 // (async function go() {
 //     await poisciNapakeVSpremembiZaloge("lax", "");