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

[SSE] Show info about removed duplicates

Browse source
This commit is contained in:
Julia Radzhabova 2020-04-07 17:06:29 +03:00
parent b61fd44453
commit a08d896d0a
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -1477,6 +1477,15 @@ define([
config.msg = this.errorFTRangeIncludedOtherTables; config.msg = this.errorFTRangeIncludedOtherTables;
break; break;
case Asc.c_oAscError.ID.RemoveDuplicates:
config.iconCls = 'info';
config.title = Common.UI.Window.prototype.textInformation;
config.buttons = ['ok'];
// config.msg = (errData.asc_getRemoved()>0) ? Common.Utils.String.format(this.errRemDuplicates, errData.asc_getRemoved(), errData.asc_getLeft()) : this.errNoDuplicates;
config.maxwidth = 600;
break;
default: default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break; break;
@ -1525,7 +1534,7 @@ define([
if (id == Asc.c_oAscError.ID.EditingError || $('.asc-window.modal.alert:visible').length < 1 && (id !== Asc.c_oAscError.ID.ForceSaveTimeout)) { if (id == Asc.c_oAscError.ID.EditingError || $('.asc-window.modal.alert:visible').length < 1 && (id !== Asc.c_oAscError.ID.ForceSaveTimeout)) {
Common.UI.alert(config); Common.UI.alert(config);
Common.component.Analytics.trackEvent('Internal Error', id.toString()); (id!==undefined) && Common.component.Analytics.trackEvent('Internal Error', id.toString());
} }
}, },
@ -2519,7 +2528,9 @@ define([
txtValues: 'Values', txtValues: 'Values',
txtGrandTotal: 'Grand Total', txtGrandTotal: 'Grand Total',
txtRowLbls: 'Row Labels', txtRowLbls: 'Row Labels',
txtColLbls: 'Column Labels' txtColLbls: 'Column Labels',
errNoDuplicates: 'No duplicate values found.',
errRemDuplicates: 'Duplicate values found and deleted: {0}, unique values left: {1}.'
} }
})(), SSE.Controllers.Main || {})) })(), SSE.Controllers.Main || {}))
}); });

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

@ -811,6 +811,8 @@
"SSE.Controllers.Main.txtGrandTotal": "Grand Total", "SSE.Controllers.Main.txtGrandTotal": "Grand Total",
"SSE.Controllers.Main.txtRowLbls": "Row Labels", "SSE.Controllers.Main.txtRowLbls": "Row Labels",
"SSE.Controllers.Main.txtColLbls": "Column Labels", "SSE.Controllers.Main.txtColLbls": "Column Labels",
"SSE.Controllers.Main.errNoDuplicates": "No duplicate values found.",
"SSE.Controllers.Main.errRemDuplicates": "Duplicate values found and deleted: {0}, unique values left: {1}.",
"SSE.Controllers.Print.strAllSheets": "All Sheets", "SSE.Controllers.Print.strAllSheets": "All Sheets",
"SSE.Controllers.Print.textWarning": "Warning", "SSE.Controllers.Print.textWarning": "Warning",
"SSE.Controllers.Print.txtCustom": "Custom", "SSE.Controllers.Print.txtCustom": "Custom",