awing-library 2.1.176-dev → 2.1.178-dev

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Analytic/Utils.d.ts

@@ -2,7 +2,7 @@ import { CampaignGroupModel } from '../../../../../ACM-AXN/Campaign/Types';
 import { AnalyticType } from '../../../../../ACM-AXN/Common/Enum';
 import { DataObject } from '../../../../../AWING';
 import { AdministrativeUnit, IAnalyticCampaignSummary } from '../Types';
-export declare function convertToExportDataGroupBy(data: any, objects: any, timelineType: any, groupBy: any, campaignName: string, reportField: string): any[];
+export declare function convertToExportDataGroupBy(data: any, objects: any, timelineType: any, groupBy: any, campaignName: string): any[];
 export declare function convertToExportData(data: DataObject[], places: any, timelineType: any, campaignName: string, fullPlaces?: AdministrativeUnit[]): any[];
 export declare function convertToExport(subCampaigns: CampaignGroupModel[], data: DataObject[], timelineType: any, places: any[], campaignName: string, fullPlaces?: AdministrativeUnit[]): any[];
 export declare function convertToExportByAd(subCampaigns: CampaignGroupModel[], data: DataObject[], timelineType: any, campaignName: string): any[];

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Analytic/Utils.js

@@ -53,7 +53,7 @@ var Helpers_1 = require("../../../../../Utils/Helpers");
 var lodash_1 = __importStar(require("lodash"));
 var moment_1 = __importDefault(require("moment"));
 var i18n_1 = __importDefault(require("../../../../../i18n"));
-var addHeaderExcel = function (result, campaignName, reportField) {
+var addHeaderExcel = function (result, campaignName) {
     var timeExport = (0, moment_1.default)().format('DD/MM/YYYY, H:mm');
     result.push({
         columns: [i18n_1.default.t('Common.CampaignName'), campaignName],
@@ -70,15 +70,12 @@ var addHeaderExcel = function (result, campaignName, reportField) {
     }, {
         columns: [],
         data: [],
-    }, {
-        columns: [reportField],
-        data: [],
     });
 };
-function convertToExportDataGroupBy(data, objects, timelineType, groupBy, campaignName, reportField) {
+function convertToExportDataGroupBy(data, objects, timelineType, groupBy, campaignName) {
     var result = [];
     var spotTitle = i18n_1.default.t('Common.Spot');
-    addHeaderExcel(result, campaignName, reportField);
+    addHeaderExcel(result, campaignName);
     var exportData = objects
         .map(function (object, key) {
         var placeIds = object.places.map(function (plc) { return plc.placeId; });
@@ -95,9 +92,9 @@ function convertToExportDataGroupBy(data, objects, timelineType, groupBy, campai
     result.push({
         columns: [
             groupBy,
-            'Date',
+            i18n_1.default.t('Common.Date'),
             i18n_1.default.t('Common.Impression'),
-            i18n_1.default.t('Common.Engagement'),
+            i18n_1.default.t('Common.Engagement') + '(Spot)',
             spotTitle,
         ],
         data: exportData,
@@ -108,7 +105,7 @@ exports.convertToExportDataGroupBy = convertToExportDataGroupBy;
 function convertToExportData(data, places, timelineType, campaignName, fullPlaces) {
     var result = [];
     var spotTitle = i18n_1.default.t('Common.Spot');
-    addHeaderExcel(result, campaignName, i18n_1.default.t('Common.Location'));
+    addHeaderExcel(result, campaignName);
     result.push({
         columns: [
             i18n_1.default.t('Common.Location'),
@@ -142,7 +139,7 @@ function convertToExport(subCampaigns, data, timelineType, places, campaignName,
     var result = [];
     var isShouldHeader = true;
     var spotTitle = i18n_1.default.t('Common.Spot');
-    addHeaderExcel(result, campaignName, i18n_1.default.t('Common.GeneralData'));
+    addHeaderExcel(result, campaignName);
     subCampaigns.forEach(function (sub) {
         var _a;
         (_a = sub === null || sub === void 0 ? void 0 : sub.ads) === null || _a === void 0 ? void 0 : _a.forEach(function (ad) {
@@ -211,7 +208,7 @@ function convertToExportByAd(subCampaigns, data, timelineType, campaignName) {
     var result = [];
     var isShouldHeader = true;
     var spotTitle = i18n_1.default.t('Common.Spot');
-    addHeaderExcel(result, campaignName, 'Ad');
+    addHeaderExcel(result, campaignName);
     subCampaigns.forEach(function (sub) {
         var _a;
         (_a = sub === null || sub === void 0 ? void 0 : sub.ads) === null || _a === void 0 ? void 0 : _a.forEach(function (ad) {
@@ -392,7 +389,6 @@ function dataGroupByTimeline(place, data, timelineType) {
                 d[Enum_1.BaseEvent[Enum_2.AnalyticType.AUTHENTICATION]] +
                 d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]]) !== null && _a !== void 0 ? _a : 0);
         }
-        console.log('d[BaseEvent[AnalyticType.CLICK]] :>> ', d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]]);
         return (_b = sum + d[Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]]) !== null && _b !== void 0 ? _b : 0;
     }, 0);
     var totalArr = [
@@ -508,7 +504,9 @@ exports.dataGroupByPlace = dataGroupByPlace;
 function campaignAnalyticInfo(subCampaigns) {
     return {
         analyticTypes: Array.from(new Set(subCampaigns.map(function (x) { return x.campaignGroup.billingUnit; }))),
-        hasSpot: subCampaigns.some(function (sub) { return sub.ads.some(function (ad) { return ad.type === Enum_1.AdType.VIDEO; }); }),
+        hasSpot: subCampaigns.some(function (sub) {
+            return sub.ads.some(function (ad) { return ad.type === Enum_1.AdType.VIDEO; });
+        }),
         hasEg: subCampaigns.some(function (sub) {
             return sub.ads.some(function (ad) {
                 return (ad.type === Enum_1.AdType.VIDEO &&
@@ -539,7 +537,8 @@ var convertToChartData = function (data, campaignGroups, time) {
         if (!subCampaign)
             return;
         var billingUnit = subCampaign.campaignGroup.billingUnit;
-        var isSpot = ((_a = subCampaign.ads.find(function (s) { return s.id === x.campaignAdId; })) === null || _a === void 0 ? void 0 : _a.type) === Enum_1.AdType.VIDEO;
+        var isSpot = ((_a = subCampaign.ads.find(function (s) { return s.id === x.campaignAdId; })) === null || _a === void 0 ? void 0 : _a.type) ===
+            Enum_1.AdType.VIDEO;
         var timeline = x.timeline.toString();
         x.analyticEventSummaries.forEach(function (event) {
             var _a;

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Analytic/container.d.ts

@@ -1,5 +1,5 @@
-import { AdministrativeUnit } from '../Types';
 import { CampaignGroupModel } from '../../../../../ACM-AXN/Campaign/Types';
+import { AdministrativeUnit } from '../Types';
 export interface ICampaignAdGroup {
     campaignId?: string;
     campaignGroupId?: number | undefined;

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Analytic/container.js

@@ -15,17 +15,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
+var Enum_1 = require("../../../../../ACM-AXN/Campaign/Enum");
+var exportFile_1 = require("../../../../../ACM-AXN/CampaignSchedule/exportFile");
+var Enum_2 = require("../../../../../ACM-AXN/Common/Enum");
+var Helpers_1 = require("../../../../../Utils/Helpers");
+var lodash_1 = require("lodash");
+var moment_1 = __importDefault(require("moment"));
 var react_1 = require("react");
+var Context_1 = __importDefault(require("../Context"));
 var common_1 = require("../common");
 var Utils_1 = require("./Utils");
 var component_1 = __importDefault(require("./component"));
-var moment_1 = __importDefault(require("moment"));
-var Enum_1 = require("../../../../../ACM-AXN/Campaign/Enum");
-var lodash_1 = require("lodash");
-var Context_1 = __importDefault(require("../Context"));
-var exportFile_1 = require("../../../../../ACM-AXN/CampaignSchedule/exportFile");
-var Enum_2 = require("../../../../../ACM-AXN/Common/Enum");
-var i18n_1 = __importDefault(require("../../../../../i18n"));
 var AnalyticContainer = function (props) {
     var campaignId = props.campaignId, startDate = props.startDate, endDate = props.endDate, subCampaigns = props.subCampaigns, domains = props.domains, campaignName = props.campaignName, fullPlaces = props.fullPlaces;
     var client = (0, Context_1.default)().services;
@@ -131,33 +131,33 @@ var AnalyticContainer = function (props) {
             })
                 .value();
             var exportObj = {
-                name: "export_statistic_campaign_".concat(campaignId),
+                name: '',
                 data: [],
             };
             switch (exportType) {
                 case common_1.EXPORT_TYPES.Domain: {
-                    exportObj.data = (0, Utils_1.convertToExportDataGroupBy)(statisticalData, newObjects, timelineType, 'Domain', campaignName !== null && campaignName !== void 0 ? campaignName : '', 'Domain');
-                    exportObj.name += '_groupby_domain';
+                    exportObj.data = (0, Utils_1.convertToExportDataGroupBy)(statisticalData, newObjects, timelineType, 'Domain', campaignName !== null && campaignName !== void 0 ? campaignName : '');
+                    exportObj.name += (0, Helpers_1.nameExportStandard)('Campaign', campaignName, 'groupby_domain');
                     break;
                 }
                 case common_1.EXPORT_TYPES.Export: {
                     exportObj.data = (0, Utils_1.convertToExport)(subCampaigns, statisticalData, timelineType, selectedPlaces, campaignName !== null && campaignName !== void 0 ? campaignName : '', fullPlaces);
-                    exportObj.name += '_total';
+                    exportObj.name += (0, Helpers_1.nameExportStandard)('Campaign', campaignName, 'total');
                     break;
                 }
                 case common_1.EXPORT_TYPES.LocationGroup: {
-                    exportObj.data = (0, Utils_1.convertToExportDataGroupBy)(statisticalData, (0, Utils_1.dataGroupByPlace)(subCampaigns, ids), timelineType, 'Sub Campaign', campaignName !== null && campaignName !== void 0 ? campaignName : '', i18n_1.default.t('Common.SubCampaign'));
-                    exportObj.name += '_groupby_subcampaign';
+                    exportObj.data = (0, Utils_1.convertToExportDataGroupBy)(statisticalData, (0, Utils_1.dataGroupByPlace)(subCampaigns, ids), timelineType, 'Sub Campaign', campaignName !== null && campaignName !== void 0 ? campaignName : '');
+                    exportObj.name += (0, Helpers_1.nameExportStandard)('Campaign', campaignName, 'groupby_subcampaign');
                     break;
                 }
                 case common_1.EXPORT_TYPES.Ad: {
                     exportObj.data = (0, Utils_1.convertToExportByAd)(subCampaigns, statisticalData, timelineType, campaignName !== null && campaignName !== void 0 ? campaignName : '');
-                    exportObj.name += '_ad';
+                    exportObj.name += (0, Helpers_1.nameExportStandard)('Campaign', campaignName, 'ad');
                     break;
                 }
                 default: {
                     exportObj.data = (0, Utils_1.convertToExportData)(statisticalData, selectedPlaces, timelineType, campaignName !== null && campaignName !== void 0 ? campaignName : '', fullPlaces);
-                    exportObj.name += '_groupby_place';
+                    exportObj.name += (0, Helpers_1.nameExportStandard)('Campaign', campaignName, 'groupby_place');
                     break;
                 }
             }

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabSubCampaign/SubCampaignDetail.js

@@ -33,16 +33,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = __importStar(require("react"));
 var react_i18next_1 = require("react-i18next");
 var recoil_1 = require("recoil");
 var Enum_1 = require("../../../../ACM-AXN/Campaign/Enum");
-var Hooks_1 = __importDefault(require("../../../../ACM-AXN/Campaign/Hooks"));
 var Enum_2 = require("../../../../ACM-AXN/Common/Enum");
 var lodash_1 = require("lodash");
 var Utils_1 = require("../../Utils");
@@ -50,15 +46,15 @@ var Recoils_1 = require("../Recoils");
 var material_1 = require("@mui/material");
 function SubCampaignDetail(props) {
     var t = (0, react_i18next_1.useTranslation)().t;
-    var service = (0, Hooks_1.default)().service;
     var subCampaign = props.subCampaign, onSubCampaignChange = props.onSubCampaignChange, onChangeSubCampaignStatus = props.onChangeSubCampaignStatus;
+    var _a = (0, react_1.useState)(subCampaign.bonusAmount), bonusAmount = _a[0], setBonusAmount = _a[1];
     var getFormValid = function () { return ({
         name: (0, Utils_1.nameValid)(subCampaign.name),
         bookingAmount: !(0, Utils_1.checkPriority)(subCampaign.priority, Enum_1.CampaignPriority.ClassB) || (0, Utils_1.bookingValid)(subCampaign.bookingAmount),
         bonusAmount: (0, Utils_1.bonusValid)(subCampaign.bonusAmount),
         billingUnit: subCampaign.billingUnit !== null,
     }); };
-    var _a = react_1.default.useState(getFormValid), subValid = _a[0], setSubValid = _a[1];
+    var _b = react_1.default.useState(getFormValid), subValid = _b[0], setSubValid = _b[1];
     var isCreate = (0, recoil_1.useRecoilValue)(Recoils_1.isCreateState);
     (0, react_1.useEffect)(function () {
         onSubCampaignChange(function (prev) { return (0, lodash_1.cloneDeep)(prev); });
@@ -110,14 +106,16 @@ function SubCampaignDetail(props) {
                                 });
                             }, children: Object.values(Enum_1.CampaignPriority).map(function (priority) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: priority, children: t("Campaign.".concat(priority)) }, priority)); }) }) })] }), (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, style: { padding: 8, paddingTop: 0 }, children: [(0, Utils_1.checkPriority)(subCampaign.priority, Enum_1.CampaignPriority.ClassB) && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, style: { padding: 8 }, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "bookingAmount", required: true, fullWidth: true, variant: "standard", type: "number", label: translationText.booking, value: subCampaign.bookingAmount, onChange: function (e) {
                                         onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { bookingAmount: Number(e.target.value) })); });
+                                        setBonusAmount(Math.round(Number(e.target.value) * 0.05));
                                     }, onFocus: function (event) { return event.target.select(); }, error: subValid.bookingAmount !== undefined &&
                                         !subValid.bookingAmount, helperText: subValid.bookingAmount !== undefined &&
                                         !subValid.bookingAmount
                                         ? subCampaign.bookingAmount < 0
                                             ? translationText.notNegative
                                             : translationText.helperText
-                                        : '' }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, style: { padding: 8 }, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "bonusAmount", variant: "standard", fullWidth: true, type: "number", label: translationText.bonus, value: subCampaign.bonusAmount, onChange: function (e) {
+                                        : '' }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, style: { padding: 8 }, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "bonusAmount", variant: "standard", fullWidth: true, type: "number", label: translationText.bonus, value: bonusAmount, onChange: function (e) {
                                         var value = Number(e.target.value);
+                                        setBonusAmount(value);
                                         onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { bonusAmount: value })); });
                                     }, onFocus: function (event) { return event.target.select(); }, error: subValid.bonusAmount !== undefined &&
                                         !subValid.bonusAmount, helperText: subValid.bonusAmount !== undefined &&

package/lib/AWING/Chart/BarLineComponent.js

@@ -46,6 +46,7 @@ var BarLineComponent = function (props) {
                         //Sửa lại với thời gian theo giờ
                         var timeFormat = (_a = tooltipItems[0].raw) === null || _a === void 0 ? void 0 : _a.x;
                         var isTimelineHour = (timeFormat === null || timeFormat === void 0 ? void 0 : timeFormat.length) > 8;
+                        debugger;
                         if (isTimelineHour) {
                             var timeText = (0, moment_1.default)(timeFormat, 'YYYYMMDDHH').format('HH[h] DD-MM-YYYY');
                             return t('Common.Hour') + ': ' + timeText;

package/lib/AWING/Chart/PieComponent.js

@@ -59,7 +59,6 @@ var PieComponent = function (_a) {
                 },
                 callbacks: {
                     label: function (tooltipItem) {
-                        console.log('tooltipItem', tooltipItem);
                         return (' ' +
                             (tooltipItem === null || tooltipItem === void 0 ? void 0 : tooltipItem.label) +
                             ': ' +

package/lib/Utils/Helpers.d.ts

@@ -113,3 +113,4 @@ export declare function fillMissingDates(data: Array<{
     y: number;
 }[];
 export declare function parseJSON(str: string): any;
+export declare function nameExportStandard(nameFeature?: string, objectName?: string, subTitle?: string): string;

package/lib/Utils/Helpers.js

@@ -46,7 +46,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseJSON = exports.fillMissingDates = exports.setObject = exports.formatChartNumber = exports.updateObjectFields = exports.validateNumber = exports.getToday = exports.convertDataSetPattern = exports.convertAnalyticModelToChartDataAdvance = exports.getStartOfDay = exports.timestampToStringDDMMYYYY = exports.dateToStringDDMMYYYY = exports.convertTimelineToDateTime = exports.dateTimeToString = exports.convertTimestampToDateTime = exports.convertDateTimeToTimestamp = exports.checkValidUrl = exports.validateAnalyticTypes = exports.stringToListAccessPoint = exports.checkValidMacAddress = exports.checkValidStringListAP = exports.convertTimeLine = exports.WMAPEcalculator = exports.roundDecimalNumber = exports.convertArrayToObject = exports.offlinePaginate = exports.changeToAlias = exports.calculatorDirectoryIdRoot = exports.getRoutePath = exports.timestampToStringDDMMYYYYHHmm = exports.dateToStringddddDDMMYYYYHHmm = exports.downloadZipFile = exports.downloadFilePattern = exports.generateUUID = exports.displayLongString = exports.getQueryVariable = exports.formatNumber = exports.dateToString = exports.getCookie = exports.TIMELINE_TYPE = void 0;
+exports.nameExportStandard = exports.parseJSON = exports.fillMissingDates = exports.setObject = exports.formatChartNumber = exports.updateObjectFields = exports.validateNumber = exports.getToday = exports.convertDataSetPattern = exports.convertAnalyticModelToChartDataAdvance = exports.getStartOfDay = exports.timestampToStringDDMMYYYY = exports.dateToStringDDMMYYYY = exports.convertTimelineToDateTime = exports.dateTimeToString = exports.convertTimestampToDateTime = exports.convertDateTimeToTimestamp = exports.checkValidUrl = exports.validateAnalyticTypes = exports.stringToListAccessPoint = exports.checkValidMacAddress = exports.checkValidStringListAP = exports.convertTimeLine = exports.WMAPEcalculator = exports.roundDecimalNumber = exports.convertArrayToObject = exports.offlinePaginate = exports.changeToAlias = exports.calculatorDirectoryIdRoot = exports.getRoutePath = exports.timestampToStringDDMMYYYYHHmm = exports.dateToStringddddDDMMYYYYHHmm = exports.downloadZipFile = exports.downloadFilePattern = exports.generateUUID = exports.displayLongString = exports.getQueryVariable = exports.formatNumber = exports.dateToString = exports.getCookie = exports.TIMELINE_TYPE = void 0;
 var moment_1 = __importDefault(require("moment"));
 var i18n_1 = __importDefault(require("../i18n"));
 var helper_1 = require("../AWING/helper");
@@ -586,20 +586,29 @@ function fillMissingDates(data, startDate, endDate, format) {
     (0, lodash_1.xor)(data.map(function (d) { return d.x; }), dates).forEach(function (x) {
         result.push({ x: x, y: 0 });
     });
-    return (0, lodash_1.default)(result).groupBy('x').map(function (value, key) {
-        return ({
-            x: key,
-            y: lodash_1.default.sumBy(value, 'y')
-        });
-    }).orderBy(['x'], ['asc']).value();
+    return (0, lodash_1.default)(result)
+        .groupBy('x')
+        .map(function (value, key) { return ({
+        x: key,
+        y: lodash_1.default.sumBy(value, 'y'),
+    }); })
+        .orderBy(['x'], ['asc'])
+        .value();
 }
 exports.fillMissingDates = fillMissingDates;
 function parseJSON(str) {
     try {
-        return JSON.parse(str || "{}");
+        return JSON.parse(str || '{}');
     }
     catch (e) {
         return str;
     }
 }
 exports.parseJSON = parseJSON;
+//AWING_[NAME FEATURE]_[OBJECT_NAME]_[SUB_TITLE]_[DATEFORMAT yyyy-MM-DD]
+function nameExportStandard(nameFeature, objectName, subTitle) {
+    var currentTime = (0, moment_1.default)().format('YYYY-MM-DD');
+    var parts = [nameFeature, objectName, subTitle, currentTime].filter(Boolean);
+    return "AWING_".concat(parts.join('_').toUpperCase());
+}
+exports.nameExportStandard = nameExportStandard;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "awing-library",
-    "version": "2.1.176-dev",
+    "version": "2.1.178-dev",
     "description": "",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",