awing-library 2.1.146-beta → 2.1.148-beta
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.
- package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Customer/component.js +2 -2
- package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Event/Util.js +1 -1
- package/lib/ACM-AXN/Campaign/CreateOrEdit/TabStatistic/Event/component.js +3 -3
- package/lib/ACM-AXN/Campaign/CreateOrEdit/TabSubCampaign/SubCampaignDetail.js +1 -1
- package/package.json +1 -1
|
@@ -103,10 +103,10 @@ var Customer = function (props) {
|
|
|
103
103
|
' ' +
|
|
104
104
|
(0, Helpers_1.roundDecimalNumber)(customerData.totalUser),
|
|
105
105
|
type: 'line',
|
|
106
|
-
data: customerData === null || customerData === void 0 ? void 0 : customerData.audienceObjects.map(function (item) { return ({
|
|
106
|
+
data: (0, Helpers_1.fillMissingDates)(customerData === null || customerData === void 0 ? void 0 : customerData.audienceObjects.map(function (item) { return ({
|
|
107
107
|
x: String(item.timeline),
|
|
108
108
|
y: item.totalUser,
|
|
109
|
-
}); })
|
|
109
|
+
}); }), queryInput.time.startDate, queryInput.time.endDate),
|
|
110
110
|
fill: false,
|
|
111
111
|
pointStyle: 'rect',
|
|
112
112
|
yAxisID: 'y',
|
|
@@ -75,7 +75,7 @@ function convertToExportData(data, places) {
|
|
|
75
75
|
var columns = Array.from(headCell);
|
|
76
76
|
var analytic = data.find(function (x) { return String(x.id) === el.analyticId; });
|
|
77
77
|
var place = places.find(function (x) { return x.placeId === (analytic === null || analytic === void 0 ? void 0 : analytic.placeId); });
|
|
78
|
-
var rowData =
|
|
78
|
+
var rowData = [
|
|
79
79
|
place ? place.name : analytic === null || analytic === void 0 ? void 0 : analytic.placeId,
|
|
80
80
|
analytic === null || analytic === void 0 ? void 0 : analytic.macAddress,
|
|
81
81
|
(0, Helpers_1.dateTimeToString)((0, Helpers_1.convertTimestampToDateTime)(analytic.createdDate), 'DD/MM/YYYY, HH'),
|
|
@@ -49,7 +49,7 @@ var Event = function (props) {
|
|
|
49
49
|
var queryData = function () {
|
|
50
50
|
getEventData(queryInput.time, queryInput.placeIds, queryInput.ids);
|
|
51
51
|
};
|
|
52
|
-
function convertDataSetPattern(eventData) {
|
|
52
|
+
function convertDataSetPattern(eventData, time) {
|
|
53
53
|
return lodash_1.default.chain(eventData)
|
|
54
54
|
.groupBy('eventLabel')
|
|
55
55
|
.map(function (data, eventLabel) {
|
|
@@ -69,7 +69,7 @@ var Event = function (props) {
|
|
|
69
69
|
return {
|
|
70
70
|
label: value.eventLabel + ' ' + (0, Helpers_1.roundDecimalNumber)(value.total),
|
|
71
71
|
type: 'line',
|
|
72
|
-
data: value.data,
|
|
72
|
+
data: (0, Helpers_1.fillMissingDates)(value.data, time.startDate, time.endDate),
|
|
73
73
|
fill: false,
|
|
74
74
|
pointStyle: 'rect',
|
|
75
75
|
yAxisID: 'y',
|
|
@@ -134,7 +134,7 @@ var Event = function (props) {
|
|
|
134
134
|
}
|
|
135
135
|
return result;
|
|
136
136
|
};
|
|
137
|
-
var dataConvert = convertDataSetPattern(eventData);
|
|
137
|
+
var dataConvert = convertDataSetPattern(eventData, queryInput.time);
|
|
138
138
|
return ((0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, spacing: 2, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, children: (0, jsx_runtime_1.jsx)(ChartFilter_1.default, { isExportType: false, subCampaigns: subCampaigns, queryInput: queryInput, onChangeQueryInput: changeQueryInput, onQueryData: queryData, onExportData: function () {
|
|
139
139
|
return exportData(queryInput.time, queryInput.placeIds, queryInput.ids);
|
|
140
140
|
}, domains: domains }) }), (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.jsxs)(material_1.Grid, { container: true, spacing: 2, sx: {
|
|
@@ -125,7 +125,7 @@ function SubCampaignDetail(props) {
|
|
|
125
125
|
? subCampaign.bonusAmount < 0
|
|
126
126
|
? translationText.notNegative
|
|
127
127
|
: translationText.helperText
|
|
128
|
-
: '' }) }),
|
|
128
|
+
: '' }) }), service.attributesGetByObjectTypeCode ? ((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: "billingUnit", required: true, select: true, variant: "standard", fullWidth: true, label: translationText.BillingUnit, value: String(subCampaign.billingUnit), onChange: function (e) {
|
|
129
129
|
onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { billingUnit: Number(e.target.value) })); });
|
|
130
130
|
}, error: subValid.billingUnit !== undefined &&
|
|
131
131
|
!subValid.billingUnit, helperText: subValid.billingUnit !== undefined &&
|