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

[SSE mobile] Fix apply empty filter

Browse source
This commit is contained in:
Julia Svinareva 2019-06-24 17:05:21 +03:00
parent 0fceeeb108
commit d7f1ba53fe
1 changed files with 35 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
apps/spreadsheeteditor/mobile/app/controller/FilterOptions.js
View file

@ -104,6 +104,21 @@ define([
} }
}).on('close', function (e) { }).on('close', function (e) {
mainView.showNavbar(); mainView.showNavbar();
var isValid = true;
if (indChecked.length === indChecked.filter(function (item) {return item === false;}).length) {
isValid = false;
}
if(!isValid) {
uiApp.modal({
title : me.textErrorTitle,
text : me.textErrorMsg,
buttons: [
{
text: 'OK',
}
]
});
}
}).on('closed', function () { }).on('closed', function () {
if (_.isFunction(me.api.asc_OnHideContextMenu)) { if (_.isFunction(me.api.asc_OnHideContextMenu)) {
me.api.asc_OnHideContextMenu() me.api.asc_OnHideContextMenu()
@ -300,7 +315,8 @@ define([
var $filterCell = $('[name="filter-cell"]'), var $filterCell = $('[name="filter-cell"]'),
$filterCellAll = $('[name="filter-cell-all"]'), $filterCellAll = $('[name="filter-cell-all"]'),
filterCellChecked = $('[name="filter-cell"]:checked').length, filterCellChecked = $('[name="filter-cell"]:checked').length,
filterCellCheckedAll = $('[name="filter-cell"]').length; filterCellCheckedAll = $('[name="filter-cell"]').length,
isValid = true;
if(e) { if(e) {
if (e.target.name == "filter-cell") { if (e.target.name == "filter-cell") {
if (filterCellChecked < filterCellCheckedAll) { if (filterCellChecked < filterCellCheckedAll) {
@ -319,26 +335,36 @@ define([
} else { } else {
$filterCell.prop('checked', false); $filterCell.prop('checked', false);
checkAll = false; checkAll = false;
isValid = false;
filterCellChecked = 0;
} }
for (var i = 0; i < indChecked.length; i++) { for (var i = 0; i < indChecked.length; i++) {
indChecked[i] = checkAll; indChecked[i] = checkAll;
} }
} }
} }
if(filterCellChecked === 0) {
var arrCells = dataFilter.asc_getValues(); isValid = false;
arrCells.forEach(function(item, index) { } else {
item.asc_setVisible(indChecked[index]); isValid = true;
}); }
dataFilter.asc_getFilterObj().asc_setType(Asc.c_oAscAutoFilterTypes.Filters); if(isValid) {
this.api.asc_applyAutoFilter(dataFilter); var arrCells = dataFilter.asc_getValues();
arrCells.forEach(function (item, index) {
item.asc_setVisible(indChecked[index]);
});
dataFilter.asc_getFilterObj().asc_setType(Asc.c_oAscAutoFilterTypes.Filters);
this.api.asc_applyAutoFilter(dataFilter);
}
me.setClearDisable(); me.setClearDisable();
}, },
textEmptyItem: '{Blanks}', textEmptyItem: '{Blanks}',
textSelectAll: 'Select All' textSelectAll: 'Select All',
textErrorTitle: 'Warning',
textErrorMsg: 'You must choose at least one value'