awing-library 2.1.132-beta → 2.1.134-beta

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

@@ -72,7 +72,9 @@ function convertToExportDataGroupBy(data, objects, timelineType, groupBy) {
             groupBy,
             'Time',
             i18n_1.default.t('Common.Impression'),
+            i18n_1.default.t('Common.Engagement'),
             i18n_1.default.t('Common.FinalClick'),
+            'ER (%)',
             'CTR (%)',
         ],
         data: exportData,
@@ -87,7 +89,9 @@ function convertToExportData(data, places, timelineType) {
             'Place',
             'Time',
             i18n_1.default.t('Common.Impression'),
+            i18n_1.default.t('Common.Enagagement'),
             i18n_1.default.t('Common.FinalClick'),
+            'ER (%)',
             'CTR (%)',
         ],
         data: dataGroupByTimeline('All', data, timelineType),
@@ -97,7 +101,7 @@ function convertToExportData(data, places, timelineType) {
         .map(function (value, key) {
         var place = places.find(function (x) { return x.placeId === key; });
         var placeData = {
-            columns: ['', '', '', '', ''],
+            columns: Array(7).fill(''),
             data: dataGroupByTimeline(place ? place.name : key, value, timelineType),
         };
         return placeData;
@@ -130,8 +134,10 @@ function convertToExport(subCampaigns, data, timelineType, places) {
                         i18n_1.default.t('Common.Impression'),
                         i18n_1.default.t("Campaign.EngagementPerSpot"),
                         i18n_1.default.t('Common.FinalClick'),
+                        "ER (%)",
+                        "CTR (%)",
                     ]
-                    : Array(7).fill(''),
+                    : Array(9).fill(''),
                 data: dataGroupByTimeline('All', adData, timelineType).map(function (d) { var _a; return __spreadArray([(_a = sub === null || sub === void 0 ? void 0 : sub.campaignGroup) === null || _a === void 0 ? void 0 : _a.name, ad === null || ad === void 0 ? void 0 : ad.name], d, true); }),
             });
             isShouldHeader = false;
@@ -141,7 +147,7 @@ function convertToExport(subCampaigns, data, timelineType, places) {
                 .map(function (value, key) {
                 var place = places.find(function (x) { return x.placeId === key; });
                 var placeData = {
-                    columns: Array(7).fill(''),
+                    columns: Array(9).fill(''),
                     data: dataGroupByTimeline(place ? (place === null || place === void 0 ? void 0 : place.name) || place.placeId : key, value, timelineType).map(function (d) {
                         var _a;
                         return __spreadArray([
@@ -258,13 +264,14 @@ function dataGroupByTimeline(place, data, timelineType) {
     var impr = (0, lodash_1.sumBy)(data.filter(function (x) { return x.billingUnit === Enum_2.AnalyticType.VIEW; }), Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW]);
     var clk = (0, lodash_1.sumBy)(data.filter(function (x) { return x.billingUnit === Enum_2.AnalyticType.CLICK; }), Enum_1.BaseEvent[Enum_2.AnalyticType.CLICK]);
     var authen = (0, lodash_1.sumBy)(data.filter(function (x) { return x.billingUnit === Enum_2.AnalyticType.AUTHENTICATION; }), Enum_1.BaseEvent[Enum_2.AnalyticType.AUTHENTICATION]);
-    console.log("data", data);
     result.push([
         place,
         i18n_1.default.t('Schedule.Total'),
         impr,
         authen,
         clk,
+        (impr !== 0 ? (authen * 100) / impr : 0).toFixed(2),
+        (impr !== 0 ? (clk * 100) / impr : 0).toFixed(2),
     ]);
     return result;
 }
@@ -317,8 +324,8 @@ var convertToChartData = function (data, campaignGroups) {
         var timeline = x.timeline.toString();
         x.analyticEventSummaries.forEach(function (event) {
             var _a;
-            if (event.eventLabel === Enum_1.BaseEvent[billingUnit]) {
-                var objKey = event.eventLabel === Enum_1.BaseEvent[Enum_2.AnalyticType.AUTHENTICATION] ? (isSpot ? 'Spot' : 'Engagement') : event.eventLabel;
+            if ([Enum_1.BaseEvent[billingUnit], Enum_1.BaseEvent[Enum_2.AnalyticType.VIEW]].includes(event.eventLabel)) {
+                var objKey = event.eventLabel === Enum_1.BaseEvent[Enum_2.AnalyticType.AUTHENTICATION] ? isSpot ? 'Spot' : 'Engagement' : event.eventLabel;
                 (_a = convertData[objKey]) === null || _a === void 0 ? void 0 : _a.chartData.push({
                     y: event.total,
                     x: timeline,

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

@@ -127,8 +127,7 @@ var AnalyticContainer = function (props) {
                 break;
             }
         }
-        console.log("exportObj", exportObj);
-        (0, exportFile_1.downloadWithDataSet)(exportObj.name, exportObj.data);
+        (0, exportFile_1.downloadWithDataSet)(String(exportObj.name).toUpperCase(), exportObj.data);
         return;
     };
     return ((0, jsx_runtime_1.jsx)(component_1.default, { domains: domains, startDate: startDate, endDate: endDate, subCampaigns: subCampaigns, isLoading: isLoading, statisticalData: statisticalChartData, getStatisticalData: getStatisticalData, exportData: exportData }));

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Customer/component.js

@@ -89,8 +89,9 @@ var Customer = function (props) {
                                     },
                                 } }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 1, children: (0, jsx_runtime_1.jsx)(material_1.FormControl, { children: (0, jsx_runtime_1.jsx)(material_1.Button, { color: "primary", variant: "contained", onClick: function () { return queryData(); }, fullWidth: true, children: t('Common.View') }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 1, children: (0, jsx_runtime_1.jsx)(material_1.FormControl, { children: (0, jsx_runtime_1.jsx)(material_1.Button, { variant: "outlined", onClick: function () { return exportData(); }, children: (0, jsx_runtime_1.jsx)(GetApp_1.default, {}) }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 3 })] }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: isLoading ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) : ((0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, spacing: 2, sx: {
                         border: '1px solid #ccc',
-                        paddingTop: function (theme) { return theme.spacing(4); },
-                        marginTop: function (theme) { return theme.spacing(2.5); },
+                        paddingTop: 4,
+                        marginTop: 2,
+                        marginLeft: -1,
                     }, children: (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: (0, jsx_runtime_1.jsx)(material_1.Box, { sx: {
                                 padding: function (theme) { return theme.spacing(1); },
                                 paddingLeft: function (theme) { return theme.spacing(16); },

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

@@ -87,9 +87,9 @@ var EventContainer = function (props) {
             .finally(function () { return setIsLoading(false); });
     };
     var exportData = function (time, placeIds, ids) {
-        var places = placesOfCampaign.filter(function (p) {
+        var places = placeIds.length ? placesOfCampaign.filter(function (p) {
             return placeIds.includes(p.placeId);
-        });
+        }) : placesOfCampaign;
         client
             .campaignStatisticGetEvents({
             startDate: (0, moment_1.default)(time.startDate).format(Enum_1.DATE_FORMAT),

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabSubCampaign/SubCampaignDetail.d.ts

@@ -1,4 +1,4 @@
-import { SetStateAction, Dispatch } from 'react';
+import { Dispatch, SetStateAction } from 'react';
 import { CampaignGroup } from '../../Types';
 type SubCampaignDetailProps = {
     /**

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

@@ -33,20 +33,24 @@ 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 recoil_1 = require("recoil");
 var react_i18next_1 = require("react-i18next");
-// import { CampaignGroup, CampaignTicket } from '../../types'
+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 AWING_1 = require("../../../../AWING");
 var lodash_1 = require("lodash");
 var Utils_1 = require("../../Utils");
 var Recoils_1 = require("../Recoils");
-var AWING_1 = require("../../../../AWING");
-var Enum_1 = require("../../../../ACM-AXN/Campaign/Enum");
-var Enum_2 = require("../../../../ACM-AXN/Common/Enum");
 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 getFormValid = function () { return ({
         name: (0, Utils_1.nameValid)(subCampaign.name),
@@ -149,21 +153,24 @@ function SubCampaignDetail(props) {
                     type: 'number',
                 },
                 onValidate: function (value) { return (0, Utils_1.bonusValid)(Number(value)); },
-            }, {
-                fieldName: 'billingUnit',
-                type: 'select',
-                gridSize: 4,
-                label: translationText.BillingUnit,
-                required: true,
-                value: String(subCampaign.billingUnit),
-                onValidate: function (value) { return value !== null; },
-                options: Object.values(Enum_2.AnalyticType)
-                    .filter(function (item) { return !isNaN(Number(item)); })
-                    .map(function (item) { return ({
-                    text: t("Campaign.BillingUnit.".concat((0, lodash_1.capitalize)((0, lodash_1.camelCase)(Enum_2.AnalyticType[item])))),
-                    value: item,
-                }); }),
             });
+            if (service.attributesGetByObjectTypeCode) {
+                tempField.push({
+                    fieldName: 'billingUnit',
+                    type: 'select',
+                    gridSize: 4,
+                    label: translationText.BillingUnit,
+                    required: true,
+                    value: String(subCampaign.billingUnit),
+                    onValidate: function (value) { return value !== null; },
+                    options: Object.values(Enum_2.AnalyticType)
+                        .filter(function (item) { return !isNaN(Number(item)); })
+                        .map(function (item) { return ({
+                        text: t("Campaign.BillingUnit.".concat((0, lodash_1.capitalize)((0, lodash_1.camelCase)(Enum_2.AnalyticType[item])))),
+                        value: item,
+                    }); }),
+                });
+            }
         }
         tempField.push({
             fieldName: 'isReserved',

package/lib/ACM-AXN/Template/Import.js

@@ -56,8 +56,11 @@ var ImportTemplate = function () {
             fileName: tempFile === null || tempFile === void 0 ? void 0 : tempFile.name,
         });
     };
-    var handleChangeFormData = (0, react_1.useCallback)(function (obj) {
-        setBussinessData(function (prev) { return (__assign(__assign(__assign(__assign({}, prev), { id: prev.id || '0' }), obj), { directoryId: (obj === null || obj === void 0 ? void 0 : obj.directoryId) || rootDirectoryId })); });
+    var handleChangeFormData = (0, react_1.useCallback)(function (obj, valid, key) {
+        setBussinessData(function (prev) {
+            var _a;
+            return (__assign(__assign({}, prev), (_a = {}, _a[key] = obj[key], _a.id = prev.id || (obj === null || obj === void 0 ? void 0 : obj.id) || '0', _a.directoryId = (obj === null || obj === void 0 ? void 0 : obj.directoryId) || rootDirectoryId, _a)));
+        });
     }, [rootDirectoryId]);
     return ((0, jsx_runtime_1.jsxs)(ClassicDrawer_1.default, { title: t('TemplateManagement.ImportTemplate'), onSubmit: handleSubmit, disableButtonSubmit: !(tempFile === null || tempFile === void 0 ? void 0 : tempFile.name), confirmExit: true, childrenWrapperStyle: { padding: 0 }, children: [(0, jsx_runtime_1.jsx)(AWING_1.DataForm, { fields: [
                     {

package/lib/AWING/Chart/BarLineComponent.js

@@ -16,6 +16,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
 var material_1 = require("@mui/material");
+var styles_1 = require("@mui/styles");
 var Helpers_1 = require("../../Utils/Helpers");
 require("chartjs-adapter-moment");
 var moment_1 = __importDefault(require("moment"));
@@ -23,7 +24,28 @@ var react_i18next_1 = require("react-i18next");
 var i18n_1 = __importDefault(require("../../i18n"));
 var Enums_1 = require("./Enums");
 var Styles_1 = require("./Styles");
+var useStyles = (0, styles_1.makeStyles)({
+    point: {
+        position: "relative",
+        width: "10px",
+        height: "10px",
+        backgroundColor: "red",
+        borderRadius: "50%",
+        margin: "50px", /* for demonstration */
+        '&::after': {
+            content: '',
+            position: 'absolute',
+            top: '50%',
+            left: '-10px', /* Adjust as needed */
+            right: '-10px', /* Adjust as needed */
+            height: '2px', /* Thickness of the line */
+            backgroundColor: 'black',
+            transform: 'translateY(-50%)'
+        }
+    },
+});
 var BarLineComponent = function (props) {
+    var classes = useStyles();
     var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18n_1.default }).t;
     var optionsDefault = props.optionsDefault;
     var chart = props.chart, _a = props.width, width = _a === void 0 ? 'auto' : _a, _b = props.height, height = _b === void 0 ? 350 : _b, _c = props.timeline, timeline = _c === void 0 ? Enums_1.TYPE_TIMELINE.DAY : _c, _d = props.optionCustom, optionCustom = _d === void 0 ? {} : _d, dataChart = props.dataChart, type = props.type, _e = props.options, options = _e === void 0 ? {
@@ -82,7 +104,7 @@ var BarLineComponent = function (props) {
                 position: 'bottom',
                 labels: {
                     usePointStyle: true,
-                    pointStyle: 'circle',
+                    // pointStyle: 'circle',
                     boxHeight: 12,
                     boxWidth: 12,
                     padding: 30,
@@ -238,7 +260,11 @@ var BarLineComponent = function (props) {
                 boxSpan.style.height = '20px';
                 boxSpan.style.marginRight = '10px';
                 boxSpan.style.width = '20px';
-                boxSpan.style.borderRadius = '20px';
+                if ((item === null || item === void 0 ? void 0 : item.pointStyle) === 'circle') {
+                    console.log('classes.point', classes.point);
+                    // boxSpan.setAttribute("class", classes.point )
+                    boxSpan.style.borderRadius = '20px';
+                }
                 // Text
                 var textContainer = document.createElement('p');
                 textContainer.style.color = item.fontColor;

package/lib/translate/en/translation.json

@@ -394,7 +394,7 @@
         "DataType": "Data Type",
         "Url": "Url",
         "UrlNotValid": "Url is incorrect or too long (greater than 1000 characters)",
-        "Analytic": "Impression/Final Click",
+        "Analytic": "Impression/Click",
         "Event": "Event",
         "Customer": "Users",
         "TotalCustomer": "Total Customer",

package/lib/translate/vi/translation.json

@@ -38,7 +38,7 @@
         "SelectDateRange": "Chọn khoảng thời gian",
         "View": "Xem",
         "ViewBy": "Xem theo",
-        "Impression": "Lượt hiển thị",
+        "Impression": "Impression",
         "BillingUnit": "Đơn vị tính",
         "TitleTypeView": "Hiển thị theo",
         "Select": "Chọn",
@@ -88,7 +88,7 @@
         "Apply": "Áp dụng",
         "Detail": "Chi tiết",
         "Label": "Nhãn",
-        "FinalClick": "Lượt kết nối",
+        "FinalClick": "Click",
         "Permission": "Phân quyền",
         "Download": "Tải xuống",
         "Settings": "Cài đặt",
@@ -222,12 +222,12 @@
         "DisplayedRow ": "trong"
     },
     "Campaign": {
-        "Engagement": "Lượt tương tác",
+        "Engagement": "Engagement",
         "EngagementPerSpot": "Engagement / Spot",
         "Egr": "Tỉ lệ tương tác",
         "Spot": "Spot",
-        "Impression": "Lượt hiển thị",
-        "Click": "Lượt kết nối",
+        "Impression": "Impression",
+        "Click": "Click",
         "Create": "Tạo chiến dịch",
         "ClickToCopy": "Nhấn để sao chép",
         "Copied": "Đã sao chép",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "awing-library",
-  "version": "2.1.132-beta",
+  "version": "2.1.134-beta",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",