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

[SSE] Disable switch button for empty range. Fix error messages

Browse source
This commit is contained in:
Julia Radzhabova 2020-07-08 15:04:19 +03:00
parent 5fa4da93b4
commit 05c520015b
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/spreadsheeteditor/main/app/view/ChartDataDialog.js
View file

@ -244,7 +244,7 @@ define([
} }
var isvalid = me.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.Chart, value, false); var isvalid = me.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.Chart, value, false);
return (isvalid==Asc.c_oAscError.ID.DataRangeError) ? me.textInvalidRange : true; return (isvalid==Asc.c_oAscError.ID.DataRangeError) ? (me.textError + ' ' + me.textInvalidRange) : true;
}; };
this.updateSeriesList(props.getSeries(), 0); this.updateSeriesList(props.getSeries(), 0);
@ -289,8 +289,9 @@ define([
Common.UI.warning({msg: this.errorMaxRows}); Common.UI.warning({msg: this.errorMaxRows});
} else if (isvalid == Asc.c_oAscError.ID.MaxDataPointsError) } else if (isvalid == Asc.c_oAscError.ID.MaxDataPointsError)
Common.UI.warning({msg: this.errorMaxPoints}); Common.UI.warning({msg: this.errorMaxPoints});
else else {
this.txtDataRange.cmpEl.find('input').focus(); Common.UI.warning({msg: this.textInvalidRange});
}
return false; return false;
}, },
@ -354,6 +355,7 @@ define([
updateButtons: function() { updateButtons: function() {
this.btnEdit.setDisabled(this.seriesList.store.length<1); this.btnEdit.setDisabled(this.seriesList.store.length<1);
this.btnDelete.setDisabled(this.seriesList.store.length<1); this.btnDelete.setDisabled(this.seriesList.store.length<1);
this.btnSwitch.setDisabled(this.seriesList.store.length<1 || !this.chartSettings.getRange());
this.updateMoveButtons(); this.updateMoveButtons();
}, },
@ -509,11 +511,12 @@ define([
textTitle: 'Chart Data', textTitle: 'Chart Data',
txtEmpty: 'This field is required', txtEmpty: 'This field is required',
textInvalidRange: 'ERROR! Invalid cells range', textInvalidRange: 'Invalid cells range',
textError: 'ERROR!',
textSelectData: 'Select data', textSelectData: 'Select data',
errorMaxRows: 'ERROR! The maximum number of data series per chart is 255.', errorMaxRows: 'The maximum number of data series per chart is 255.',
errorStockChart: 'Incorrect row order. To build a stock chart place the data on the sheet in the following order:<br> opening price, max price, min price, closing price.', errorStockChart: 'Incorrect row order. To build a stock chart place the data on the sheet in the following order:<br> opening price, max price, min price, closing price.',
errorMaxPoints: 'ERROR! The maximum number of points in series per chart is 4096.', errorMaxPoints: 'The maximum number of points in series per chart is 4096.',
textSeries: 'Legend Entries (Series)', textSeries: 'Legend Entries (Series)',
textAdd: 'Add', textAdd: 'Add',
textEdit: 'Edit', textEdit: 'Edit',

9
apps/spreadsheeteditor/main/app/view/ChartDataRangeDialog.js
View file

@ -267,6 +267,8 @@ define([
Common.UI.warning({msg: this.errorMaxRows}); Common.UI.warning({msg: this.errorMaxRows});
} else if (isvalid == Asc.c_oAscError.ID.MaxDataPointsError) } else if (isvalid == Asc.c_oAscError.ID.MaxDataPointsError)
Common.UI.warning({msg: this.errorMaxPoints}); Common.UI.warning({msg: this.errorMaxPoints});
else
Common.UI.warning({msg: this.textInvalidRange});
return false; return false;
}, },
@ -332,6 +334,11 @@ define([
txtChoose: 'Choose range', txtChoose: 'Choose range',
textSelectData: 'Select data', textSelectData: 'Select data',
txtEmpty : 'This field is required', txtEmpty : 'This field is required',
txtInvalidRange: 'ERROR! Invalid cells range' textInvalidRange: 'Invalid cells range',
textError: 'ERROR!',
errorMaxRows: 'The maximum number of data series per chart is 255.',
errorStockChart: 'Incorrect row order. To build a stock chart place the data on the sheet in the following order:<br> opening price, max price, min price, closing price.',
errorMaxPoints: 'The maximum number of points in series per chart is 4096.'
}, SSE.Views.ChartDataRangeDialog || {})) }, SSE.Views.ChartDataRangeDialog || {}))
}); });