awing-library 2.1.177-dev → 2.1.178-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 (4) hide show
  1. package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Analytic/container.d.ts +1 -1
  2. package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Analytic/container.js +12 -12
  3. package/lib/AWING/Chart/BarLineComponent.js +1 -0
  4. package/package.json +1 -1
package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Analytic/container.d.ts CHANGED
@@ -1,5 +1,5 @@
1
- import { AdministrativeUnit } from '../Types';
2
1
  import { CampaignGroupModel } from '../../../../../ACM-AXN/Campaign/Types';
2
+ import { AdministrativeUnit } from '../Types';
3
3
  export interface ICampaignAdGroup {
4
4
  campaignId?: string;
5
5
  campaignGroupId?: number | undefined;
package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Analytic/container.js CHANGED
@@ -15,17 +15,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
17
  var jsx_runtime_1 = require("react/jsx-runtime");
18
- var react_1 = require("react");
19
- var common_1 = require("../common");
20
- var Utils_1 = require("./Utils");
21
- var component_1 = __importDefault(require("./component"));
22
- var moment_1 = __importDefault(require("moment"));
23
18
  var Enum_1 = require("../../../../../ACM-AXN/Campaign/Enum");
24
- var lodash_1 = require("lodash");
25
- var Context_1 = __importDefault(require("../Context"));
26
19
  var exportFile_1 = require("../../../../../ACM-AXN/CampaignSchedule/exportFile");
27
20
  var Enum_2 = require("../../../../../ACM-AXN/Common/Enum");
28
21
  var Helpers_1 = require("../../../../../Utils/Helpers");
22
+ var lodash_1 = require("lodash");
23
+ var moment_1 = __importDefault(require("moment"));
24
+ var react_1 = require("react");
25
+ var Context_1 = __importDefault(require("../Context"));
26
+ var common_1 = require("../common");
27
+ var Utils_1 = require("./Utils");
28
+ var component_1 = __importDefault(require("./component"));
29
29
  var AnalyticContainer = function (props) {
30
30
  var campaignId = props.campaignId, startDate = props.startDate, endDate = props.endDate, subCampaigns = props.subCampaigns, domains = props.domains, campaignName = props.campaignName, fullPlaces = props.fullPlaces;
31
31
  var client = (0, Context_1.default)().services;
@@ -137,27 +137,27 @@ var AnalyticContainer = function (props) {
137
137
  switch (exportType) {
138
138
  case common_1.EXPORT_TYPES.Domain: {
139
139
  exportObj.data = (0, Utils_1.convertToExportDataGroupBy)(statisticalData, newObjects, timelineType, 'Domain', campaignName !== null && campaignName !== void 0 ? campaignName : '');
140
- exportObj.name += (0, Helpers_1.nameExportStandard)('Campaign', undefined, 'groupby_domain');
140
+ exportObj.name += (0, Helpers_1.nameExportStandard)('Campaign', campaignName, 'groupby_domain');
141
141
  break;
142
142
  }
143
143
  case common_1.EXPORT_TYPES.Export: {
144
144
  exportObj.data = (0, Utils_1.convertToExport)(subCampaigns, statisticalData, timelineType, selectedPlaces, campaignName !== null && campaignName !== void 0 ? campaignName : '', fullPlaces);
145
- exportObj.name += (0, Helpers_1.nameExportStandard)('Campaign', undefined, 'total');
145
+ exportObj.name += (0, Helpers_1.nameExportStandard)('Campaign', campaignName, 'total');
146
146
  break;
147
147
  }
148
148
  case common_1.EXPORT_TYPES.LocationGroup: {
149
149
  exportObj.data = (0, Utils_1.convertToExportDataGroupBy)(statisticalData, (0, Utils_1.dataGroupByPlace)(subCampaigns, ids), timelineType, 'Sub Campaign', campaignName !== null && campaignName !== void 0 ? campaignName : '');
150
- exportObj.name += (0, Helpers_1.nameExportStandard)('Campaign', undefined, 'groupby_subcampaign');
150
+ exportObj.name += (0, Helpers_1.nameExportStandard)('Campaign', campaignName, 'groupby_subcampaign');
151
151
  break;
152
152
  }
153
153
  case common_1.EXPORT_TYPES.Ad: {
154
154
  exportObj.data = (0, Utils_1.convertToExportByAd)(subCampaigns, statisticalData, timelineType, campaignName !== null && campaignName !== void 0 ? campaignName : '');
155
- exportObj.name += (0, Helpers_1.nameExportStandard)('Campaign', undefined, 'ad');
155
+ exportObj.name += (0, Helpers_1.nameExportStandard)('Campaign', campaignName, 'ad');
156
156
  break;
157
157
  }
158
158
  default: {
159
159
  exportObj.data = (0, Utils_1.convertToExportData)(statisticalData, selectedPlaces, timelineType, campaignName !== null && campaignName !== void 0 ? campaignName : '', fullPlaces);
160
- exportObj.name += (0, Helpers_1.nameExportStandard)('Campaign', undefined, 'groupby_place');
160
+ exportObj.name += (0, Helpers_1.nameExportStandard)('Campaign', campaignName, 'groupby_place');
161
161
  break;
162
162
  }
163
163
  }
package/lib/AWING/Chart/BarLineComponent.js CHANGED
@@ -46,6 +46,7 @@ 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;
49
50
  if (isTimelineHour) {
50
51
  var timeText = (0, moment_1.default)(timeFormat, 'YYYYMMDDHH').format('HH[h] DD-MM-YYYY');
51
52
  return t('Common.Hour') + ': ' + timeText;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "awing-library",
3
- "version": "2.1.177-dev",
3
+ "version": "2.1.178-dev",
4
4
  "description": "",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",