@forestadmin/agent 1.1.0 → 1.1.1
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.
|
@@ -79,7 +79,11 @@ class Chart extends collection_route_1.default {
|
|
|
79
79
|
}
|
|
80
80
|
async makeLineChart(context) {
|
|
81
81
|
const { aggregate, aggregate_field: aggregateField, group_by_date_field: groupByDateField, time_range: timeRange, } = context.request.body;
|
|
82
|
-
const
|
|
82
|
+
const filter = await this.getFilter(context);
|
|
83
|
+
const filterOnlyWithValues = filter.override({
|
|
84
|
+
conditionTree: datasource_toolkit_1.ConditionTreeFactory.intersect(filter.conditionTree, new datasource_toolkit_1.ConditionTreeLeaf(groupByDateField, 'Present')),
|
|
85
|
+
});
|
|
86
|
+
const rows = await this.collection.aggregate(query_string_1.default.parseCaller(context), filterOnlyWithValues, new datasource_toolkit_1.Aggregation({
|
|
83
87
|
operation: aggregate,
|
|
84
88
|
field: aggregateField,
|
|
85
89
|
groups: [{ field: groupByDateField, operation: timeRange }],
|
|
@@ -159,4 +163,4 @@ Chart.formats = {
|
|
|
159
163
|
Month: 'MMM yy',
|
|
160
164
|
Year: 'yyyy',
|
|
161
165
|
};
|
|
162
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
166
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"chart.js","sourceRoot":"","sources":["../../../src/routes/access/chart.ts"],"names":[],"mappings":"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"}
|