fixed: La modalità Tabella non funziona più ! (non si vede la lista dei movimenti)

This commit is contained in:
Surya Paolo
2022-11-30 21:26:05 +01:00
parent 403645a990
commit 196837ccbe
5 changed files with 1093 additions and 1 deletions

View File

@@ -1687,7 +1687,7 @@ module.exports = {
throw new Error('endRow must be number');
}
let newvers = !!params.lookup1;
let newvers = !!params.newvers;
let query = [];
@@ -1924,6 +1924,7 @@ module.exports = {
});
if (qa1) query = [...query, ...qa1];
query.push({$unwind: '$user'});
query.push({
$match: {
$and: [
@@ -1931,6 +1932,7 @@ module.exports = {
],
},
});
query.push({
$replaceRoot: {
@@ -1942,9 +1944,11 @@ module.exports = {
} else if (params.querytype === shared_consts.QUERYTYPE_REFUSED_USER_GRP || params.querytype ===
shared_consts.QUERYTYPE_REFUSED_USER_CIRCUIT) {
/*
const myq = this.addQueryIdMatch(params);
if (myq)
query.push(myq);
*/
query.push({$project: {refused_users: 1}});
const qa1 = this.getLookup(
@@ -1961,6 +1965,7 @@ module.exports = {
});
if (qa1) query = [...query, ...qa1];
query.push({$unwind: '$user'});
/*
query.push({
$match: {
$and: [
@@ -1968,6 +1973,7 @@ module.exports = {
],
},
});
*/
query.push({
$replaceRoot: {
@@ -1994,6 +2000,11 @@ module.exports = {
}
if (params.filterextra2) {
if (params.filterextra2.length > 0)
query = [...query, ...params.filterextra2];
}
if (newvers) {
// NUOVA VERSIONE
let proj = params.lookup2 ? params.lookup2.lk_proj : null;