awing-library 2.1.129-beta → 2.1.129

package/lib/ACM-AXN/ScheduleCompletionRate/Detail/CompletionRate.js

@@ -46,21 +46,31 @@ function CompletionRate() {
     var scheduleCompletionRate = (0, recoil_1.useRecoilValue)(Recoils_1.scheduleCompletionRateAtom);
     var _b = (0, react_1.useState)(true), loading = _b[0], setLoading = _b[1];
     var _c = (0, react_1.useState)(Utils_1.QueryInputDetail), queryInput = _c[0], setQueryInput = _c[1];
-    var _d = (0, react_1.useState)(), scheduleGroupBy = _d[0], setScheduleGroupBy = _d[1];
+    var _d = (0, react_1.useState)([]), scheduleGroupBy = _d[0], setScheduleGroupBy = _d[1];
     (0, react_1.useEffect)(function () {
         var _a, _b, _c, _d;
         service
-            .scheduleCompletionRatesPaging((_b = (_a = scheduleCompletionRate === null || scheduleCompletionRate === void 0 ? void 0 : scheduleCompletionRate.filter) === null || _a === void 0 ? void 0 : _a.startDate) === null || _b === void 0 ? void 0 : _b.format('YYYY-MM-DD'), (_d = (_c = scheduleCompletionRate === null || scheduleCompletionRate === void 0 ? void 0 : scheduleCompletionRate.filter) === null || _c === void 0 ? void 0 : _c.endDate) === null || _d === void 0 ? void 0 : _d.format('YYYY-MM-DD'), campaignId, Number(groupId), 'date', queryInput.pageIndex, queryInput.pageSize)
+            .scheduleCompletionRatesGet({
+            fromDate: (_b = (_a = scheduleCompletionRate === null || scheduleCompletionRate === void 0 ? void 0 : scheduleCompletionRate.filter) === null || _a === void 0 ? void 0 : _a.startDate) === null || _b === void 0 ? void 0 : _b.format('YYYY-MM-DD'),
+            toDate: (_d = (_c = scheduleCompletionRate === null || scheduleCompletionRate === void 0 ? void 0 : scheduleCompletionRate.filter) === null || _c === void 0 ? void 0 : _c.endDate) === null || _d === void 0 ? void 0 : _d.format('YYYY-MM-DD'),
+            level: 1,
+            campaignAdGroups: [
+                {
+                    campaignId: campaignId,
+                    campaignGroupId: Number(groupId),
+                },
+            ],
+        })
             .then(function (res) {
-            var valueNew = (0, Utils_1.converData)((res === null || res === void 0 ? void 0 : res.items) || [], type, completionRateInfo === null || completionRateInfo === void 0 ? void 0 : completionRateInfo.billingUnit);
-            setScheduleGroupBy(__assign(__assign({}, res), { items: valueNew.length ? valueNew : [] }));
+            var valueNew = (0, Utils_1.converData)(res, type);
+            setScheduleGroupBy(valueNew);
             setScheduleCompletionRate(function (oldState) { return (__assign(__assign({}, oldState), { detailCompletionRateDate: valueNew.length ? valueNew : [] })); });
         })
             .finally(function () {
             setLoading(false);
         });
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [queryInput]);
+    }, []);
     var handleRowClick = function (itemRow) {
         navigate("".concat((0, moment_1.default)(itemRow.date).format('DD-MM-YYYY')));
     };
@@ -127,7 +137,7 @@ function CompletionRate() {
                         };
                     },
                 },
-            ], onRowClick: handleRowClick, rows: (scheduleGroupBy === null || scheduleGroupBy === void 0 ? void 0 : scheduleGroupBy.items) || [], getRowId: function (row) { return row; }, pageSize: queryInput.pageSize, pageIndex: queryInput.pageIndex, totalOfRows: (scheduleGroupBy === null || scheduleGroupBy === void 0 ? void 0 : scheduleGroupBy.totalItemCount) || 0, onPageIndexChange: function (pageIndex) {
+            ], onRowClick: handleRowClick, rows: (0, Helpers_1.offlinePaginate)(scheduleGroupBy, queryInput.pageIndex, queryInput.pageSize), getRowId: function (row) { return row; }, pageSize: queryInput.pageSize, pageIndex: queryInput.pageIndex, totalOfRows: scheduleGroupBy.length || 0, onPageIndexChange: function (pageIndex) {
                 setQueryInput(function (prev) { return (__assign(__assign({}, prev), { pageIndex: pageIndex })); });
             }, onPageSizeChange: function (pageSize) {
                 setQueryInput(function (prev) { return (__assign(__assign({}, prev), { pageSize: pageSize, pageIndex: 0 })); });

package/lib/ACM-AXN/ScheduleCompletionRate/Detail/CompletionRateDate.js

@@ -24,12 +24,12 @@ var react_1 = require("react");
 var moment_1 = __importDefault(require("moment"));
 var recoil_1 = require("recoil");
 var Router_1 = require("../../../AWING/Router");
-var Helpers_1 = require("../../../Utils/Helpers");
 var react_i18next_1 = require("react-i18next");
 var Hooks_1 = __importDefault(require("../Hooks"));
 var material_1 = require("@mui/material");
 var ClassicDrawer_1 = __importDefault(require("../../../Commons/Components/ClassicDrawer"));
 var Utils_1 = require("../Utils");
+var Helpers_1 = require("../../../Utils/Helpers");
 var AWING_1 = require("../../../AWING");
 var Recoils_1 = require("../Recoils");
 function CompletionRateDate() {
@@ -37,25 +37,32 @@ function CompletionRateDate() {
     var _a = (0, Router_1.useParams)(), campaignId = _a.campaignId, groupId = _a.groupId, date = _a.date;
     var service = (0, Hooks_1.default)().service;
     var completionRateDateInfo = (0, recoil_1.useRecoilValue)((0, Recoils_1.detailCompletionRateDateItem)(date));
-    console.log('completionRateDateInfo =================>', completionRateDateInfo);
     var type = (0, recoil_1.useRecoilValue)(Recoils_1.ScheduleCompletionRateTypeViewState).type;
     var schedule = (0, recoil_1.useRecoilValue)(Recoils_1.scheduleCompletionRateAtom);
     var _b = (0, react_1.useState)(true), loading = _b[0], setLoading = _b[1];
     var _c = (0, react_1.useState)(Utils_1.QueryInputDetail), queryInput = _c[0], setQueryInput = _c[1];
-    var _d = (0, react_1.useState)(), scheduleGroupByDate = _d[0], setScheduleGroupByDate = _d[1];
+    var _d = (0, react_1.useState)([]), scheduleGroupByDate = _d[0], setScheduleGroupByDate = _d[1];
     (0, react_1.useEffect)(function () {
         service
-            .scheduleCompletionRatesPaging((0, moment_1.default)(date, 'DD-MM-YYYY').format('YYYY-MM-DD'), (0, moment_1.default)(date, 'DD-MM-YYYY').format('YYYY-MM-DD'), campaignId, Number(groupId), 'placeId', queryInput.pageIndex, queryInput.pageSize)
+            .scheduleCompletionRatesGet({
+            fromDate: (0, moment_1.default)(date, 'DD-MM-YYYY').format('YYYY-MM-DD'),
+            toDate: (0, moment_1.default)(date, 'DD-MM-YYYY').format('YYYY-MM-DD'),
+            level: 2,
+            campaignAdGroups: [
+                {
+                    campaignId: campaignId,
+                    campaignGroupId: Number(groupId),
+                },
+            ],
+        })
             .then(function (res) {
-            console.log('res =================>', res);
-            var valueNew = (0, Utils_1.converData)((res === null || res === void 0 ? void 0 : res.items) || [], type, completionRateDateInfo === null || completionRateDateInfo === void 0 ? void 0 : completionRateDateInfo.billingUnit);
-            setScheduleGroupByDate(__assign(__assign({}, res), { items: valueNew.length ? valueNew : [] }));
+            setScheduleGroupByDate((0, Utils_1.converData)(res || [], type));
         })
             .finally(function () {
             setLoading(false);
         });
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [queryInput]);
+    }, []);
     return ((0, jsx_runtime_1.jsx)(ClassicDrawer_1.default, { title: "".concat(t('ScheduleCompletionRate.Date'), ": ").concat(loading && !date ? 'loading...' : date || '', " "), childrenWrapperStyle: { p: 3 }, children: loading ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) : ((0, jsx_runtime_1.jsx)(AWING_1.DataGrid, { spanningRows: (0, jsx_runtime_1.jsxs)(material_1.TableRow, { sx: {
                     flex: 1,
                     background: 'lightgrey',
@@ -77,7 +84,7 @@ function CompletionRateDate() {
                             return item.placeId === row.placeId;
                         });
                         return (itemPlace === null || itemPlace === void 0 ? void 0 : itemPlace.name)
-                            ? itemPlace === null || itemPlace === void 0 ? void 0 : itemPlace.name
+                            ? itemPlace.name
                             : "ID: ".concat(row.placeId);
                     },
                     width: 350,
@@ -122,7 +129,7 @@ function CompletionRateDate() {
                         };
                     },
                 },
-            ], rows: (scheduleGroupByDate === null || scheduleGroupByDate === void 0 ? void 0 : scheduleGroupByDate.items) || [], pageSize: queryInput.pageSize, pageIndex: queryInput.pageIndex, totalOfRows: (scheduleGroupByDate === null || scheduleGroupByDate === void 0 ? void 0 : scheduleGroupByDate.totalItemCount) || 0, onPageIndexChange: function (pageIndex) {
+            ], rows: (0, Helpers_1.offlinePaginate)(scheduleGroupByDate, queryInput.pageIndex, queryInput.pageSize), pageSize: queryInput.pageSize, pageIndex: queryInput.pageIndex, totalOfRows: scheduleGroupByDate.length || 0, onPageIndexChange: function (pageIndex) {
                 setQueryInput(function (prev) { return (__assign(__assign({}, prev), { pageIndex: pageIndex })); });
             }, onPageSizeChange: function (pageSize) {
                 setQueryInput(function (prev) { return (__assign(__assign({}, prev), { pageSize: pageSize, pageIndex: 0 })); });

package/lib/ACM-AXN/ScheduleCompletionRate/Filter.d.ts

@@ -3,10 +3,11 @@
  * @author dauquan1108@gmail.com on 03/13/2024.
  *
  **/
-import { FilterType } from './Types';
+import { FilterType, ScheduleCompletionRate } from './Types';
 interface PropsFilter {
     filter: FilterType;
     onUpdateFilter: (valueNew: FilterType) => void;
+    scheduleCompletionRate: ScheduleCompletionRate[];
 }
 declare function Filter(props: PropsFilter): import("react/jsx-runtime").JSX.Element;
 export default Filter;

package/lib/ACM-AXN/ScheduleCompletionRate/Filter.js

@@ -10,15 +10,6 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -45,6 +36,7 @@ var Utils_1 = require("./Utils");
 var recoil_1 = require("recoil");
 var Recoils_1 = require("./Recoils");
 var exportFile_1 = require("../../ACM-AXN/CampaignSchedule/exportFile");
+var lodash_1 = require("lodash");
 var useStyles = (0, styles_1.makeStyles)(function () { return ({
     outlinedInput: {
         '& .MuiOutlinedInput-input': {
@@ -68,7 +60,7 @@ var useStyles = (0, styles_1.makeStyles)(function () { return ({
     },
 }); });
 function Filter(props) {
-    var filter = props.filter, onUpdateFilter = props.onUpdateFilter;
+    var filter = props.filter, scheduleCompletionRate = props.scheduleCompletionRate, onUpdateFilter = props.onUpdateFilter;
     var t = (0, react_i18next_1.useTranslation)().t;
     var classes = useStyles();
     var snackbar = (0, Context_1.useAwing)().appHelper.snackbar;
@@ -78,13 +70,7 @@ function Filter(props) {
     var _a = (0, recoil_1.useRecoilState)(Recoils_1.ScheduleCompletionRateTypeViewState), filterType = _a[0], setFilterType = _a[1];
     var _b = (0, react_1.useState)(false), isLoadings = _b[0], setIsLoadings = _b[1];
     var _c = (0, react_1.useState)(), dateRangeInput = _c[0], setDateRangeInput = _c[1];
-    var _d = (0, react_1.useState)([
-        {
-            id: Utils_1.DefaultValueFilter.campaignId,
-            isNetwork: false,
-            name: t('Common.SelectAll'),
-        },
-    ]), campaigns = _d[0], setCampaigns = _d[1];
+    var _d = (0, react_1.useState)([]), campaigns = _d[0], setCampaigns = _d[1];
     (0, react_1.useEffect)(function () {
         var _a;
         if (!((_a = schedule === null || schedule === void 0 ? void 0 : schedule.places) === null || _a === void 0 ? void 0 : _a.length)) {
@@ -93,32 +79,15 @@ function Filter(props) {
             });
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [schedule]);
-    (0, react_1.useEffect)(function () {
-        var _a, _b;
-        service
-            .scheduleCompletionRatesQuery((_a = filter === null || filter === void 0 ? void 0 : filter.startDate) === null || _a === void 0 ? void 0 : _a.format('YYYY-MM-DD'), (_b = filter === null || filter === void 0 ? void 0 : filter.endDate) === null || _b === void 0 ? void 0 : _b.format('YYYY-MM-DD'))
-            .then(function (data) {
-            var listCampaign = data.map(function (item) { return (__assign(__assign({}, item.campaign), { isNetwork: item.isNetworkCampaign })); });
-            var campaign = campaigns.find(function (item) {
-                return item.id === (filter === null || filter === void 0 ? void 0 : filter.campaignId) &&
-                    item.id !== (Utils_1.DefaultValueFilter === null || Utils_1.DefaultValueFilter === void 0 ? void 0 : Utils_1.DefaultValueFilter.campaignId);
-            });
-            var isCampaign = listCampaign === null || listCampaign === void 0 ? void 0 : listCampaign.some(function (item) { return item.id === (filter === null || filter === void 0 ? void 0 : filter.campaignId); });
-            var tempCampaignList = __spreadArray([
-                {
-                    id: Utils_1.DefaultValueFilter.campaignId,
-                    name: t('Common.SelectAll'),
-                }
-            ], listCampaign, true);
-            var options = isCampaign
-                ? tempCampaignList
-                : campaign
-                    ? __spreadArray(__spreadArray([], tempCampaignList, true), [campaign], false) : tempCampaignList;
-            setCampaigns(options);
-        });
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [filter.startDate, filter.endDate]);
+    }, [schedule === null || schedule === void 0 ? void 0 : schedule.places.length]);
+    (0, react_1.useLayoutEffect)(function () {
+        setCampaigns((0, lodash_1.uniqBy)([
+            {
+                campaignId: Utils_1.DefaultValueFilter.campaignId,
+                campaignName: t('Common.SelectAll'),
+            },
+        ].concat(scheduleCompletionRate), 'campaignId'));
+    }, [scheduleCompletionRate, t]);
     var handleChangeQueryInput = function (queryParams) {
         onUpdateFilter(__assign(__assign({}, queryParams), { campaignId: filter.campaignId }));
     };
@@ -126,12 +95,17 @@ function Filter(props) {
         var _a, _b;
         setIsLoadings(true);
         service
-            .scheduleCompletionRatesExport((_a = filter === null || filter === void 0 ? void 0 : filter.startDate) === null || _a === void 0 ? void 0 : _a.format('YYYY-MM-DD'), (_b = filter === null || filter === void 0 ? void 0 : filter.endDate) === null || _b === void 0 ? void 0 : _b.format('YYYY-MM-DD'), filter.campaignId, undefined)
+            .scheduleCompletionRatesGet({
+            fromDate: (_a = filter === null || filter === void 0 ? void 0 : filter.startDate) === null || _a === void 0 ? void 0 : _a.format('YYYY-MM-DD'),
+            toDate: (_b = filter === null || filter === void 0 ? void 0 : filter.endDate) === null || _b === void 0 ? void 0 : _b.format('YYYY-MM-DD'),
+            level: 1,
+        })
             .then(function (res) {
-            var _a, _b, _c, _d;
-            var dataByCampaign = (_a = (0, DataSetConfig_1.DataSetConfigs)((0, Utils_1.convertExcelData)(res, campaigns, schedule.places, t, filterType.type), t, filter === null || filter === void 0 ? void 0 : filter.startDate, filter === null || filter === void 0 ? void 0 : filter.endDate)) === null || _a === void 0 ? void 0 : _a.sheetByCampaign;
-            var dataByCampaignDetail = (_b = (0, DataSetConfig_1.DataSetConfigs)((0, Utils_1.convertExcelData)(res, campaigns, schedule.places, t, filterType.type), t, filter === null || filter === void 0 ? void 0 : filter.startDate, filter === null || filter === void 0 ? void 0 : filter.endDate)) === null || _b === void 0 ? void 0 : _b.sheetCampaignDetail;
-            var fileName = "AWING_DELIVERY_STATUS_BY_DAY_".concat((_c = filter === null || filter === void 0 ? void 0 : filter.startDate) === null || _c === void 0 ? void 0 : _c.format('DD-MM-YYYY'), " to ").concat((_d = filter === null || filter === void 0 ? void 0 : filter.endDate) === null || _d === void 0 ? void 0 : _d.format('YYYYMMDD'));
+            var _a, _b;
+            var Data = (0, DataSetConfig_1.DataSetConfigs)((0, Utils_1.convertExcelData)(res, campaigns, schedule.places, filterType.type), filter === null || filter === void 0 ? void 0 : filter.startDate, filter === null || filter === void 0 ? void 0 : filter.endDate);
+            var dataByCampaign = Data === null || Data === void 0 ? void 0 : Data.sheetByCampaign;
+            var dataByCampaignDetail = Data === null || Data === void 0 ? void 0 : Data.sheetCampaignDetail;
+            var fileName = "AWING_DELIVERY_STATUS_BY_DAY_".concat((_a = filter === null || filter === void 0 ? void 0 : filter.startDate) === null || _a === void 0 ? void 0 : _a.format('DD-MM-YYYY'), " to ").concat((_b = filter === null || filter === void 0 ? void 0 : filter.endDate) === null || _b === void 0 ? void 0 : _b.format('YYYYMMDD'));
             var dataExport = [
                 {
                     dataSet: dataByCampaign,
@@ -172,7 +146,7 @@ function Filter(props) {
                                     setFilterType({
                                         type: e.target.value,
                                     });
-                                }, children: [(0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Constant_1.TypeView.billingUnit, children: t('Common.BillingUnit') }), (0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Constant_1.TypeView.impression, children: t('Common.Impression') })] })] }) }), (0, jsx_runtime_1.jsx)(material_1.Box, { sx: {
+                                }, children: [(0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Constant_1.TypeView.billingUnit, children: t('Campaign.BillingUnit.Title') }), (0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: Constant_1.TypeView.impression, children: t('Common.Impression') })] })] }) }), (0, jsx_runtime_1.jsx)(material_1.Box, { sx: {
                         width: '260px',
                         minWidth: '260px',
                         marginRight: '16px',
@@ -184,10 +158,15 @@ function Filter(props) {
                             className: classes.outlinedInput,
                         }, callback: handleChangeDateRange, isDayBlocked: function (day) {
                             var now = (0, moment_1.default)().endOf('day').valueOf();
-                            return now < day.valueOf();
+                            if (now < day.valueOf()) {
+                                return true;
+                            }
+                            else {
+                                return false;
+                            }
                         } }) }), (0, jsx_runtime_1.jsx)(SearchCampaign_1.default, { filter: filter, campaigns: campaigns, onUpdateFilter: onUpdateFilter }), (0, jsx_runtime_1.jsx)(material_1.Button, { variant: "contained", color: "primary", onClick: function () {
                         handleChangeQueryInput(dateRangeInput);
-                    }, style: { height: '40px' }, children: t('Common.View') }), (0, jsx_runtime_1.jsx)(material_1.Button, { variant: "contained", title: t('Common.Download'), onClick: function () { return handleChangeExportInput(); }, color: "inherit", disabled: isLoadings, style: {
+                    }, style: { height: '40px' }, children: t('Common.View') }), (0, jsx_runtime_1.jsx)(material_1.Button, { variant: "contained", title: t('Common.Download'), onClick: handleChangeExportInput, color: "inherit", disabled: isLoadings, style: {
                         marginLeft: '16px',
                         height: '40px',
                     }, children: isLoadings ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, { styleWrap: {

package/lib/ACM-AXN/ScheduleCompletionRate/Filter.test.js

@@ -207,7 +207,7 @@ jest.mock('../../ACM-AXN/Statistics/ControlPanel', function () { return function
 }; });
 var renderUi = function () {
     var mockOnUpdateFilter = jest.fn();
-    return (0, react_1.render)((0, jsx_runtime_1.jsx)(Filter_1.default, { filter: Utils_1.DefaultValueFilter, onUpdateFilter: mockOnUpdateFilter }));
+    return (0, react_1.render)((0, jsx_runtime_1.jsx)(Filter_1.default, { scheduleCompletionRate: [], filter: Utils_1.DefaultValueFilter, onUpdateFilter: mockOnUpdateFilter }));
 };
 describe('Filter component', function () {
     it('Check render component', function () {

package/lib/ACM-AXN/ScheduleCompletionRate/SearchCampaign.d.ts

@@ -3,10 +3,10 @@
  * @author dauquan1108@gmail.com on 03/27/2024.
  *
  **/
-import { FilterType, Campaign } from './Types';
+import { FilterType, ScheduleCompletionRate } from './Types';
 interface PropsSearchCampaign {
     filter: FilterType;
-    campaigns: Campaign[];
+    campaigns: ScheduleCompletionRate[];
     onUpdateFilter: (valueNew: FilterType) => void;
 }
 declare function SearchCampaign(props: PropsSearchCampaign): import("react/jsx-runtime").JSX.Element;

package/lib/ACM-AXN/ScheduleCompletionRate/SearchCampaign.js

@@ -11,6 +11,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+var react_1 = require("react");
 var jsx_runtime_1 = require("react/jsx-runtime");
 /**
  *
@@ -27,15 +28,8 @@ function SearchCampaign(props) {
             onUpdateFilter({
                 campaignId: reason === 'clear'
                     ? Utils_1.DefaultValueFilter.campaignId
-                    : campaignItem === null || campaignItem === void 0 ? void 0 : campaignItem.id,
+                    : campaignItem === null || campaignItem === void 0 ? void 0 : campaignItem.campaignId,
             });
-        }, sx: { marginRight: function (theme) { return theme.spacing(2); } }, getOptionLabel: function (option) { return (option === null || option === void 0 ? void 0 : option.name) || ''; }, value: campaigns.find(function (item) { return item.id === filter.campaignId; }), renderInput: function (params) { return ((0, jsx_runtime_1.jsx)(material_1.TextField, __assign({}, params, { label: t('CampaignPlan.CampaignName') }))); }, renderOption: function (props, option) { return ((0, jsx_runtime_1.jsxs)("li", __assign({}, props, { children: [option.name, (option === null || option === void 0 ? void 0 : option.isNetwork) && ((0, jsx_runtime_1.jsx)("span", { style: {
-                        backgroundColor: '#c49f47',
-                        color: '#ffffff',
-                        fontSize: '13px',
-                        marginLeft: '4px',
-                        padding: '1px 4px !important',
-                        borderRadius: '2px',
-                    }, children: "Network" }))] }))); } }));
+        }, sx: { marginRight: function (theme) { return theme.spacing(2); } }, getOptionLabel: function (option) { return (option === null || option === void 0 ? void 0 : option.campaignName) || ''; }, value: campaigns.find(function (item) { return item.campaignId === filter.campaignId; }), renderInput: function (params) { return ((0, jsx_runtime_1.jsx)(material_1.TextField, __assign({}, params, { label: t('CampaignPlan.CampaignName') }))); }, renderOption: function (props, option) { return ((0, react_1.createElement)("li", __assign({}, props, { key: option.campaignId }), option.campaignName || option.campaignId)); } }));
 }
 exports.default = SearchCampaign;

package/lib/ACM-AXN/ScheduleCompletionRate/Types.d.ts

@@ -33,11 +33,22 @@ export interface ScheduleCompletionRatePropsContext {
     service: ScheduleCompletionRateService;
 }
 export interface ScheduleCompletionRateService {
-    scheduleCompletionRatesGet: (fromDate: string | undefined, toDate: string | undefined, cancelToken?: CancelToken) => Promise<ScheduleCompletionRate[]>;
-    scheduleCompletionRatesQuery: (fromDate: string | undefined, toDate: string | undefined, cancelToken?: CancelToken) => Promise<CampaignPlanModel[]>;
-    scheduleCompletionRatesExport: (fromDate: string | undefined, toDate: string | undefined, campaignId: string | undefined, groupId: number | undefined, cancelToken?: CancelToken) => Promise<ScheduleCompletionRateExport[]>;
+    scheduleCompletionRatesGet: (body: ScheduleCompletionRateDTO | undefined, cancelToken?: CancelToken) => Promise<ScheduleCompletionRate[]>;
     placesGetAllByPlaceGroupHasPermission: (cancelToken?: CancelToken) => Promise<Place[]>;
-    scheduleCompletionRatesPaging: (fromDate: string | undefined, toDate: string | undefined, campaignId: string | undefined, groupId: number | undefined, groupBy: string | undefined, pageIndex: number | undefined, pageSize: number | undefined, cancelToken?: CancelToken) => Promise<PagedList_1OfScheduleCompletionRatePaging>;
+}
+export interface CampaignAdGroup {
+    campaignId?: string;
+    campaignGroupId?: number | undefined;
+    campaignAdId?: number | undefined;
+}
+export interface ScheduleCompletionRateDTO {
+    fromDate?: string;
+    toDate?: string;
+    campaignAdGroups?: CampaignAdGroup[] | undefined;
+    placeIds?: string[] | undefined;
+    domainIds?: string[] | undefined;
+    /** Cấp độ truy vấn. O = lấy tất cả theo campaign group, 1 = lấy theo campaign group date, 2 = lấy theo campaign, group, date và place */
+    level?: number;
 }
 export interface Place {
     placeId?: string;
@@ -101,41 +112,10 @@ export interface IScheduleCompletionRatePaging {
     totalQuantity?: number;
     totalRun?: number;
 }
-export interface PagedList_1OfScheduleCompletionRatePaging {
-    items?: ScheduleCompletionRatePaging[] | undefined;
-    pageCount?: number;
-    totalItemCount?: number;
-    pageNumber?: number;
-    pageSize?: number;
-    hasPreviousPage?: boolean;
-    hasNextPage?: boolean;
-}
-export interface ScheduleCompletionRateExport {
-    campaignId?: string;
-    placeId?: string;
-    groupId?: number;
-    groupName?: string | undefined;
-    billingUnit?: AnalyticType;
-    runs?: AnalyticEventSummary[] | undefined;
-    expecteds?: AnalyticEventSummary[] | undefined;
-    date?: string;
-}
 export interface Timestamp {
     seconds?: string;
     nanos?: number;
 }
-export interface Campaign {
-    id?: string;
-    directoryId?: string;
-    directoryPath?: string | undefined;
-    name?: string | undefined;
-    createdDate?: Timestamp;
-    isNetwork?: boolean;
-}
-export interface CampaignPlanModel {
-    campaign?: Campaign;
-    isNetworkCampaign?: boolean;
-}
 export declare enum AnalyticType {
     View = 0,
     Authentication = 1,
@@ -150,12 +130,12 @@ export interface ScheduleCompletionRate {
     campaignId?: string;
     campaignName?: string | undefined;
     billingUnit?: AnalyticType;
-    isNetWork?: boolean;
     placeId?: string;
     groupId?: number;
     groupName?: string | undefined;
     runs?: AnalyticEventSummary[] | undefined;
     expecteds?: AnalyticEventSummary[] | undefined;
+    date?: string;
     fromDate?: string;
     toDate?: string;
 }

package/lib/ACM-AXN/ScheduleCompletionRate/Utils.d.ts

@@ -4,7 +4,7 @@
  *
  **/
 import moment from 'moment';
-import { AnalyticEventSummary, Campaign, Place, ScheduleCompletionRate, ScheduleCompletionRateExport } from './Types';
+import { AnalyticEventSummary, Place, ScheduleCompletionRate } from './Types';
 export declare const QueryInputDetail: {
     pageIndex: number;
     pageSize: number;
@@ -14,24 +14,24 @@ export declare const DefaultValueFilter: {
     endDate: moment.Moment;
     campaignId: string;
 };
-export declare const convertExcelData: (resData: ScheduleCompletionRateExport[], campaigns: Campaign[], places: Place[], t: any, typeView: number) => any;
+export declare const convertExcelData: (resData: ScheduleCompletionRate[], campaigns: ScheduleCompletionRate[], places: Place[], typeView: number) => any;
 export interface IScheduleCompletionRateTypeView {
     type: number;
 }
 export declare const getValue: (itemType: AnalyticEventSummary[], billingUnit: number, type: number) => number;
-export declare const converData: (data: ScheduleCompletionRate[], typeView: number, billingUnit?: number) => {
+export declare const converData: (data: ScheduleCompletionRate[], typeView: number) => {
     totalRun: number;
-    billingUnit: number | undefined;
+    billingUnit: import("./Types").AnalyticType | undefined;
     totalQuantity: number;
     rate: number;
     campaignId?: string | undefined;
     campaignName?: string | undefined;
-    isNetWork?: boolean | undefined;
     placeId?: string | undefined;
     groupId?: number | undefined;
     groupName?: string | undefined;
     runs?: AnalyticEventSummary[] | undefined;
     expecteds?: AnalyticEventSummary[] | undefined;
+    date?: string | undefined;
     fromDate?: string | undefined;
     toDate?: string | undefined;
 }[];

package/lib/ACM-AXN/ScheduleCompletionRate/Utils.js

@@ -30,6 +30,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.converData = exports.getValue = exports.convertExcelData = exports.DefaultValueFilter = exports.QueryInputDetail = void 0;
 var lodash_1 = __importDefault(require("lodash"));
+var i18n_1 = __importDefault(require("../../i18n"));
 var moment_1 = __importDefault(require("moment"));
 var Enum_1 = require("../../ACM-AXN/Common/Enum");
 var Constant_1 = require("../../ACM-AXN/Common/Constant");
@@ -39,22 +40,24 @@ exports.QueryInputDetail = {
 };
 exports.DefaultValueFilter = {
     startDate: (0, moment_1.default)().subtract(7, 'days'),
-    endDate: (0, moment_1.default)(),
+    endDate: (0, moment_1.default)().add(-1, 'days'),
     campaignId: '0',
 };
-var convertExcelData = function (resData, campaigns, places, t, typeView) {
+var convertExcelData = function (resData, campaigns, places, typeView) {
     var excelData = __spreadArray([], resData.map(function (data) {
         var _a, _b, _c;
-        var filterCampaignName = (_a = campaigns.find(function (item) { return item.id === data.campaignId; })) === null || _a === void 0 ? void 0 : _a.name;
+        var filterCampaignName = (_a = campaigns.find(function (item) {
+            return item.campaignId === data.campaignId;
+        })) === null || _a === void 0 ? void 0 : _a.campaignName;
         var campaignName = Number(data === null || data === void 0 ? void 0 : data.campaignId) !== -1
             ? filterCampaignName
-            : t('ScheduleCompletionRate.CampaignDefault');
+            : i18n_1.default.t('ScheduleCompletionRate.CampaignDefault');
         var placeName = (_c = (_b = places.find(function (item) { return item.placeId === (data === null || data === void 0 ? void 0 : data.placeId); })) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : '';
         var totalQuantity = getEventTotal(data === null || data === void 0 ? void 0 : data.expecteds, typeView === Constant_1.TypeView.impression
             ? Constant_1.ValueAnalyticType.VIEW
             : Constant_1.ValueAnalyticType.AUTHENTICATION) || 0;
         var totalRun = (0, exports.getValue)(data === null || data === void 0 ? void 0 : data.runs, data === null || data === void 0 ? void 0 : data.billingUnit, typeView);
-        var rate = totalQuantity !== 0 ? (totalRun / totalQuantity) * 100 : 0;
+        var rate = totalQuantity > 0 ? (totalRun / totalQuantity) * 100 : 0;
         return {
             campaignName: campaignName,
             groupName: !data.groupName ? 'IS-NULL' : data.groupName,
@@ -77,12 +80,12 @@ var getEventTotal = function (itemType, label) {
 };
 var getValue = function (itemType, billingUnit, type) {
     var value = 0;
-    if (type === Constant_1.TypeView.impression || billingUnit === Enum_1.AnalyticType.VIEW) {
+    if (type === Constant_1.TypeView.impression || billingUnit === Enum_1.AnalyticType.View) {
         value = getEventTotal(itemType, Constant_1.ValueAnalyticType.VIEW) || 0;
     }
     else {
         switch (billingUnit) {
-            case Enum_1.AnalyticType.AUTHENTICATION:
+            case Enum_1.AnalyticType.Authentication:
                 value =
                     getEventTotal(itemType, Constant_1.ValueAnalyticType.AUTHENTICATION) ||
                         0;
@@ -95,14 +98,14 @@ var getValue = function (itemType, billingUnit, type) {
     return value;
 };
 exports.getValue = getValue;
-var converData = function (data, typeView, billingUnit) {
+var converData = function (data, typeView) {
     return data.map(function (item) {
         var totalQuantity = getEventTotal(item === null || item === void 0 ? void 0 : item.expecteds, typeView === Constant_1.TypeView.impression
             ? Constant_1.ValueAnalyticType.VIEW
             : Constant_1.ValueAnalyticType.AUTHENTICATION) || 0;
-        var totalRun = (0, exports.getValue)(item === null || item === void 0 ? void 0 : item.runs, Number((item === null || item === void 0 ? void 0 : item.billingUnit) || billingUnit), typeView);
-        var rate = (totalRun / totalQuantity) * 100;
-        return __assign(__assign({}, item), { totalRun: totalRun, billingUnit: (item === null || item === void 0 ? void 0 : item.billingUnit) || billingUnit, totalQuantity: totalQuantity, rate: !isNaN(rate) && Number.isFinite(rate) ? rate : 0 });
+        var totalRun = (0, exports.getValue)(item === null || item === void 0 ? void 0 : item.runs, Number(item === null || item === void 0 ? void 0 : item.billingUnit), typeView);
+        var rate = totalQuantity > 0 ? (totalRun / totalQuantity) * 100 : 0;
+        return __assign(__assign({}, item), { totalRun: totalRun, billingUnit: item === null || item === void 0 ? void 0 : item.billingUnit, totalQuantity: totalQuantity, rate: rate });
     });
 };
 exports.converData = converData;

package/lib/ACM-AXN/Statistics/ControlPanel.js

@@ -93,7 +93,7 @@ function ControlPanel(_a) {
     var handleElementInput = function (initialFilters) {
         var updatedElementInputs = [];
         initialFilters.map(function (item, idx) {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d, _e, _f, _g;
             switch (item === null || item === void 0 ? void 0 : item.type) {
                 case Enums_1.TYPE_FILTERS.VIEW_BY: {
                     var element = __assign({ component: ((0, jsx_runtime_1.jsx)(material_1.TextField, { select: true, fullWidth: true, label: t('Common.ViewBy'), size: "small", onChange: function (e) {
@@ -123,8 +123,20 @@ function ControlPanel(_a) {
                     updatedElementInputs.push(element);
                     break;
                 }
+                case Enums_1.TYPE_FILTERS.SEARCH_BY_PLACE: {
+                    var element = __assign({ component: ((0, jsx_runtime_1.jsx)(material_1.TextField, { select: true, fullWidth: true, label: t('Common.TitleTypeView'), size: "small", onChange: function (e) {
+                                return handleChangeQueryInput &&
+                                    handleChangeQueryInput(item === null || item === void 0 ? void 0 : item.name, e.target.value);
+                            }, SelectProps: {
+                                native: true,
+                            }, variant: "outlined", style: { minWidth: 150 }, disabled: false, children: (_a = item === null || item === void 0 ? void 0 : item.initialData) === null || _a === void 0 ? void 0 : _a.map(function (data, index) {
+                                return ((0, jsx_runtime_1.jsx)("option", { value: data.value, children: data.label }, item.value));
+                            }) }, idx)), isEnhanced: (item === null || item === void 0 ? void 0 : item.isEnhanced) ? item === null || item === void 0 ? void 0 : item.isEnhanced : false, name: 'SearchByPlace' }, item);
+                    updatedElementInputs.push(element);
+                    break;
+                }
                 case Enums_1.TYPE_FILTERS.DATE_RANGE_PICKER: {
-                    var element = __assign({ component: ((0, jsx_runtime_1.jsx)(AWING_1.DateRangePicker, __assign({ isShowCalendarInfo: (_a = item === null || item === void 0 ? void 0 : item.isShowCalendarInfo) !== null && _a !== void 0 ? _a : true, isFutureDate: (_b = item === null || item === void 0 ? void 0 : item.isFutureDate) !== null && _b !== void 0 ? _b : false, label: "".concat(t('Common.StartDate'), " - ").concat(t('Common.EndDate')), initialStartDate: (_c = item === null || item === void 0 ? void 0 : item.defaultValue) === null || _c === void 0 ? void 0 : _c.startDate, initialEndDate: (_d = item === null || item === void 0 ? void 0 : item.defaultValue) === null || _d === void 0 ? void 0 : _d.endDate, variant: "outlined", textFieldProps: {
+                    var element = __assign({ component: ((0, jsx_runtime_1.jsx)(AWING_1.DateRangePicker, __assign({ isShowCalendarInfo: (_b = item === null || item === void 0 ? void 0 : item.isShowCalendarInfo) !== null && _b !== void 0 ? _b : true, isFutureDate: (_c = item === null || item === void 0 ? void 0 : item.isFutureDate) !== null && _c !== void 0 ? _c : false, label: "".concat(t('Common.StartDate'), " - ").concat(t('Common.EndDate')), initialStartDate: (_d = item === null || item === void 0 ? void 0 : item.defaultValue) === null || _d === void 0 ? void 0 : _d.startDate, initialEndDate: (_e = item === null || item === void 0 ? void 0 : item.defaultValue) === null || _e === void 0 ? void 0 : _e.endDate, variant: "outlined", textFieldProps: {
                                 fullWidth: true,
                                 className: classes.outlinedInput,
                             }, callback: handleChangeDateRange }, ((item === null || item === void 0 ? void 0 : item.isDayBlocked) && {
@@ -167,7 +179,7 @@ function ControlPanel(_a) {
                     break;
                 }
                 case Enums_1.TYPE_FILTERS.NETWORK: {
-                    var element = __assign({ component: ((0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { color: "primary", defaultChecked: (_e = queryInput === null || queryInput === void 0 ? void 0 : queryInput.isCampaignNetwork) !== null && _e !== void 0 ? _e : true }), label: t('Statistic.Network.Title'), labelPlacement: "start", onChange: function (e) {
+                    var element = __assign({ component: ((0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { color: "primary", defaultChecked: (_f = queryInput === null || queryInput === void 0 ? void 0 : queryInput.isCampaignNetwork) !== null && _f !== void 0 ? _f : true }), label: t('Statistic.Network.Title'), labelPlacement: "start", onChange: function (e) {
                                 handleChangeQueryInput(item === null || item === void 0 ? void 0 : item.name, e.target.checked);
                             } }, idx)), isEnhanced: (item === null || item === void 0 ? void 0 : item.isEnhanced) ? item === null || item === void 0 ? void 0 : item.isEnhanced : false, name: 'isCampaignNetwork' }, item);
                     updatedElementInputs.push(element);
@@ -181,7 +193,7 @@ function ControlPanel(_a) {
                     break;
                 }
                 case Enums_1.TYPE_FILTERS.INCLUDE_RESERVED: {
-                    var element = __assign({ component: ((0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { color: "primary", defaultChecked: (_f = queryInput === null || queryInput === void 0 ? void 0 : queryInput.includeReserved) !== null && _f !== void 0 ? _f : true }), label: t('StatisticSchedulePlan.IncludeCampaignReserved'), labelPlacement: "start", onChange: function (e) {
+                    var element = __assign({ component: ((0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { color: "primary", defaultChecked: (_g = queryInput === null || queryInput === void 0 ? void 0 : queryInput.includeReserved) !== null && _g !== void 0 ? _g : true }), label: t('StatisticSchedulePlan.IncludeCampaignReserved'), labelPlacement: "start", onChange: function (e) {
                                 handleChangeQueryInput(item === null || item === void 0 ? void 0 : item.name, e.target.checked);
                             } }, idx)), isEnhanced: (item === null || item === void 0 ? void 0 : item.isEnhanced) ? item === null || item === void 0 ? void 0 : item.isEnhanced : false, name: 'includeReserved' }, item);
                     updatedElementInputs.push(element);

package/lib/ACM-AXN/Statistics/Enums.d.ts

@@ -9,7 +9,8 @@ export declare enum TYPE_FILTERS {
     NETWORK = "NetWork",
     CAMPAIGN_DEFAULT = "CampaignDefault",
     INCLUDE_RESERVED = "IncludeReserved",
-    DATE_RANGE_PICKER = "DateRangePicker"
+    DATE_RANGE_PICKER = "DateRangePicker",
+    SEARCH_BY_PLACE = "SearchByPlace"
 }
 export declare enum TYPE_CHART {
     PIE = "Pie",

package/lib/ACM-AXN/Statistics/Enums.js

@@ -14,6 +14,7 @@ var TYPE_FILTERS;
     TYPE_FILTERS["CAMPAIGN_DEFAULT"] = "CampaignDefault";
     TYPE_FILTERS["INCLUDE_RESERVED"] = "IncludeReserved";
     TYPE_FILTERS["DATE_RANGE_PICKER"] = "DateRangePicker";
+    TYPE_FILTERS["SEARCH_BY_PLACE"] = "SearchByPlace";
 })(TYPE_FILTERS || (exports.TYPE_FILTERS = TYPE_FILTERS = {}));
 var TYPE_CHART;
 (function (TYPE_CHART) {

package/lib/ACM-AXN/StatisticsAudienceDemographic/Tabs/AgeRange.js

@@ -62,6 +62,7 @@ var AgeRangeTabs = function (_a) {
                 fill: true,
                 borderWidth: 2,
                 yAxisID: 'y',
+                variant: '3',
             },
         ];
     };

package/lib/ACM-AXN/TaskScheduler/CreateOrEdit.js

@@ -41,7 +41,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
 var icons_material_1 = require("@mui/icons-material");
 var material_1 = require("@mui/material");
-var immer_1 = __importDefault(require("immer"));
+var immer_1 = require("immer");
 var react_1 = __importDefault(require("react"));
 var react_i18next_1 = require("react-i18next");
 var react_router_dom_1 = require("react-router-dom");
@@ -119,13 +119,13 @@ var CreateOrEdit = function () {
     var handleInputParamChange = function (path, value) {
         setConfirmExit(true);
         var keys = path.split('.');
-        setJobModel((0, immer_1.default)(function (draft) {
+        setJobModel((0, immer_1.produce)(function (draft) {
             (0, Helpers_1.setObject)(draft, keys, value);
             // draft.inputParameters[index] = item
         }));
     };
     var handleJobActionChange = function (jobAction) {
-        setJobModel((0, immer_1.default)(function (draf) {
+        setJobModel((0, immer_1.produce)(function (draf) {
             draf.inputParameters = jobAction.parameters.map(function (x) { return ({
                 key: x.name,
                 operator: x.operators[0],