@gisce/ooui 0.7.0 → 0.7.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.
@@ -119,9 +119,10 @@ export function combineValuesForTimerange(_a) {
119
119
  });
120
120
  Object.keys(uniqueValues).forEach(function (key) {
121
121
  var valuesForKey = uniqueValues[key];
122
+ var operator = valuesForKey[0].operator === "count" ? "+" : valuesForKey[0].operator;
122
123
  var finalValue = getValueForOperator({
123
124
  values: valuesForKey.map(function (entry) { return entry.value; }),
124
- operator: valuesForKey[0].operator,
125
+ operator: operator,
125
126
  });
126
127
  finalValues.push(__assign(__assign({}, valuesForKey[0]), { value: finalValue }));
127
128
  });
@@ -1 +1 @@
1
- {"version":3,"file":"timerangeHelper.js","sourceRoot":"","sources":["../../../src/Graph/processor/timerangeHelper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"timerangeHelper.js","sourceRoot":"","sources":["../../../src/Graph/processor/timerangeHelper.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gisce/ooui",
3
- "version": "0.7.0",
3
+ "version": "0.7.1",
4
4
  "dependencies": {
5
5
  "moment": "^2.29.3"
6
6
  },
@@ -136,7 +136,6 @@ export function combineValuesForTimerange({
136
136
  timerange,
137
137
  });
138
138
  let finalValues: any[] = [];
139
-
140
139
  // group by x, type and stacked
141
140
  const uniqueValues: { [key: string]: any } = getUniqueValuesGroupedBy({
142
141
  values: adjustedValues,
@@ -145,10 +144,12 @@ export function combineValuesForTimerange({
145
144
 
146
145
  Object.keys(uniqueValues).forEach((key) => {
147
146
  const valuesForKey = uniqueValues[key];
147
+ const operator =
148
+ valuesForKey[0].operator === "count" ? "+" : valuesForKey[0].operator;
148
149
 
149
150
  const finalValue = getValueForOperator({
150
151
  values: valuesForKey.map((entry: any) => entry.value),
151
- operator: valuesForKey[0].operator,
152
+ operator,
152
153
  });
153
154
 
154
155
  finalValues.push({
@@ -398,7 +398,7 @@ describe("in processGraphData method", () => {
398
398
  expect(obj2!.type).toBe("Generació - sortida");
399
399
  });
400
400
 
401
- it("should do basic test with a timerange for days", () => {
401
+ it.only("should do basic test with a timerange for days", () => {
402
402
  const { data, isGroup, isStack } = getGraphData(
403
403
  `<?xml version="1.0"?>
404
404
  <graph type="line" timerange="day">
@@ -414,6 +414,11 @@ describe("in processGraphData method", () => {
414
414
 
415
415
  expect(data).toBeTruthy();
416
416
  expect(data.length).not.toBe(13);
417
+
418
+ const obj1 = data.find((d) => d.x === "2019-01-01");
419
+ expect(obj1).toBeTruthy();
420
+ expect(obj1!.value).toBe(3);
421
+
417
422
  expect(data.some((entry) => entry.x === false)).toBeFalsy();
418
423
  });
419
424
  });