cry-klikvet-logic 0.10.210 → 0.10.212
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/maint/poknjiziVsoZgodovino.js +45 -44
- package/dist/maint/poknjiziVsoZgodovino.js.map +1 -1
- package/dist/preracunajZalogo.js +6 -6
- package/dist/preracunajZalogo.js.map +1 -1
- package/dist/smsCepljenjaNaDan.d.ts +2 -1
- package/dist/smsCepljenjaNaDan.d.ts.map +1 -1
- package/dist/smsCepljenjaNaDan.js +9 -3
- package/dist/smsCepljenjaNaDan.js.map +1 -1
- package/dist/smsNaroceniNaDan.d.ts +2 -1
- package/dist/smsNaroceniNaDan.d.ts.map +1 -1
- package/dist/smsNaroceniNaDan.js +13 -8
- package/dist/smsNaroceniNaDan.js.map +1 -1
- package/dist/types/cepljenje.d.ts +4 -0
- package/dist/types/cepljenje.d.ts.map +1 -1
- package/dist/types/narocen.d.ts +5 -1
- package/dist/types/narocen.d.ts.map +1 -1
- package/dist/types/zaloga.d.ts +5 -0
- package/dist/types/zaloga.d.ts.map +1 -1
- package/dist/zalogaNaDanIzracunana.js +1 -1
- package/dist/zalogaNaDanIzracunana.js.map +1 -1
- package/dist/zapisiZalogoPoDnevih.d.ts +1 -0
- package/dist/zapisiZalogoPoDnevih.d.ts.map +1 -1
- package/dist/zapisiZalogoPoDnevih.js +40 -69
- package/dist/zapisiZalogoPoDnevih.js.map +1 -1
- package/dist/zapisiZalogoPoDnevih_old.d.ts +6 -0
- package/dist/zapisiZalogoPoDnevih_old.d.ts.map +1 -0
- package/dist/zapisiZalogoPoDnevih_old.js +103 -0
- package/dist/zapisiZalogoPoDnevih_old.js.map +1 -0
- package/package.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
|
@@ -188,48 +188,49 @@ export async function shraniZgodovinoVBazo(db, dbObj, server = "") {
|
|
|
188
188
|
// console.timeEnd("čas")
|
|
189
189
|
// process.exit(0)
|
|
190
190
|
// })()
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
//
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
191
|
+
async function start() {
|
|
192
|
+
let server;
|
|
193
|
+
const DB = "lax";
|
|
194
|
+
// server = "mongodb://192.168.88.60:27017,192.168.88.61:27017,192.168.88.62:27017/?replicaSet=rs0"
|
|
195
|
+
console.log('knjižim vso zgodovino');
|
|
196
|
+
console.time("čas");
|
|
197
|
+
let mongo = new Mongo(DB, server);
|
|
198
|
+
let nastavitve = await mongo.findOne("nastavitve", {});
|
|
199
|
+
await mongo.update("racuni", {}, { $unset: { razknjizen: 1 } });
|
|
200
|
+
await mongo.update("blagovnice", {}, { $unset: { razknjizena: 1 } });
|
|
201
|
+
if (!nastavitve) {
|
|
202
|
+
console.error("Ne najdem nastavitev");
|
|
203
|
+
process.exit(1);
|
|
204
|
+
}
|
|
205
|
+
let spec = {
|
|
206
|
+
artikel: undefined,
|
|
207
|
+
neRazknjizujObDobavi: true,
|
|
208
|
+
neSpreminjajProdajnihCen: true,
|
|
209
|
+
popraviDatumeBlagovnicaNaDatumeDokumentov: true,
|
|
210
|
+
/* stevilkeRacunov: /VA.-REC[45]/, */
|
|
211
|
+
odDatuma: new Date("2023-01-01")
|
|
212
|
+
/*
|
|
213
|
+
POZOR - odDatuma ne dela pravilno, saj pobriše vse pred tem datumom
|
|
214
|
+
*/
|
|
215
|
+
};
|
|
216
|
+
let res = await poknjiziVsoZgodovino(DB, server, nastavitve, spec);
|
|
217
|
+
console.log('res.zaloga.length', Object.values(res?.zaloga || {}).length);
|
|
218
|
+
console.log('res.artikli.length', Object.values(res?.artikli || {}).length);
|
|
219
|
+
console.log('res.spremembaZaloge', Object.values(res?.spremembaZaloge || {}).length);
|
|
220
|
+
console.log('res.updates.artikli.length', Object.values(res.updates?.artikli || {}).length);
|
|
221
|
+
console.log('res.updates.blagovnice.length', Object.values(res.updates?.blagovnice || {}).length);
|
|
222
|
+
console.log('res.updates.racuni.length', Object.values(res.updates?.racuni || {}).length);
|
|
223
|
+
console.log('res.updates.zaloga.length', Object.values(res.updates?.zaloga || {}).length);
|
|
224
|
+
console.log('res.inserts.spremembaZaloge.length', res.inserts.spremembaZaloge.length);
|
|
225
|
+
console.timeLog("čas");
|
|
226
|
+
console.log('pišem v bazo');
|
|
227
|
+
await shraniZgodovinoVBazo(DB, res, server);
|
|
228
|
+
console.timeEnd("čas");
|
|
229
|
+
console.log('koniec');
|
|
230
|
+
process.exit(0);
|
|
231
|
+
}
|
|
232
|
+
;
|
|
233
|
+
(async function () {
|
|
234
|
+
await start();
|
|
235
|
+
})();
|
|
235
236
|
//# sourceMappingURL=poknjiziVsoZgodovino.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"poknjiziVsoZgodovino.js","sourceRoot":"","sources":["../../src/maint/poknjiziVsoZgodovino.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAC9B,OAAO,SAAS,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAuB,iCAAiC,EAAE,MAAM,sBAAsB,CAAC;AAC9F,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AAKpF,OAAO,KAAK,MAAM,aAAa,CAAC;AAkChC;;;;;;;;;;;;;;;;;;;;;GAqBG;AAIH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,EAAU,EAAE,MAA0B,EAAE,UAAsB,EACrG,OAAa,EAAE,oBAAoB,EAAE,IAAI,EAAE,wBAAwB,EAAE,IAAI,EAAE,yCAAyC,EAAE,IAAI,EAAE;IAI5H,IAAI,IAAI,CAAC,oBAAoB,EAAE;QAC3B,UAAU,CAAC,oBAAoB,GAAG,IAAI,CAAC;KAC1C;IAED,IAAI,IAAI,CAAC,wBAAwB,EAAE;QAC/B,UAAU,CAAC,6BAA6B,GAAG,SAAS,CAAA;QACpD,UAAU,CAAC,8BAA8B,GAAG,SAAS,CAAA;QACrD,UAAU,CAAC,oBAAoB,GAAG,OAAO,CAAA;KAC5C;IACD,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;IAEnC,IAAI,eAAe,GAAwB,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAC,CAAC;IAC3E,IAAI,aAAa,GAAwB,EAAE,CAAC;IAE5C,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO;QAAE,eAAe,CAAC,qBAAqB,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;IAC1E,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO;QAAE,aAAa,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC;IACrD,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ;QAAE,eAAe,CAAC,KAAK,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;IAErE,IAAI,OAAO,GAAwC,aAAa,CAAsB,MAAM,KAAK,CAAC,OAAO,CAAsB,SAAS,EAAE,aAAa,CAAC,EAAE,KAAK,CAAC,CAAA;IAEhK,IAAI,YAAY,GAAG,SAAS,CAAC,eAAe,CAAC,CAAC;IAC9C,IAAI,IAAI,CAAC,eAAe;QAAE,YAAY,CAAC,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAA;IAEtE,IAAI,MAAM,GAAa,MAAM,KAAK,CAAC,IAAI,CAAQ,QAAQ,EAAE,YAAY,CAAC,CAAA;IACtE,IAAI,UAAU,GAAiB,MAAM,KAAK,CAAC,IAAI,CAAa,YAAY,EAAE,eAAe,CAAC,CAAA;IAE1F,IAAI,IAAI,CAAC,yCAAyC,EAAE;QAChD,IAAI,KAAK,EAAE,IAAI,UAAU,IAAI,UAAU,EAAE;YACrC,IAAI,CAAC,GAAG,UAAoB,CAAC;YAC7B,IAAI,CAAC,CAAC,CAAC,cAAc;gBAAE,SAAS;YAChC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;gBACjD,CAAC,CAAC,KAAK,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAE,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;gBACnG,MAAM,KAAK,CAAC,MAAM,CAAuC,YAAY,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE;oBACnF,KAAK,EAAE,CAAC,CAAC,KAAK;oBACd,eAAe,EAAE,IAAI,IAAI,EAAE;iBAC9B,CAAC,CAAA;aACL;SACJ;KACJ;IAED,MAAM,KAAK,CAAC,KAAK,EAAE,CAAA;IAEnB,IAAI,QAAQ,GAAe,EAAE,CAAA;IAC7B,MAAM,CAAC,OAAO,CAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAE,EAAE,KAAK,EAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,CAAE,CAAC,CAAA;IACvE,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,UAAU,EAAE,cAAc,EAAG,UAAkB,CAAC,mBAAmB,EAAE,CAAE,CAAC,CAAA;IAElJ,IAAI,IAAI,CAAC,OAAO,EAAE;QACd,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACvC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,KAAK,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QACpG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAE,CAAC,CAAC,QAA6C,CAAC,MAAM,CAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,KAAK,IAAI,CAAC,OAAO,CAAC,CAAQ,CAAC,CAAC;KAC3J;IAED,OAAO,CAAC,GAAG,CAAC,aAAa,EAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAA;IAEzD,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAE9D,KAAK,IAAI,CAAC,IAAI,QAAQ,EAAE;QACpB,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC9G,IAAI,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;KACrI;IAED,IAAI,KAAK,GAAgB;QACrB,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,OAAO;QAChB,eAAe,EAAE,EAAE;QACnB,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QAChE,OAAO,EAAE,EAAE,eAAe,EAAE,EAAE,EAAE;KACnC,CAAA;IAED,IAAI,OAAO,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAA;IAE1C,IAAI,KAAK,EAAE,IAAI,QAAQ,IAAI,QAAQ,EAAE;QAEjC,IAAI,QAAQ,CAAC,UAAU,EAAE;YACrB,MAAM,iCAAiC,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;SACpF;aACI,IAAI,QAAQ,CAAC,KAAK,EAAE;YACrB,MAAM,6BAA6B,CAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;SAC3E;KACJ;IAED,OAAO,KAAK,CAAA;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,EAAU,EAAE,KAAkB,EAAE,SAA6B,EAAE;IAEtG,IAAI,KAAK,GAAG,IAAI,KAAK,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;IAEjC,OAAO,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAA;IAExC,MAAM,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;IACpC,MAAM,KAAK,CAAC,UAAU,CAAC,aAAa,EAAE,EAAE,CAAC,CAAA;IACzC,MAAM,KAAK,CAAC,UAAU,CAAC,yBAAyB,EAAE,EAAE,CAAC,CAAA;IACrD,MAAM,KAAK,CAAC,UAAU,CAAC,cAAc,EAAE,EAAE,CAAC,CAAA;IAC1C,MAAM,KAAK,CAAC,UAAU,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAA;IAE7C;QACI,IAAI,UAAU,GAAG,IAAI,EAAE,IAAI,GAAG,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,MAAM,GAAG,UAAU,CAAA;QACpG,KAAK,IAAI,KAAK,IAAI,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,UAAU,CAAC,EAAE;YAC3E,MAAM,KAAK,CAAC,UAAU,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAA;YAChD,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;SACvE;KACJ;IAED;QACI,IAAI,UAAU,GAAG,IAAI,EAAE,IAAI,GAAG,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,UAAU,CAAA;QAC3F,KAAK,IAAI,KAAK,IAAI,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,EAAE;YAClE,MAAM,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;YACvC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;SAC9D;KACJ;IAGD,IAAI,CAAC,GAAC,CAAC,CAAA;IACP,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;IAC9E,IAAI,KAAK,EAAC,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QACrD,MAAM,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAA;QAChD,IAAI,EAAE,CAAC,GAAC,GAAG,KAAG,CAAC;YAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;KAClC;IAED,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAA;IACnF,CAAC,GAAC,CAAC,CAAA;IACH,IAAI,KAAK,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QACzD,MAAM,KAAK,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAA;QACnD,IAAI,EAAE,CAAC,GAAC,GAAG,KAAG,CAAC;YAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;KAClC;IAED,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAA;IAC3E,CAAC,GAAC,CAAC,CAAA;IACH,IAAI,KAAK,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACrD,MAAM,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAA;QAC/C,IAAI,EAAE,CAAC,GAAC,GAAG,KAAG,CAAC;YAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;KAClC;IAED,OAAO,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAA;AAC/C,CAAC;AAGD,uBAAuB;AAEvB,0BAA0B;AAC1B,4GAA4G;AAE5G,8BAA8B;AAC9B,mCAAmC;AACnC,sFAAsF;AAEtF,6IAA6I;AAC7I,6EAA6E;AAE7E,2BAA2B;AAC3B,2IAA2I;AAC3I,mDAAmD;AACnD,8DAA8D;AAC9D,8DAA8D;AAC9D,aAAa;AACb,QAAQ;AAER,mBAAmB;AACnB,uBAAuB;AACvB,oPAAoP;AACpP,yOAAyO;AACzO,YAAY;AAEZ,gDAAgD;AAEhD,uBAAuB;AACvB,uBAAuB;AAEvB,sEAAsE;AACtE,uCAAuC;AACvC,+FAA+F;AAC/F,mCAAmC;AACnC,QAAQ;AAER,oDAAoD;AACpD,2BAA2B;AAC3B,mGAAmG;AACnG,yHAAyH;AACzH,QAAQ;AACR,oDAAoD;AACpD,2BAA2B;AAC3B,mGAAmG;AACnG,yHAAyH;AACzH,QAAQ;AAER,uBAAuB;AAEvB,4CAA4C;AAE5C,6BAA6B;AAC7B,sBAAsB;AAEtB,OAAO;AAOP,
|
|
1
|
+
{"version":3,"file":"poknjiziVsoZgodovino.js","sourceRoot":"","sources":["../../src/maint/poknjiziVsoZgodovino.ts"],"names":[],"mappings":"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"}
|
package/dist/preracunajZalogo.js
CHANGED
|
@@ -30,7 +30,7 @@ function preracunajZalogoKolicinsko(preracun) {
|
|
|
30
30
|
nova_zaloga = kolicina;
|
|
31
31
|
break;
|
|
32
32
|
}
|
|
33
|
-
let stara_vrednost_zaloge = round6(zaloga.vrednost);
|
|
33
|
+
let stara_vrednost_zaloge = round6(zaloga.vrednost || 0);
|
|
34
34
|
let sprememba_vrednosti_zaloge = round6(stara_nbc * spremeba_zaloge);
|
|
35
35
|
let nova_vrednost_zaloge = round6(zaloga.vrednost + sprememba_vrednosti_zaloge);
|
|
36
36
|
if (vrstaSpremembe === 0 /* VrstaSpremembeZaloge.NASTAVI */) {
|
|
@@ -89,14 +89,14 @@ function preracunajZalogoObNabavi(preracun) {
|
|
|
89
89
|
};
|
|
90
90
|
}
|
|
91
91
|
export function vpisiSprememboZaloge(zaloga, sprememba) {
|
|
92
|
-
zaloga.vrednost = sprememba.vrednostZaloge.nova;
|
|
93
|
-
zaloga.zaloga = sprememba.zaloga.nova;
|
|
92
|
+
zaloga.vrednost = sprememba.vrednostZaloge.nova || 0;
|
|
93
|
+
zaloga.zaloga = sprememba.zaloga.nova || 0;
|
|
94
94
|
return zaloga;
|
|
95
95
|
}
|
|
96
96
|
export function vpisiSprememboZalogePoNabavi(zaloga, sprememba) {
|
|
97
|
-
zaloga.vrednost = sprememba.vrednostZaloge.nova;
|
|
98
|
-
zaloga.zaloga = sprememba.zaloga.nova;
|
|
99
|
-
zaloga.nbc = sprememba.nbc.nova;
|
|
97
|
+
zaloga.vrednost = sprememba.vrednostZaloge.nova || 0;
|
|
98
|
+
zaloga.zaloga = sprememba.zaloga.nova || 0;
|
|
99
|
+
zaloga.nbc = sprememba.nbc.nova || 0;
|
|
100
100
|
return zaloga;
|
|
101
101
|
}
|
|
102
102
|
//# sourceMappingURL=preracunajZalogo.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preracunajZalogo.js","sourceRoot":"","sources":["../src/preracunajZalogo.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAuB7C,MAAM,UAAU,gBAAgB,CAC5B,QAKC;IAEA,QAAgB,CAAC,cAAc,GAAG,QAAQ,CAAC,cAAc,wCAA+B,CAAA;IACzF,OAAO,0BAA0B,CAAC,QAAe,CAAC,CAAA;AACtD,CAAC;AACD,MAAM,UAAU,mBAAmB,CAC/B,QAKC;IAEA,QAAgB,CAAC,cAAc,uCAA+B,CAAA;IAC/D,OAAO,0BAA0B,CAAC,QAAe,CAAC,CAAA;AACtD,CAAC;AACD,MAAM,UAAU,gBAAgB,CAC5B,QAMC;IAEA,QAAgB,CAAC,cAAc,sCAA8B,CAAA;IAC9D,OAAO,wBAAwB,CAAC,QAAe,CAAC,CAAA;AACpD,CAAC;AAED,SAAS,0BAA0B,CAAC,QAKnC;IAEG,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAA;IAE9D,IAAI,YAAY,GAAG,MAAM,CAAC,MAAM,CAAA;IAChC,IAAI,WAAmB,CAAA;IACvB,IAAI,eAAuB,CAAA;IAE3B,QAAQ,cAAc,EAAE;QACpB;YACI,eAAe,GAAG,CAAC,QAAQ,CAAA;YAC3B,WAAW,GAAG,YAAY,GAAG,eAAe,CAAA;YAC5C,MAAK;QACT;YACI,eAAe,GAAG,QAAQ,CAAA;YAC1B,WAAW,GAAG,YAAY,GAAG,eAAe,CAAA;YAC5C,MAAK;QACT;YACI,eAAe,GAAG,QAAQ,GAAG,YAAY,CAAA;YACzC,WAAW,GAAG,QAAQ,CAAA;YACtB,MAAK;KACZ;IAED,IAAI,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"preracunajZalogo.js","sourceRoot":"","sources":["../src/preracunajZalogo.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,12 +3,13 @@ import { Lokacija } from "./types/lokacija.js";
|
|
|
3
3
|
interface smsNarocenParams {
|
|
4
4
|
tenant: string;
|
|
5
5
|
dan: Date;
|
|
6
|
+
resend?: boolean;
|
|
6
7
|
}
|
|
7
8
|
/**
|
|
8
9
|
* Iz baze nabere podatke o cepljenjih,
|
|
9
10
|
* katerim je potrebno poslati SMS sporočilo na nek dan.
|
|
10
11
|
*/
|
|
11
|
-
export declare function smsCepljenjaNaDan({ tenant, dan }: smsNarocenParams): Promise<{
|
|
12
|
+
export declare function smsCepljenjaNaDan({ tenant, dan, resend }: smsNarocenParams): Promise<{
|
|
12
13
|
smsText: string | false | undefined;
|
|
13
14
|
smsDniPrej: number | false | undefined;
|
|
14
15
|
koledarText: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smsCepljenjaNaDan.d.ts","sourceRoot":"","sources":["../src/smsCepljenjaNaDan.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAQ/C,UAAU,gBAAgB;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"smsCepljenjaNaDan.d.ts","sourceRoot":"","sources":["../src/smsCepljenjaNaDan.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAQ/C,UAAU,gBAAgB;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,IAAI,CAAA;IACT,MAAM,CAAC,EAAE,OAAO,CAAA;CACnB;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAC,EAAE,gBAAgB;;;;;;;;;KAqD/E"}
|
|
@@ -7,7 +7,7 @@ const SMS_DNI_PREJ = 15;
|
|
|
7
7
|
* Iz baze nabere podatke o cepljenjih,
|
|
8
8
|
* katerim je potrebno poslati SMS sporočilo na nek dan.
|
|
9
9
|
*/
|
|
10
|
-
export async function smsCepljenjaNaDan({ tenant, dan }) {
|
|
10
|
+
export async function smsCepljenjaNaDan({ tenant, dan, resend }) {
|
|
11
11
|
let mongo = new Mongo(tenant);
|
|
12
12
|
let nastavitve = (await mongo.findOne("nastavitve", {}));
|
|
13
13
|
if (!nastavitve)
|
|
@@ -24,8 +24,14 @@ export async function smsCepljenjaNaDan({ tenant, dan }) {
|
|
|
24
24
|
if (!pacient.cepljenja)
|
|
25
25
|
return undefined;
|
|
26
26
|
return Object.values(pacient.cepljenja).map(cepljenje => {
|
|
27
|
-
if (
|
|
28
|
-
|
|
27
|
+
if (resend) {
|
|
28
|
+
if (!cepljenje.smsOddaja_napaka)
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
else {
|
|
32
|
+
if (cepljenje.smsOddaja_id)
|
|
33
|
+
return;
|
|
34
|
+
}
|
|
29
35
|
if (!cepljenje.datumNaslednjegaCepljenja || !cepljenje.opomnikPoslji)
|
|
30
36
|
return;
|
|
31
37
|
let datumNaslednjegaCepljenja = new Date(cepljenje.datumNaslednjegaCepljenja);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smsCepljenjaNaDan.js","sourceRoot":"","sources":["../src/smsCepljenjaNaDan.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAI5C,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAGjE,MAAM,YAAY,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"smsCepljenjaNaDan.js","sourceRoot":"","sources":["../src/smsCepljenjaNaDan.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,12 +3,13 @@ import { Pacient } from "./types/pacient.js";
|
|
|
3
3
|
interface smsNarocenParams {
|
|
4
4
|
tenant: string;
|
|
5
5
|
dan: Date;
|
|
6
|
+
resend?: boolean;
|
|
6
7
|
}
|
|
7
8
|
/**
|
|
8
9
|
* Iz baze nabere podatke o naročenih pacientih,
|
|
9
10
|
* katerim je potrebno poslati SMS sporočilo na nek dan.
|
|
10
11
|
*/
|
|
11
|
-
export declare function smsNaroceniNaDan({ tenant, dan }: smsNarocenParams): Promise<{
|
|
12
|
+
export declare function smsNaroceniNaDan({ tenant, dan, resend }: smsNarocenParams): Promise<{
|
|
12
13
|
smsText: string | false | undefined;
|
|
13
14
|
smsDniPrej: number | false | undefined;
|
|
14
15
|
koledarText: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smsNaroceniNaDan.d.ts","sourceRoot":"","sources":["../src/smsNaroceniNaDan.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAO7C,UAAU,gBAAgB;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"smsNaroceniNaDan.d.ts","sourceRoot":"","sources":["../src/smsNaroceniNaDan.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAO7C,UAAU,gBAAgB;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,IAAI,CAAA;IACT,MAAM,CAAC,EAAE,OAAO,CAAA;CACnB;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,gBAAgB;;;;;;;;KA8C/E"}
|
package/dist/smsNaroceniNaDan.js
CHANGED
|
@@ -7,7 +7,7 @@ const SMS_DNI_PREJ = 3;
|
|
|
7
7
|
* Iz baze nabere podatke o naročenih pacientih,
|
|
8
8
|
* katerim je potrebno poslati SMS sporočilo na nek dan.
|
|
9
9
|
*/
|
|
10
|
-
export async function smsNaroceniNaDan({ tenant, dan }) {
|
|
10
|
+
export async function smsNaroceniNaDan({ tenant, dan, resend }) {
|
|
11
11
|
let mongo = new Mongo(tenant);
|
|
12
12
|
let nastavitve = (await mongo.findOne("nastavitve", {}));
|
|
13
13
|
if (!nastavitve)
|
|
@@ -15,7 +15,7 @@ export async function smsNaroceniNaDan({ tenant, dan }) {
|
|
|
15
15
|
if (!nastavitve.opomnikiNarocanje)
|
|
16
16
|
return [];
|
|
17
17
|
let naDan = dayjs(dan).add(nastavitve.opomnikiDniPredNarocanje ?? SMS_DNI_PREJ, "day");
|
|
18
|
-
let
|
|
18
|
+
let query = {
|
|
19
19
|
datum: {
|
|
20
20
|
$gte: naDan.startOf("day").toDate(),
|
|
21
21
|
$lte: naDan.endOf("day").toDate(),
|
|
@@ -25,7 +25,12 @@ export async function smsNaroceniNaDan({ tenant, dan }) {
|
|
|
25
25
|
smsOddaja_id: { $exists: false },
|
|
26
26
|
sprejet: { $exists: false },
|
|
27
27
|
_deleted: { $exists: false },
|
|
28
|
-
}
|
|
28
|
+
};
|
|
29
|
+
if (resend) {
|
|
30
|
+
delete query.smsOddaja_id;
|
|
31
|
+
query.smsOddaja_napaka = { $exists: true };
|
|
32
|
+
}
|
|
33
|
+
let naroceni = await mongo.find("naroceni", query);
|
|
29
34
|
if (!naroceni.length)
|
|
30
35
|
return [];
|
|
31
36
|
let pacienti = arrayToObject(await mongo.find("pacienti", { _id: { $in: naroceni.map(n => n.pacient_id) } }, { project: { ime: true, vrsta: true, spol: true, mrtev: true, stranka_id: true, _deleted: true } }), "_id");
|
|
@@ -46,9 +51,9 @@ export async function smsNaroceniNaDan({ tenant, dan }) {
|
|
|
46
51
|
res = res.filter(r => stranke[r.pacient.stranka_id].gdprSoglasjeNacin !== "ne poda");
|
|
47
52
|
return res;
|
|
48
53
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
+
(async () => {
|
|
55
|
+
let ret = await smsNaroceniNaDan({ tenant: 'zvitorepka', dan: new Date(), resend: true });
|
|
56
|
+
console.dir(ret);
|
|
57
|
+
process.exit(1);
|
|
58
|
+
})();
|
|
54
59
|
//# sourceMappingURL=smsNaroceniNaDan.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smsNaroceniNaDan.js","sourceRoot":"","sources":["../src/smsNaroceniNaDan.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,KAAK,MAAM,YAAY,CAAC;AAM/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,MAAM,YAAY,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"smsNaroceniNaDan.js","sourceRoot":"","sources":["../src/smsNaroceniNaDan.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cepljenje.d.ts","sourceRoot":"","sources":["../../src/types/cepljenje.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,WAAW,SAAS;IACtB,gDAAgD;IAChD,GAAG,CAAC,EAAE,EAAE,CAAC;IACT,YAAY,CAAC,EAAE,EAAE,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,IAAI,CAAC;IACrB,sBAAsB;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,IAAI,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,QAAQ,CAAC;IACpB,yBAAyB,CAAC,EAAE,IAAI,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,EAAE,CAAC;IACjB,UAAU,CAAC,EAAE,EAAE,CAAC;IAChB,UAAU,CAAC,EAAE,EAAE,CAAC;IAEhB,MAAM,CAAC,EAAE,wBAAwB,CAAA;IAEjC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"cepljenje.d.ts","sourceRoot":"","sources":["../../src/types/cepljenje.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,WAAW,SAAS;IACtB,gDAAgD;IAChD,GAAG,CAAC,EAAE,EAAE,CAAC;IACT,YAAY,CAAC,EAAE,EAAE,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,IAAI,CAAC;IACrB,sBAAsB;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,IAAI,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,QAAQ,CAAC;IACpB,yBAAyB,CAAC,EAAE,IAAI,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,EAAE,CAAC;IACjB,UAAU,CAAC,EAAE,EAAE,CAAC;IAChB,UAAU,CAAC,EAAE,EAAE,CAAC;IAEhB,MAAM,CAAC,EAAE,wBAAwB,CAAA;IAEjC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CACtD;AAED,MAAM,WAAW,wBAAwB;IAErC,IAAI,EAAE,IAAI,CAAC;IACX,GAAG,EAAE,QAAQ,CAAC;CACjB;AACD,MAAM,WAAW,cAAc;IAC3B,GAAG,CAAC,EAAE,EAAE,CAAC;IACT,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,oBAAY,SAAS,GAAG,MAAM,CAAC,MAAM,EAAC,SAAS,CAAC,CAAA"}
|
package/dist/types/narocen.d.ts
CHANGED
|
@@ -13,12 +13,16 @@ export interface Narocen extends DbEntity {
|
|
|
13
13
|
opomnikPoslji?: boolean;
|
|
14
14
|
opomnikStevilka?: string;
|
|
15
15
|
opomnikBesedilo?: string;
|
|
16
|
-
smsOddaja_id?: string;
|
|
17
16
|
sprejet?: Date;
|
|
18
17
|
posegKasneje?: boolean;
|
|
19
18
|
trajanjePosega?: number;
|
|
20
19
|
osebjePosega?: string[];
|
|
21
20
|
casPosega?: string;
|
|
22
21
|
preprostPoseg?: boolean;
|
|
22
|
+
smsOddaja_id?: string;
|
|
23
|
+
smsOddaja_napaka?: {
|
|
24
|
+
_id: string;
|
|
25
|
+
napaka: string;
|
|
26
|
+
};
|
|
23
27
|
}
|
|
24
28
|
//# sourceMappingURL=narocen.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"narocen.d.ts","sourceRoot":"","sources":["../../src/types/narocen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAErD,MAAM,WAAW,OAAQ,SAAQ,QAAQ;IAErC,UAAU,EAAE,EAAE,CAAC;IACf,UAAU,EAAE,EAAE,CAAC;IACf,WAAW,EAAE,EAAE,CAAC;IAEhB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,IAAI,CAAC;IAEZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,QAAQ,CAAC;IAGrB,eAAe,CAAC,EAAE,EAAE,CAAC;IAErB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"narocen.d.ts","sourceRoot":"","sources":["../../src/types/narocen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAErD,MAAM,WAAW,OAAQ,SAAQ,QAAQ;IAErC,UAAU,EAAE,EAAE,CAAC;IACf,UAAU,EAAE,EAAE,CAAC;IACf,WAAW,EAAE,EAAE,CAAC;IAEhB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,IAAI,CAAC;IAEZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,QAAQ,CAAC;IAGrB,eAAe,CAAC,EAAE,EAAE,CAAC;IAErB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IAGzB,OAAO,CAAC,EAAE,IAAI,CAAC;IAEf,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,SAAS,CAAC,EAAE,MAAM,CAAA;IAElB,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CACtD"}
|
package/dist/types/zaloga.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zaloga.d.ts","sourceRoot":"","sources":["../../src/types/zaloga.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,WAAW,MAAO,SAAQ,QAAQ;IAEpC,UAAU,EAAE,EAAE,CAAA;IACd,YAAY,EAAE,EAAE,CAAA;IAChB,GAAG,EAAE,KAAK,CAAA;IACV,MAAM,EAAE,OAAO,CAAA;IACf,QAAQ,EAAE,KAAK,CAAA;CAElB;AAED,MAAM,WAAW,eAAgB,SAAQ,QAAQ,EAAE,aAAa;IAE5D,KAAK,EAAE,IAAI,CAAA;IACX,UAAU,EAAE,EAAE,CAAA;IACd,YAAY,EAAE,EAAE,CAAA;IAEhB,GAAG,EAAE,OAAO,CAAA;IACZ,UAAU,EAAE,UAAU,CAAA;IAEtB,cAAc,EAAE,oBAAoB,CAAA;IACpC,YAAY,EAAE,sBAAsB,CAAA;IACpC,WAAW,EAAE,EAAE,CAAA;IACf,UAAU,CAAC,EAAE,EAAE,CAAA;IAEf,GAAG,EAAE;QAAE,KAAK,EAAE,KAAK,CAAC;QAAC,IAAI,EAAE,KAAK,CAAC;QAAC,SAAS,EAAE,KAAK,CAAA;KAAE,CAAA;IACpD,MAAM,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,OAAO,CAAC;QAAC,SAAS,EAAE,OAAO,CAAA;KAAE,CAAA;IAC7D,cAAc,EAAE;QAAE,KAAK,EAAE,KAAK,CAAC;QAAC,IAAI,EAAE,KAAK,CAAC;QAAC,SAAS,EAAE,KAAK,CAAA;KAAE,CAAA;CAElE;AAED,MAAM,WAAW,WAAW;IACxB,KAAK,EAAE,IAAI,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACrB"}
|
|
1
|
+
{"version":3,"file":"zaloga.d.ts","sourceRoot":"","sources":["../../src/types/zaloga.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,WAAW,MAAO,SAAQ,QAAQ;IAEpC,UAAU,EAAE,EAAE,CAAA;IACd,YAAY,EAAE,EAAE,CAAA;IAChB,GAAG,EAAE,KAAK,CAAA;IACV,MAAM,EAAE,OAAO,CAAA;IACf,QAAQ,EAAE,KAAK,CAAA;CAElB;AAED,MAAM,WAAW,eAAgB,SAAQ,QAAQ,EAAE,aAAa;IAE5D,KAAK,EAAE,IAAI,CAAA;IACX,UAAU,EAAE,EAAE,CAAA;IACd,YAAY,EAAE,EAAE,CAAA;IAEhB,GAAG,EAAE,OAAO,CAAA;IACZ,UAAU,EAAE,UAAU,CAAA;IAEtB,cAAc,EAAE,oBAAoB,CAAA;IACpC,YAAY,EAAE,sBAAsB,CAAA;IACpC,WAAW,EAAE,EAAE,CAAA;IACf,UAAU,CAAC,EAAE,EAAE,CAAA;IAEf,GAAG,EAAE;QAAE,KAAK,EAAE,KAAK,CAAC;QAAC,IAAI,EAAE,KAAK,CAAC;QAAC,SAAS,EAAE,KAAK,CAAA;KAAE,CAAA;IACpD,MAAM,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,OAAO,CAAC;QAAC,SAAS,EAAE,OAAO,CAAA;KAAE,CAAA;IAC7D,cAAc,EAAE;QAAE,KAAK,EAAE,KAAK,CAAC;QAAC,IAAI,EAAE,KAAK,CAAC;QAAC,SAAS,EAAE,KAAK,CAAA;KAAE,CAAA;CAElE;AAED,MAAM,WAAW,WAAW;IACxB,KAAK,EAAE,IAAI,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,oBAAoB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,wBAAwB,EAAE,MAAM,CAAC;CACpC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zalogaNaDanIzracunana.js","sourceRoot":"","sources":["../src/zalogaNaDanIzracunana.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,KAAK,MAAM,YAAY,CAAA;AAG9B,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAA;AAEpF,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,IAI3C;IAEG,IAAI,KAAK,GAAwB,EAAE,CAAA;IACnC,IAAI,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAA;IACnD,KAAK,CAAC,KAAK,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,CAAA;IAC7B,IAAI,IAAI,CAAC,SAAS,EAAE,MAAM;QAAE,KAAK,CAAC,YAAY,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAEnG,IAAI,KAAK,GAAG,MAAM,8BAA8B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9D,KAAK,CAAC,UAAU,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;IAElC,IAAI,IAAI,GAAG,IAAI,IAAI,CAAkB,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IACpE,IAAI,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC;QACjC,EAAE,MAAM,EAAE,KAAK,EAAE;QACjB,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACvB;YACI,MAAM,EAAE;gBACJ,GAAG,EAAE;oBACD,UAAU,EAAE,aAAa;oBACzB,YAAY,EAAE,eAAe;iBAChC;gBACD,IAAI,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE;aAC/B;SACJ;QACD;YACI,MAAM,EAAE;gBACJ,GAAG,EAAE,EAAE,YAAY,EAAE,mBAAmB,EAAE;gBAC1C,QAAQ,EAAE,EAAE,IAAI,EAAE,2BAA2B,EAAE;aAClD;SACJ;QACD;YACI,QAAQ,EAAE;gBACN,YAAY,EAAE,mBAAmB;gBACjC,QAAQ,EAAE,CAAC;gBACX,GAAG,EAAE,CAAC;aACT;SACJ;KACJ,CAAC,CAAA;IAEF,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;IAEnB,OAAO,SAAS,CAAA;AACpB,CAAC;AAED,yBAAyB;AACzB,mDAAmD;AACnD,4BAA4B;AAC5B,sDAAsD;AACtD,gCAAgC;AAChC,aAAa;AACb,mDAAmD;AACnD,4BAA4B;AAC5B,sDAAsD;AACtD,gCAAgC;AAChC,aAAa;AACb,gDAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"zalogaNaDanIzracunana.js","sourceRoot":"","sources":["../src/zalogaNaDanIzracunana.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,KAAK,MAAM,YAAY,CAAA;AAG9B,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAA;AAEpF,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,IAI3C;IAEG,IAAI,KAAK,GAAwB,EAAE,CAAA;IACnC,IAAI,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAA;IACnD,KAAK,CAAC,KAAK,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,CAAA;IAC7B,IAAI,IAAI,CAAC,SAAS,EAAE,MAAM;QAAE,KAAK,CAAC,YAAY,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAEnG,IAAI,KAAK,GAAG,MAAM,8BAA8B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9D,KAAK,CAAC,UAAU,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;IAElC,IAAI,IAAI,GAAG,IAAI,IAAI,CAAkB,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IACpE,IAAI,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC;QACjC,EAAE,MAAM,EAAE,KAAK,EAAE;QACjB,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACvB;YACI,MAAM,EAAE;gBACJ,GAAG,EAAE;oBACD,UAAU,EAAE,aAAa;oBACzB,YAAY,EAAE,eAAe;iBAChC;gBACD,IAAI,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE;aAC/B;SACJ;QACD;YACI,MAAM,EAAE;gBACJ,GAAG,EAAE,EAAE,YAAY,EAAE,mBAAmB,EAAE;gBAC1C,QAAQ,EAAE,EAAE,IAAI,EAAE,2BAA2B,EAAE;aAClD;SACJ;QACD;YACI,QAAQ,EAAE;gBACN,YAAY,EAAE,mBAAmB;gBACjC,QAAQ,EAAE,CAAC;gBACX,GAAG,EAAE,CAAC;aACT;SACJ;KACJ,CAAC,CAAA;IAEF,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;IAEnB,OAAO,SAAS,CAAA;AACpB,CAAC;AAED,yBAAyB;AACzB,mDAAmD;AACnD,4BAA4B;AAC5B,sDAAsD;AACtD,gCAAgC;AAChC,aAAa;AACb,mDAAmD;AACnD,4BAA4B;AAC5B,sDAAsD;AACtD,gCAAgC;AAChC,aAAa;AACb,gDAAgD;AAChD,yBAAyB;AACzB,6BAA6B;AAC7B,UAAU;AAEV,sBAAsB;AAEtB,OAAO"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zapisiZalogoPoDnevih.d.ts","sourceRoot":"","sources":["../src/zapisiZalogoPoDnevih.ts"],"names":[],"mappings":"AASA,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"zapisiZalogoPoDnevih.d.ts","sourceRoot":"","sources":["../src/zapisiZalogoPoDnevih.ts"],"names":[],"mappings":"AASA,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAA;CACpB,iBAuEA"}
|
|
@@ -9,94 +9,65 @@ export async function zapisiZalogoPoDnevih(spec) {
|
|
|
9
9
|
let collection = collectionZalogeNaDan(spec.samoKonsignacija);
|
|
10
10
|
let tekoce = {};
|
|
11
11
|
let zadnjiDatumSkladisca = {};
|
|
12
|
-
await mongo.hardDelete(collection, { datum: { $gte: dayjs().add(-DAYS_BACK, "day").toDate() } });
|
|
12
|
+
await mongo.hardDelete(collection, { datum: { $gte: dayjs().add(-(spec.dniNazaj || DAYS_BACK), "day").toDate() } });
|
|
13
13
|
// najdi zadnji datum, ko imamo zalogo za vsa skladišča
|
|
14
14
|
let zadnjiDatumi = [];
|
|
15
15
|
let skladisca = await mongo.findAll("skladisca", {});
|
|
16
16
|
for await (let skladisce of skladisca) {
|
|
17
17
|
let zadnji = await mongo.aggregate(collection, [
|
|
18
18
|
{ $match: { skladisce_id: skladisce._id } },
|
|
19
|
+
{ $set: { datumStr: { $dateToString: { format: "%Y-%m-%d", date: "$datum" } } } },
|
|
19
20
|
{ $sort: { datum: -1 } },
|
|
20
21
|
{ $limit: 1 }
|
|
21
22
|
]);
|
|
22
23
|
if (zadnji?.length) {
|
|
23
|
-
tekoce[zadnji[0].skladisce_id] = zadnji[0].vrednost
|
|
24
|
+
tekoce[zadnji[0].skladisce_id] = zadnji[0].vrednost;
|
|
24
25
|
zadnjiDatumi.push(new Date(zadnji[0].datum.valueOf()));
|
|
25
|
-
zadnjiDatumSkladisca[zadnji[0].skladisce_id] = zadnji[0].
|
|
26
|
+
zadnjiDatumSkladisca[zadnji[0].skladisce_id] = zadnji[0].datumStr;
|
|
26
27
|
}
|
|
27
28
|
}
|
|
28
29
|
let minDate = zadnjiDatumi.length ? new Date(Math.min(...zadnjiDatumi.map(d => d.valueOf()))) : new Date("2001-01-01");
|
|
29
|
-
let
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
artikel_id: 1, skladisce_id: 1, vrednostZaloge: 1,
|
|
36
|
-
_id: 1, vrstaDogodka: 1, datum: 1, dokument_id: 1,
|
|
30
|
+
let spremembeZalogePoDnevih = await mongo.aggregate("spremembaZaloge", [
|
|
31
|
+
{
|
|
32
|
+
$match: {
|
|
33
|
+
datum: { $gte: minDate },
|
|
34
|
+
artikel_id: { $in: mozni }
|
|
35
|
+
}
|
|
37
36
|
},
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
37
|
+
{ $set: { datumStr: { $dateToString: { format: "%Y-%m-%d", date: "$datum" } } } },
|
|
38
|
+
{
|
|
39
|
+
$group: {
|
|
40
|
+
_id: { datumStr: "$datumStr", skladisce_id: "$skladisce_id" },
|
|
41
|
+
spremembaVrednostiZaloge: { $sum: "$vrednostZaloge.sprememba" },
|
|
42
|
+
}
|
|
43
|
+
},
|
|
44
|
+
{ $project: { skladisce_id: "$_id.skladisce_id", datumStr: "$_id.datumStr", spremembaZaloge: 1, spremembaVrednostiZaloge: 1 } },
|
|
45
|
+
{ $sort: { "datumStr": 1 } },
|
|
46
|
+
]);
|
|
47
|
+
for await (let sprememba of spremembeZalogePoDnevih) {
|
|
48
|
+
let skladisce = sprememba.skladisce_id;
|
|
49
|
+
if (zadnjiDatumSkladisca[skladisce] >= sprememba.datumStr)
|
|
48
50
|
continue;
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
// zadnjaZalogaArtikla[kljuc] = spremembaZaloge.vrednostZaloge.nova;
|
|
58
|
-
// zadnjaZalogaSkladiscaPoSumah[spremembaZaloge.skladisce_id] = novaZalogaPoSumah;
|
|
59
|
-
// dodaj med sprememebe po skladiščih in dnevih
|
|
60
|
-
let datum = dayjs(spremembaZaloge.datum).startOf("day");
|
|
61
|
-
let datumStr = datum.format("YYYY-MM-DD");
|
|
62
|
-
spremembePoDnevih[spremembaZaloge.skladisce_id][datumStr] = spremembePoDnevih[spremembaZaloge.skladisce_id][datumStr] ||
|
|
63
|
-
{ skladisce_id: spremembaZaloge.skladisce_id, datum: datum.toDate(), vrednost: 0, sprememba: 0, datumStr };
|
|
64
|
-
spremembePoDnevih[spremembaZaloge.skladisce_id][datumStr].vrednost = novaZalogaPoSpremembi;
|
|
65
|
-
spremembePoDnevih[spremembaZaloge.skladisce_id][datumStr].sprememba += spremembaZaloge.vrednostZaloge.sprememba;
|
|
66
|
-
// let newDiff = Math.round( novaZalogaPoSpremembi - novaZalogaPoSumah)
|
|
67
|
-
// if ( Math.abs(newDiff)>1 && lastDiff!==newDiff)
|
|
68
|
-
// console.log(
|
|
69
|
-
// spremembaZaloge._id, "\t",
|
|
70
|
-
// spremembaZaloge.datum, "\t",
|
|
71
|
-
// spremembaZaloge.vrstaDogodka, "\t",
|
|
72
|
-
// spremembaZaloge.dokument_id, "\t",
|
|
73
|
-
// spremembaZaloge.artikel_id, "\t",
|
|
74
|
-
// spremembaZaloge.vrednostZaloge.stara.toFixed(0), "\t",
|
|
75
|
-
// spremembaZaloge.vrednostZaloge.sprememba.toFixed(0), "\t",
|
|
76
|
-
// spremembaZaloge.vrednostZaloge.nova.toFixed(0), "\t",
|
|
77
|
-
// novaZalogaPoSpremembi.toFixed(0), "\t",
|
|
78
|
-
// novaZalogaPoSumah.toFixed(0), "\t",
|
|
79
|
-
// newDiff.toFixed(0), "\t",
|
|
80
|
-
// )
|
|
81
|
-
// lastDiff = newDiff;
|
|
82
|
-
}
|
|
83
|
-
for await (let skladisce of Object.values(spremembePoDnevih)) {
|
|
84
|
-
for await (let sprememba of Object.values(skladisce)) {
|
|
85
|
-
await mongo.upsert(collection, {
|
|
86
|
-
datum: sprememba.datum,
|
|
87
|
-
skladisce_id: sprememba.skladisce_id
|
|
88
|
-
}, sprememba);
|
|
89
|
-
}
|
|
51
|
+
tekoce[skladisce] = (tekoce[skladisce] || 0) + sprememba.spremembaVrednostiZaloge;
|
|
52
|
+
await mongo.upsert(collection, {
|
|
53
|
+
datum: new Date(sprememba.datumStr),
|
|
54
|
+
skladisce_id: skladisce,
|
|
55
|
+
}, {
|
|
56
|
+
sprememba: sprememba.spremembaVrednostiZaloge,
|
|
57
|
+
vrednost: tekoce[skladisce],
|
|
58
|
+
});
|
|
90
59
|
}
|
|
60
|
+
console.log('tekoce', tekoce);
|
|
91
61
|
await mongo.close();
|
|
92
62
|
// console.log('zadnjaZalogaSkladiscaPoSpremembah', zadnjaZalogaSkladiscaPoSpremembah);
|
|
93
63
|
// console.log('zadnjaZalogaSkladiscaPoSumah', zadnjaZalogaSkladiscaPoSumah);
|
|
94
64
|
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
65
|
+
(async function go() {
|
|
66
|
+
await zapisiZalogoPoDnevih({
|
|
67
|
+
tenant: "lax",
|
|
68
|
+
dniNazaj: 30,
|
|
69
|
+
});
|
|
70
|
+
console.log('konec');
|
|
71
|
+
process.exit(0);
|
|
72
|
+
})();
|
|
102
73
|
//# sourceMappingURL=zapisiZalogoPoDnevih.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zapisiZalogoPoDnevih.js","sourceRoot":"","sources":["../src/zapisiZalogoPoDnevih.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAC9B,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AACrF,OAAO,KAAK,MAAM,YAAY,CAAC;AAG/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAEnE,MAAM,SAAS,GAAG,CAAC,CAAA;AAEnB,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,
|
|
1
|
+
{"version":3,"file":"zapisiZalogoPoDnevih.js","sourceRoot":"","sources":["../src/zapisiZalogoPoDnevih.ts"],"names":[],"mappings":"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"}
|