awing-library 2.1.235-dev → 2.1.237-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 (3) hide show
  1. package/lib/ACM-AXN/Campaign/CreateOrEdit/TabSubCampaign/SubCampaignList.js +3 -2
  2. package/lib/AWING/DateRangePicker/component.js +16 -15
  3. package/package.json +1 -1
package/lib/ACM-AXN/Campaign/CreateOrEdit/TabSubCampaign/SubCampaignList.js CHANGED
@@ -118,7 +118,8 @@ function SubCampaignPreview(_a) {
118
118
  };
119
119
  return ((0, jsx_runtime_1.jsxs)(material_1.Card, { sx: {
120
120
  width: 214,
121
- height: 124,
121
+ minHeight: 124,
122
+ height: 'auto',
122
123
  marginLeft: function (theme) { return theme.spacing(2); },
123
124
  cursor: 'pointer',
124
125
  border: "2px solid ".concat(isSelected ? '#2196F3' : '#fafafa'),
@@ -159,6 +160,6 @@ function SubCampaignPreview(_a) {
159
160
  ? " (+".concat((0, Helpers_1.formatNumber)(subCampaign.campaignGroup.bonusAmount), ")")
160
161
  : '' })] }) }), (0, jsx_runtime_1.jsx)(material_1.Tooltip, { title: translationText.bonus, placement: "right", arrow: true, children: (0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "caption", children: subCampaign.campaignGroup.numberHasRun
161
162
  ? "".concat(translationText.numberHasRunText, ": ").concat((0, Helpers_1.formatNumber)(subCampaign.campaignGroup.numberHasRun))
162
- : '' }) })] }), (0, jsx_runtime_1.jsx)(material_1.CardActions, { style: { padding: '0 8px' }, children: renderStatus() })] }));
163
+ : '' }) })] }), (0, jsx_runtime_1.jsx)(material_1.CardActions, { style: { padding: '0 8px 8px 8px' }, children: renderStatus() })] }));
163
164
  }
164
165
  exports.SubCampaignPreview = SubCampaignPreview;
package/lib/AWING/DateRangePicker/component.js CHANGED
@@ -156,16 +156,16 @@ var DateRangePickerWrapper = function (props) {
156
156
  var _p = (0, react_1.useState)(initialStartDate), startDate = _p[0], setStartDate = _p[1];
157
157
  var _q = (0, react_1.useState)(initialEndDate), endDate = _q[0], setEndDate = _q[1];
158
158
  var _r = (0, react_1.useState)(true), isValid = _r[0], setIsValid = _r[1];
159
- var _s = (0, react_1.useState)("".concat(moment(value ? value === null || value === void 0 ? void 0 : value.startDate : startDate).format('DD/MM/YYYY'), " - ").concat(moment(value ? value === null || value === void 0 ? void 0 : value.endDate : endDate).format('DD/MM/YYYY'))), inputValue = _s[0], setInputValue = _s[1];
159
+ var _s = (0, react_1.useState)("".concat(moment(value ? value === null || value === void 0 ? void 0 : value.startDate : startDate).format('L'), " - ").concat(moment(value ? value === null || value === void 0 ? void 0 : value.endDate : endDate).format('L'))), inputValue = _s[0], setInputValue = _s[1];
160
160
  var _t = (0, react_i18next_1.useTranslation)(), i18n = _t.i18n, t = _t.t;
161
161
  var momentLanguage = (0, react_1.useMemo)(function () { var _a, _b; return ((_b = (_a = i18n === null || i18n === void 0 ? void 0 : i18n.language) === null || _a === void 0 ? void 0 : _a.split('-')) === null || _b === void 0 ? void 0 : _b[0]) || 'en'; }, [i18n.language]);
162
162
  (0, react_1.useEffect)(function () {
163
163
  if (value !== undefined) {
164
- var inputUpdate = "".concat(moment(value ? value === null || value === void 0 ? void 0 : value.startDate : startDate).format('DD/MM/YYYY'), " - ").concat(moment(value ? value === null || value === void 0 ? void 0 : value.endDate : endDate).format('DD/MM/YYYY'));
164
+ var inputUpdate = "".concat(moment(value ? value === null || value === void 0 ? void 0 : value.startDate : startDate).format('L'), " - ").concat(moment(value ? value === null || value === void 0 ? void 0 : value.endDate : endDate).format('L'));
165
165
  if (inputUpdate != inputValue) {
166
166
  setInputValue(inputUpdate);
167
- var momentStartDate = moment(value ? value === null || value === void 0 ? void 0 : value.startDate : startDate, 'DD/MM/YYYY', true);
168
- var momentEndDate = moment(value ? value === null || value === void 0 ? void 0 : value.endDate : endDate, 'DD/MM/YYYY', true);
167
+ var momentStartDate = moment(value ? value === null || value === void 0 ? void 0 : value.startDate : startDate, 'L', true);
168
+ var momentEndDate = moment(value ? value === null || value === void 0 ? void 0 : value.endDate : endDate, 'L', true);
169
169
  if (momentStartDate.isValid() &&
170
170
  momentEndDate.isValid() &&
171
171
  momentEndDate.diff(momentStartDate) >= 0) {
@@ -217,8 +217,8 @@ var DateRangePickerWrapper = function (props) {
217
217
  startDate: startDate,
218
218
  endDate: endDate,
219
219
  });
220
- var momentStartDate = moment(startDate, 'DD/MM/YYYY', true);
221
- var momentEndDate = moment(endDate, 'DD/MM/YYYY', true);
220
+ var momentStartDate = moment(startDate, 'L', true);
221
+ var momentEndDate = moment(endDate, 'L', true);
222
222
  if (momentStartDate.isValid() &&
223
223
  momentEndDate.isValid() &&
224
224
  momentEndDate.diff(momentStartDate) >= 0) {
@@ -226,7 +226,7 @@ var DateRangePickerWrapper = function (props) {
226
226
  }
227
227
  else
228
228
  setIsValid(false);
229
- setInputValue("".concat(moment(startDate).format('DD/MM/YYYY'), " - ").concat(moment(endDate).format('DD/MM/YYYY')));
229
+ setInputValue("".concat(moment(startDate).format('L'), " - ").concat(moment(endDate).format('L')));
230
230
  };
231
231
  var onFocusChange = function (focusedInput) {
232
232
  setFocusedInput(!focusedInput ? constants_1.START_DATE : focusedInput);
@@ -246,10 +246,10 @@ var DateRangePickerWrapper = function (props) {
246
246
  var resetDate = function () {
247
247
  setStartDate(initialStartDate);
248
248
  setEndDate(initialEndDate);
249
- setInputValue("".concat(moment(initialStartDate).format('DD/MM/YYYY'), " - ").concat(moment(initialEndDate).format('DD/MM/YYYY')));
249
+ setInputValue("".concat(moment(initialStartDate).format('L'), " - ").concat(moment(initialEndDate).format('L')));
250
250
  callback({
251
- startDate: getDataSet(moment(initialStartDate, 'DD/MM/YYYY')),
252
- endDate: getDataSet(moment(initialEndDate, 'DD/MM/YYYY')),
251
+ startDate: getDataSet(moment(initialStartDate, 'L')),
252
+ endDate: getDataSet(moment(initialEndDate, 'L')),
253
253
  });
254
254
  };
255
255
  var handleChangeInput = function (e) {
@@ -257,8 +257,8 @@ var DateRangePickerWrapper = function (props) {
257
257
  setInputValue(fieldValue);
258
258
  var fieldValueArr = (fieldValue === null || fieldValue === void 0 ? void 0 : fieldValue.split(' - ')) || [];
259
259
  var year1900 = moment('1900-01-01');
260
- var momentStartDate = moment(fieldValueArr[0], 'DD/MM/YYYY');
261
- var momentEndDate = moment(fieldValueArr[1], 'DD/MM/YYYY');
260
+ var momentStartDate = moment(fieldValueArr[0], 'L');
261
+ var momentEndDate = moment(fieldValueArr[1], 'L');
262
262
  if (isDayBlocked && isDayBlocked(momentStartDate)) {
263
263
  setIsValid(true);
264
264
  resetDate();
@@ -275,8 +275,8 @@ var DateRangePickerWrapper = function (props) {
275
275
  if (momentEndDate.isValid() && momentEndDate.diff(year1900) >= 0) {
276
276
  setEndDate(momentEndDate);
277
277
  }
278
- if (moment(fieldValueArr[0], 'DD/MM/YYYY', true).isValid() &&
279
- moment(fieldValueArr[1], 'DD/MM/YYYY', true).isValid() &&
278
+ if (moment(fieldValueArr[0], 'L', true).isValid() &&
279
+ moment(fieldValueArr[1], 'L', true).isValid() &&
280
280
  momentEndDate.diff(momentStartDate) >= 0) {
281
281
  setIsValid(true);
282
282
  callback({
@@ -351,7 +351,8 @@ var DateRangePickerWrapper = function (props) {
351
351
  setAnchorElPopover(null);
352
352
  handleDateRangePopover(null);
353
353
  };
354
- return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(react_input_mask_1.default, { mask: "99/99/9999 - 99/99/9999", maskplaceholder: "dd/mm/yyyy - dd/mm/yyyy", value: inputValue, onChange: handleChangeInput, disabled: props.disabled, children: function () {
354
+ var dateFormat = moment().localeData().longDateFormat("L");
355
+ return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(react_input_mask_1.default, { mask: "99/99/9999 - 99/99/9999", maskplaceholder: "".concat(dateFormat, " - ").concat(dateFormat), value: inputValue, onChange: handleChangeInput, disabled: props.disabled, children: function () {
355
356
  var _a;
356
357
  return ((0, jsx_runtime_1.jsx)(material_1.TextField, __assign({ required: required, "aria-describedby": id, variant: variant, label: label, error: !isValid || error, helperText: !disableHelperText
357
358
  ? error
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "awing-library",
3
- "version": "2.1.235-dev",
3
+ "version": "2.1.237-dev",
4
4
  "description": "",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",