awing-library 2.1.178-dev → 2.1.180-dev

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 (3) hide show
  1. package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Analytic/Utils.js +10 -50
  2. package/lib/AWING/Chart/BarLineComponent.js +0 -1
  3. package/package.json +2 -3
package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Analytic/Utils.js CHANGED
@@ -143,7 +143,6 @@ function convertToExport(subCampaigns, data, timelineType, places, campaignName,
143
143
  subCampaigns.forEach(function (sub) {
144
144
  var _a;
145
145
  (_a = sub === null || sub === void 0 ? void 0 : sub.ads) === null || _a === void 0 ? void 0 : _a.forEach(function (ad) {
146
- var hasSpot = false;
147
146
  var adData = data
148
147
  .filter(function (d) {
149
148
  var _a;
@@ -151,7 +150,7 @@ function convertToExport(subCampaigns, data, timelineType, places, campaignName,
151
150
  d.campaignAdId === ad.id);
152
151
  })
153
152
  // eslint-disable-next-line no-sequences
154
- .map(function (x) { return ((hasSpot = hasSpot || x.isSPot), __assign(__assign({}, x), Object.assign.apply(Object, __spreadArray(__spreadArray([{}], Object.values(Enum_1.BaseEvent).map(function (v) {
153
+ .map(function (x) { return (__assign(__assign({}, x), Object.assign.apply(Object, __spreadArray(__spreadArray([{}], Object.values(Enum_1.BaseEvent).map(function (v) {
155
154
  var _a;
156
155
  return (_a = {},
157
156
  _a[v] = 0,
@@ -246,16 +245,6 @@ function convertToExportByAd(subCampaigns, data, timelineType, campaignName) {
246
245
  ], d, true); }),
247
246
  });
248
247
  isShouldHeader = false;
249
- Array.prototype.push.apply(result, (0, lodash_1.chain)(adData)
250
- .groupBy('placeId')
251
- .map(function (value, key) {
252
- var placeData = {
253
- columns: Array(7).fill(''),
254
- data: dataGroupByAd(value, timelineType).map(function (d) { return __spreadArray([ad === null || ad === void 0 ? void 0 : ad.name], d, true); }),
255
- };
256
- return placeData;
257
- })
258
- .value());
259
248
  });
260
249
  });
261
250
  return result;
@@ -370,26 +359,15 @@ function dataGroupByTimeline(place, data, timelineType) {
370
359
  : 'DD/MM/YYYY, H:mm');
371
360
  var impression = (0, lodash_1.sumBy)(value, Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW]);
372
361
  var authen = value.reduce(function (sum, d) {
373
- var _a, _b;
374
- if (d.isSPot) {
375
- return (sum +
376
- Number((_a = d[Enum_1.BaseEvent[Enum_2.AnalyticType.AUTHENTICATION]] +
377
- d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]]) !== null && _a !== void 0 ? _a : 0));
378
- }
379
- return sum + Number((_b = d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]]) !== null && _b !== void 0 ? _b : 0);
362
+ return (sum +
363
+ Number(d[Enum_1.BaseEvent[Number(d.billingUnit)]] || 0));
380
364
  }, 0);
381
365
  return [place, dateString, impression, authen];
382
366
  })
383
367
  .value();
384
368
  var impressionTotal = (0, lodash_1.sumBy)(data, Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW]);
385
369
  var authenTotal = data.reduce(function (sum, d) {
386
- var _a, _b;
387
- if (d.isSPot) {
388
- return ((_a = sum +
389
- d[Enum_1.BaseEvent[Enum_2.AnalyticType.AUTHENTICATION]] +
390
- d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]]) !== null && _a !== void 0 ? _a : 0);
391
- }
392
- return (_b = sum + d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]]) !== null && _b !== void 0 ? _b : 0;
370
+ return (sum + d[Enum_1.BaseEvent[Number(d.billingUnit)]]);
393
371
  }, 0);
394
372
  var totalArr = [
395
373
  place,
@@ -410,24 +388,15 @@ function dataGroupByTimelineAndPlaces(place, province, district, data, timelineT
410
388
  : 'DD/MM/YYYY, H:mm');
411
389
  var impression = (0, lodash_1.sumBy)(value, Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW]);
412
390
  var authen = value.reduce(function (sum, d) {
413
- if (d.isSPot) {
414
- return (sum +
415
- Number(d[Enum_1.BaseEvent[Enum_2.AnalyticType.AUTHENTICATION]] +
416
- d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]] || 0));
417
- }
418
- return sum + Number(d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]] || 0);
391
+ return (sum +
392
+ Number(d[Enum_1.BaseEvent[Number(d.billingUnit)]] || 0));
419
393
  }, 0);
420
394
  return [place, province, district, dateString, impression, authen];
421
395
  })
422
396
  .value();
423
397
  var impressionTotal = (0, lodash_1.sumBy)(data, Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW]);
424
398
  var authenTotal = data.reduce(function (sum, d) {
425
- if (d.isSPot) {
426
- return (sum +
427
- d[Enum_1.BaseEvent[Enum_2.AnalyticType.AUTHENTICATION]] +
428
- d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]]);
429
- }
430
- return sum + d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]];
399
+ return (sum + d[Enum_1.BaseEvent[Number(d.billingUnit)]]);
431
400
  }, 0);
432
401
  var totalArr = [
433
402
  place,
@@ -450,24 +419,15 @@ function dataGroupByAd(data, timelineType) {
450
419
  : 'DD/MM/YYYY, H:mm');
451
420
  var impression = (0, lodash_1.sumBy)(value, Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW]);
452
421
  var authen = value.reduce(function (sum, d) {
453
- if (d.isSPot) {
454
- return (sum +
455
- Number(d[Enum_1.BaseEvent[Enum_2.AnalyticType.AUTHENTICATION]] +
456
- d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]] || 0));
457
- }
458
- return sum + Number(d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]] || 0);
422
+ return (sum +
423
+ Number(d[Enum_1.BaseEvent[Number(d.billingUnit)]] || 0));
459
424
  }, 0);
460
425
  return [dateString, impression, authen];
461
426
  })
462
427
  .value();
463
428
  var impressionTotal = (0, lodash_1.sumBy)(data, Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW]);
464
429
  var authenTotal = data.reduce(function (sum, d) {
465
- if (d.isSPot) {
466
- return (sum +
467
- d[Enum_1.BaseEvent[Enum_2.AnalyticType.AUTHENTICATION]] +
468
- d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]]);
469
- }
470
- return sum + d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]];
430
+ return (sum + d[Enum_1.BaseEvent[Number(d.billingUnit)]]);
471
431
  }, 0);
472
432
  var totalArr = [i18n_1.default.t('Schedule.Total'), impressionTotal, authenTotal];
473
433
  result.push(totalArr);
package/lib/AWING/Chart/BarLineComponent.js CHANGED
@@ -46,7 +46,6 @@ var BarLineComponent = function (props) {
46
46
  //Sửa lại với thời gian theo giờ
47
47
  var timeFormat = (_a = tooltipItems[0].raw) === null || _a === void 0 ? void 0 : _a.x;
48
48
  var isTimelineHour = (timeFormat === null || timeFormat === void 0 ? void 0 : timeFormat.length) > 8;
49
- debugger;
50
49
  if (isTimelineHour) {
51
50
  var timeText = (0, moment_1.default)(timeFormat, 'YYYYMMDDHH').format('HH[h] DD-MM-YYYY');
52
51
  return t('Common.Hour') + ': ' + timeText;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "awing-library",
3
- "version": "2.1.178-dev",
3
+ "version": "2.1.180-dev",
4
4
  "description": "",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -26,7 +26,6 @@
26
26
  "@mui/lab": "5.0.0-alpha.149",
27
27
  "@mui/material": "^5.14.14",
28
28
  "@mui/styles": "^5.14.14",
29
- "@mui/x-charts": "^6.19.3",
30
29
  "@mui/x-date-pickers": "6.18.1",
31
30
  "@mui/x-tree-view": "^6.17.0",
32
31
  "@testing-library/jest-dom": "^6.1.4",
@@ -39,7 +38,7 @@
39
38
  "@types/react": "^18.2.31",
40
39
  "@types/react-dom": "^18.2.14",
41
40
  "aphrodite": "^2.4.0",
42
- "chart.js": "^4.4.1",
41
+ "chart.js": "^4.4.3",
43
42
  "chartjs-adapter-moment": "^1.0.1",
44
43
  "clsx": "^2.1.1",
45
44
  "concurrently": "^8.2.2",