Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] Fix pivot groups

Browse source
This commit is contained in:
Julia Radzhabova 2021-03-09 14:43:05 +03:00
parent 6ff6f314ef
commit 3a0c941d73
2 changed files with 29 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -496,7 +496,7 @@ define([
} }
}); });
win.show(); win.show();
win.setSettings(rangePr, dateTypes, defRangePr, me.permissions.lang); win.setSettings(rangePr, dateTypes, defRangePr);
}, },
onClear: function(menu, item) { onClear: function(menu, item) {

24
apps/spreadsheeteditor/main/app/view/PivotGroupDialog.js
View file

@ -131,7 +131,7 @@ define([
labelText: this.textStart labelText: this.textStart
}); });
this.chStart.on('change', function (field, newValue, oldValue, eOpts) { this.chStart.on('change', function (field, newValue, oldValue, eOpts) {
if (newValue=='checked' && !me.dateTypes && me.defRangePr) { if (newValue=='checked' && me.defRangePr) {
me.inputStart.setValue(me.defRangePr.start); me.inputStart.setValue(me.defRangePr.start);
} }
}); });
@ -141,7 +141,7 @@ define([
labelText: this.textEnd labelText: this.textEnd
}); });
this.chEnd.on('change', function (field, newValue, oldValue, eOpts) { this.chEnd.on('change', function (field, newValue, oldValue, eOpts) {
if (newValue=='checked' && !me.dateTypes && me.defRangePr) { if (newValue=='checked' && me.defRangePr) {
me.inputEnd.setValue(me.defRangePr.end); me.inputEnd.setValue(me.defRangePr.end);
} }
}); });
@ -236,18 +236,18 @@ define([
this.btnOk.setDisabled(selected<1); this.btnOk.setDisabled(selected<1);
}, },
setSettings: function (rangePr, dateTypes, defRangePr, lang) { setSettings: function (rangePr, dateTypes, defRangePr) {
this.$window.find('.group-number').toggleClass('hidden', !!dateTypes); this.$window.find('.group-number').toggleClass('hidden', !!dateTypes);
this.$window.find('.group-date').toggleClass('hidden', !dateTypes); this.$window.find('.group-date').toggleClass('hidden', !dateTypes);
if (rangePr) { if (rangePr) {
this.chStart.setValue(rangePr.asc_getAutoStart(), true); this.chStart.setValue(rangePr.asc_getAutoStart(), true);
this.chEnd.setValue(rangePr.asc_getAutoEnd(), true); this.chEnd.setValue(rangePr.asc_getAutoEnd(), true);
this.inputStart.setValue((dateTypes ? new Date(rangePr.asc_getStartDate()).toLocaleDateString(lang) : rangePr.asc_getStartNum()) || ''); this.inputStart.setValue((dateTypes ? rangePr.asc_getStartDateText() : rangePr.asc_getStartNum()) || '');
this.inputEnd.setValue((dateTypes ? new Date(rangePr.asc_getEndDate()).toLocaleDateString(lang) : rangePr.asc_getEndNum()) || ''); this.inputEnd.setValue((dateTypes ? rangePr.asc_getEndDateText() : rangePr.asc_getEndNum()) || '');
!dateTypes && this.inputBy.setValue(rangePr.asc_getGroupInterval() || ''); !dateTypes && this.inputBy.setValue(rangePr.asc_getGroupInterval() || '');
this.rangePr = rangePr; this.rangePr = rangePr;
if (defRangePr) { if (defRangePr) {
this.defRangePr = {start: defRangePr.asc_getStartNum(), end: defRangePr.asc_getEndNum()}; this.defRangePr = {start: dateTypes ? defRangePr.asc_getStartDateText() : defRangePr.asc_getStartNum(), end: dateTypes ? defRangePr.asc_getEndDateText() : defRangePr.asc_getEndNum()};
} }
} }
if (dateTypes) { if (dateTypes) {
@ -274,8 +274,8 @@ define([
if (this.dateTypes) { if (this.dateTypes) {
this.dateTypes = this.listDate.getSelectedRec().map(function(item){return item.get('type');}); this.dateTypes = this.listDate.getSelectedRec().map(function(item){return item.get('type');});
this.rangePr.asc_setGroupInterval(this.spnDays.getNumberValue()); this.rangePr.asc_setGroupInterval(this.spnDays.getNumberValue());
this.rangePr.asc_setStartDate(new Date(this.inputStart.getValue()).getTime()); this.rangePr.asc_setStartDateText(this.inputStart.getValue());
this.rangePr.asc_setEndDate(new Date(this.inputEnd.getValue()).getTime()); this.rangePr.asc_setEndDateText(this.inputEnd.getValue());
} else { } else {
this.rangePr.asc_setStartNum(parseFloat(this.inputStart.getValue().toString().replace(',','.'))); this.rangePr.asc_setStartNum(parseFloat(this.inputStart.getValue().toString().replace(',','.')));
this.rangePr.asc_setEndNum(parseFloat(this.inputEnd.getValue().toString().replace(',','.'))); this.rangePr.asc_setEndNum(parseFloat(this.inputEnd.getValue().toString().replace(',','.')));
@ -288,13 +288,16 @@ define([
isRangeValid: function() { isRangeValid: function() {
if (this.dateTypes) { if (this.dateTypes) {
var res1 = new Date(this.inputStart.getValue().toString()).getTime(); if (this.rangePr) {
this.rangePr.asc_setStartDateText(this.inputStart.getValue());
var res1 = this.rangePr.asc_getStartDate();
if (isNaN(res1)) { if (isNaN(res1)) {
this.inputStart.showError([this.textError]); this.inputStart.showError([this.textError]);
this.inputStart.focus(); this.inputStart.focus();
return false; return false;
} }
var res2 = new Date(this.inputEnd.getValue().toString()).getTime(); this.rangePr.asc_setEndDateText(this.inputEnd.getValue());
var res2 = this.rangePr.asc_getEndDate();
if (isNaN(res2)) { if (isNaN(res2)) {
this.inputEnd.showError([this.textError]); this.inputEnd.showError([this.textError]);
this.inputEnd.focus(); this.inputEnd.focus();
@ -305,6 +308,7 @@ define([
this.inputEnd.focus(); this.inputEnd.focus();
return false; return false;
} }
}
} else { } else {
var regstr = new RegExp('^\s*[0-9]+[,.]?[0-9]*\s*$'); var regstr = new RegExp('^\s*[0-9]+[,.]?[0-9]*\s*$');
var res1 = this.inputStart.getValue().toString(); var res1 = this.inputStart.getValue().toString();