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

[SSE] Add min, max to status bar

Browse source
This commit is contained in:
Julia Radzhabova 2019-02-28 11:31:15 +03:00
parent 9b4f84cf89
commit 37df45af5a
4 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -184,6 +184,8 @@ define([
this.statusbar.setMathInfo({ this.statusbar.setMathInfo({
count : info.asc_getCount(), count : info.asc_getCount(),
average : info.asc_getAverage(), average : info.asc_getAverage(),
min : info.asc_getMin(),
max : info.asc_getMax(),
sum : info.asc_getSum() sum : info.asc_getSum()
}); });
this.statusbar.updateTabbarBorders(); this.statusbar.updateTabbarBorders();

2
apps/spreadsheeteditor/main/app/template/StatusBar.template
View file

@ -23,6 +23,8 @@
<div class="separator short" style="margin-right: 12px;" /> <div class="separator short" style="margin-right: 12px;" />
<label id="status-math-average">AVERAGE: 10</label> <label id="status-math-average">AVERAGE: 10</label>
<label id="status-math-count">COUNT: 3</label> <label id="status-math-count">COUNT: 3</label>
<label id="status-math-min">MIN: 1</label>
<label id="status-math-max">MAX: 5</label>
<label id="status-math-sum">SUM: 5</label> <label id="status-math-sum">SUM: 5</label>
</div> </div>
<div id="status-filtered-box" class="status-group"> <div id="status-filtered-box" class="status-group">

6
apps/spreadsheeteditor/main/app/view/Statusbar.js
View file

@ -276,6 +276,8 @@ define([
this.labelSum = $('#status-math-sum', this.boxMath); this.labelSum = $('#status-math-sum', this.boxMath);
this.labelCount = $('#status-math-count', this.boxMath); this.labelCount = $('#status-math-count', this.boxMath);
this.labelAverage = $('#status-math-average', this.boxMath); this.labelAverage = $('#status-math-average', this.boxMath);
this.labelMin = $('#status-math-min', this.boxMath);
this.labelMax = $('#status-math-max', this.boxMath);
this.boxMath.hide(); this.boxMath.hide();
this.boxFiltered = $('#status-filtered-box', this.el); this.boxFiltered = $('#status-filtered-box', this.el);
@ -366,6 +368,8 @@ define([
if (info.count>1) { if (info.count>1) {
if (!this.boxMath.is(':visible')) this.boxMath.show(); if (!this.boxMath.is(':visible')) this.boxMath.show();
this.labelCount.text(this.textCount + ': ' + info.count); this.labelCount.text(this.textCount + ': ' + info.count);
this.labelMin.text((info.min && info.min.length) ? (this.textMin + ': ' + info.min) : '');
this.labelMax.text((info.max && info.max.length) ? (this.textMax + ': ' + info.max) : '');
this.labelSum.text((info.sum && info.sum.length) ? (this.textSum + ': ' + info.sum) : ''); this.labelSum.text((info.sum && info.sum.length) ? (this.textSum + ': ' + info.sum) : '');
this.labelAverage.text((info.average && info.average.length) ? (this.textAverage + ': ' + info.average) : ''); this.labelAverage.text((info.average && info.average.length) ? (this.textAverage + ': ' + info.average) : '');
} else { } else {
@ -544,6 +548,8 @@ define([
textSum : 'SUM', textSum : 'SUM',
textCount : 'COUNT', textCount : 'COUNT',
textAverage : 'AVERAGE', textAverage : 'AVERAGE',
textMin : 'MIN',
textMax : 'MAX',
filteredRecordsText : '{0} of {1} records filtered', filteredRecordsText : '{0} of {1} records filtered',
filteredText : 'Filter mode' filteredText : 'Filter mode'
}, SSE.Views.Statusbar || {})); }, SSE.Views.Statusbar || {}));

2
apps/spreadsheeteditor/main/locale/en.json
View file

@ -1951,6 +1951,8 @@
"SSE.Views.Statusbar.RenameDialog.labelSheetName": "Sheet Name", "SSE.Views.Statusbar.RenameDialog.labelSheetName": "Sheet Name",
"SSE.Views.Statusbar.textAverage": "AVERAGE", "SSE.Views.Statusbar.textAverage": "AVERAGE",
"SSE.Views.Statusbar.textCount": "COUNT", "SSE.Views.Statusbar.textCount": "COUNT",
"SSE.Views.Statusbar.textMin": "MIN",
"SSE.Views.Statusbar.textMax": "MAX",
"SSE.Views.Statusbar.textNewColor": "Add New Custom Color", "SSE.Views.Statusbar.textNewColor": "Add New Custom Color",
"SSE.Views.Statusbar.textNoColor": "No Color", "SSE.Views.Statusbar.textNoColor": "No Color",
"SSE.Views.Statusbar.textSum": "SUM", "SSE.Views.Statusbar.textSum": "SUM",