@resolveio/server-lib 4.4.19 → 4.4.21

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.
Files changed (5) hide show
  1. package/methods/cron-jobs.js +11 -21
  2. package/methods/report-builder.js +14 -14
  3. package/models/report-builder-report.model.d.ts +4 -2
  4. package/models/report-builder.model.d.ts +2 -1
  5. package/package.json +1 -1
package/methods/cron-jobs.js CHANGED
@@ -394,67 +394,57 @@ function loadCronJobMethods(methodManager) {
394
394
  var reportTotals = res[0].totals;
395
395
  if (report.type === 'Tabular') {
396
396
  report.fields_selected.forEach(function (field) {
397
- if (field.fieldType === 'Number' && (field.leafType === 'Number' || field.leafType === 'Average' || field.leafType === 'Count' || field.leafType === 'Sum' || field.leafType === 'First' || field.leafType === 'Last' || field.leafType === 'Minimum' || field.leafType === 'Maximum')) {
397
+ if (field.fieldType === 'Number' && field.leafFormatType === 'Number') {
398
398
  results_1.filter(function (a) { return a[field.id]; }).forEach(function (result) {
399
399
  result[field.id] = result[field.id].toLocaleString();
400
400
  });
401
401
  }
402
- else if (field.fieldType === 'Number' && field.leafType === 'String') {
402
+ else if ((field.fieldType === 'Number' || field.leafValueType === 'Count') && field.leafFormatType === 'String') {
403
403
  results_1.filter(function (a) { return a[field.id]; }).forEach(function (result) {
404
404
  result[field.id] = result[field.id].toString();
405
405
  });
406
406
  }
407
- else if (field.fieldType === 'Number' && field.leafType === 'Currency') {
407
+ else if ((field.fieldType === 'Number' || field.leafValueType === 'Count') && field.leafFormatType === 'Currency') {
408
408
  results_1.filter(function (a) { return a[field.id]; }).forEach(function (result) {
409
409
  result[field.id] = result[field.id].toLocaleString('en-US', { style: 'currency', currency: 'USD' });
410
410
  });
411
411
  }
412
- else if (field.fieldType === 'Boolean' && field.leafType === 'Count') {
413
- results_1.filter(function (a) { return a[field.id]; }).forEach(function (result) {
414
- result[field.id] = result[field.id].toLocaleString();
415
- });
416
- }
417
- else if (field.fieldType === 'Boolean' && field.leafType === 'String') {
412
+ else if (field.fieldType === 'Boolean' && field.leafFormatType === 'String') {
418
413
  results_1.filter(function (a) { return a[field.id]; }).forEach(function (result) {
419
414
  result[field.id] = result[field.id] === true ? 'Yes' : 'No';
420
415
  });
421
416
  }
422
- else if (field.fieldType === 'Boolean' && field.leafType === 'Number') {
417
+ else if (field.fieldType === 'Boolean' && field.leafFormatType === 'Number') {
423
418
  results_1.filter(function (a) { return a[field.id]; }).forEach(function (result) {
424
419
  result[field.id] = result[field.id] === true ? 1 : 0;
425
420
  });
426
421
  }
427
- else if (field.fieldType === 'Date' && field.leafType === 'Count') {
428
- results_1.filter(function (a) { return a[field.id]; }).forEach(function (result) {
429
- result[field.id] = result[field.id].toLocaleString();
430
- });
431
- }
432
- else if (field.fieldType === 'Date' && (field.leafType === 'Date')) {
422
+ else if (field.fieldType === 'Date' && (field.leafFormatType === 'Date')) {
433
423
  results_1.filter(function (a) { return a[field.id]; }).forEach(function (result) {
434
424
  result[field.id] = moment(result[field.id]).format('L');
435
425
  });
436
426
  }
437
- else if (field.fieldType === 'Date' && field.leafType === 'Time') {
427
+ else if (field.fieldType === 'Date' && field.leafFormatType === 'Time') {
438
428
  results_1.filter(function (a) { return a[field.id]; }).forEach(function (result) {
439
429
  result[field.id] = moment(result[field.id]).format('LT');
440
430
  });
441
431
  }
442
- else if (field.fieldType === 'Date' && (field.leafType === 'DateTime' || field.leafType === 'Minimum' || field.leafType === 'Maximum' || field.leafType === 'First' || field.leafType === 'Last')) {
432
+ else if (field.fieldType === 'Date' && field.leafFormatType === 'DateTime') {
443
433
  results_1.filter(function (a) { return a[field.id]; }).forEach(function (result) {
444
434
  result[field.id] = moment(result[field.id]).format('MM/DD/YYYY h:mm A');
445
435
  });
446
436
  }
447
- else if (field.fieldType === 'Date' && field.leafType === 'Date_long') {
437
+ else if (field.fieldType === 'Date' && field.leafFormatType === 'Date_long') {
448
438
  results_1.filter(function (a) { return a[field.id]; }).forEach(function (result) {
449
439
  result[field.id] = moment(result[field.id]).format('LL');
450
440
  });
451
441
  }
452
- else if (field.fieldType === 'Date' && field.leafType === 'DateTime_long') {
442
+ else if (field.fieldType === 'Date' && field.leafFormatType === 'DateTime_long') {
453
443
  results_1.filter(function (a) { return a[field.id]; }).forEach(function (result) {
454
444
  result[field.id] = moment(result[field.id]).format('LLL');
455
445
  });
456
446
  }
457
- else if (field.fieldType === 'Date' && field.leafType === 'Number') {
447
+ else if (field.fieldType === 'Date' && field.leafFormatType === 'Timestamp') {
458
448
  results_1.filter(function (a) { return a[field.id]; }).forEach(function (result) {
459
449
  result[field.id] = moment(result[field.id]).toDate().getTime();
460
450
  });
package/methods/report-builder.js CHANGED
@@ -306,25 +306,25 @@ function loadReportBuilderMethods(methodManager) {
306
306
  }
307
307
  });
308
308
  selectedFields.forEach(function (field) {
309
- if (field.leafType === 'Average') {
309
+ if (field.leafValueType === 'Average') {
310
310
  queryGroup_1[field.id] = { '$avg': '$' + (field.collection_name === rootCollectionName ? field.fieldPath.replace(/\.\$/g, '') : field.fieldPath.replace(/\.\$/g, '')) };
311
311
  }
312
- else if (field.leafType === 'Sum') {
312
+ else if (field.leafValueType === 'Sum') {
313
313
  queryGroup_1[field.id] = { '$sum': '$' + (field.collection_name === rootCollectionName ? field.fieldPath.replace(/\.\$/g, '') : field.fieldPath.replace(/\.\$/g, '')) };
314
314
  }
315
- else if (field.leafType === 'Count') {
315
+ else if (field.leafValueType === 'Count') {
316
316
  queryGroup_1[field.id] = { '$sum': 1 };
317
317
  }
318
- else if (field.leafType === 'Minimum') {
318
+ else if (field.leafValueType === 'Minimum') {
319
319
  queryGroup_1[field.id] = { '$min': '$' + (field.collection_name === rootCollectionName ? field.fieldPath.replace(/\.\$/g, '') : field.fieldPath.replace(/\.\$/g, '')) };
320
320
  }
321
- else if (field.leafType === 'Maximum') {
321
+ else if (field.leafValueType === 'Maximum') {
322
322
  queryGroup_1[field.id] = { '$max': '$' + (field.collection_name === rootCollectionName ? field.fieldPath.replace(/\.\$/g, '') : field.fieldPath.replace(/\.\$/g, '')) };
323
323
  }
324
- else if (field.leafType === 'First') {
324
+ else if (field.leafValueType === 'First') {
325
325
  queryGroup_1[field.id] = { '$first': '$' + (field.collection_name === rootCollectionName ? field.fieldPath.replace(/\.\$/g, '') : field.fieldPath.replace(/\.\$/g, '')) };
326
326
  }
327
- else if (field.leafType === 'Last') {
327
+ else if (field.leafValueType === 'Last') {
328
328
  queryGroup_1[field.id] = { '$last': '$' + (field.collection_name === rootCollectionName ? field.fieldPath.replace(/\.\$/g, '') : field.fieldPath.replace(/\.\$/g, '')) };
329
329
  }
330
330
  else {
@@ -412,25 +412,25 @@ function loadReportBuilderMethods(methodManager) {
412
412
  _id: 1
413
413
  };
414
414
  selectedFields.forEach(function (field) {
415
- if (field.leafType === 'Average') {
415
+ if (field.leafValueType === 'Average') {
416
416
  queryProjection[field.id] = { $avg: '$' + (field.collection_name === rootCollectionName ? field.fieldPath.replace(/\.\$/g, '') : field.fieldPath.replace(/\.\$/g, '')) };
417
417
  }
418
- else if (field.leafType === 'Sum') {
418
+ else if (field.leafValueType === 'Sum') {
419
419
  queryProjection[field.id] = { $sum: '$' + (field.collection_name === rootCollectionName ? field.fieldPath.replace(/\.\$/g, '') : field.fieldPath.replace(/\.\$/g, '')) };
420
420
  }
421
- else if (field.leafType === 'Count') {
421
+ else if (field.leafValueType === 'Count') {
422
422
  queryProjection[field.id] = { $sum: 1 };
423
423
  }
424
- else if (field.leafType === 'Minimum') {
424
+ else if (field.leafValueType === 'Minimum') {
425
425
  queryProjection[field.id] = { $min: '$' + (field.collection_name === rootCollectionName ? field.fieldPath.replace(/\.\$/g, '') : field.fieldPath.replace(/\.\$/g, '')) };
426
426
  }
427
- else if (field.leafType === 'Maximum') {
427
+ else if (field.leafValueType === 'Maximum') {
428
428
  queryProjection[field.id] = { $max: '$' + (field.collection_name === rootCollectionName ? field.fieldPath.replace(/\.\$/g, '') : field.fieldPath.replace(/\.\$/g, '')) };
429
429
  }
430
- else if (field.leafType === 'First') {
430
+ else if (field.leafValueType === 'First') {
431
431
  queryProjection[field.id] = { $slice: ['$' + (field.collection_name === rootCollectionName ? field.fieldPath.replace(/\.\$/g, '') : field.fieldPath.replace(/\.\$/g, '')), 0] };
432
432
  }
433
- else if (field.leafType === 'Last') {
433
+ else if (field.leafValueType === 'Last') {
434
434
  queryProjection[field.id] = { $slice: ['$' + (field.collection_name === rootCollectionName ? field.fieldPath.replace(/\.\$/g, '') : field.fieldPath.replace(/\.\$/g, '')), -1] };
435
435
  }
436
436
  else {
package/models/report-builder-report.model.d.ts CHANGED
@@ -66,7 +66,9 @@ export interface ReportBuilderReportFieldsSelected {
66
66
  isActive: boolean;
67
67
  isSelected: boolean;
68
68
  depth: number;
69
- leafType: string;
70
- leafTypes: string[];
69
+ leafValueType: string;
70
+ leafValueTypes: string[];
71
+ leafFormatType: string;
72
+ leafFormatTypes: string[];
71
73
  id?: string;
72
74
  }
package/models/report-builder.model.d.ts CHANGED
@@ -34,7 +34,8 @@ export interface TreeItem {
34
34
  rowNumber?: number;
35
35
  disabled?: boolean;
36
36
  layers?: any[];
37
- leafTypeValue?: string;
37
+ leafFieldTypeValue?: string;
38
+ leafValueTypeValue?: string;
38
39
  }
39
40
  export interface ReportTableColumn {
40
41
  collection: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@resolveio/server-lib",
3
- "version": "4.4.19",
3
+ "version": "4.4.21",
4
4
  "description": "",
5
5
  "main": "index.ts",
6
6
  "scripts": {