[DE] Add formula to table cell

This commit is contained in:
Julia Radzhabova 2019-01-22 11:29:24 +03:00
parent a10f12fb49
commit 0fa44aa21d
4 changed files with 274 additions and 2 deletions

View file

@ -137,6 +137,16 @@
<div class="separator horizontal"></div>
</td>
</tr>
<tr>
<td class="padding-small" colspan=2>
<button type="button" class="btn btn-text-default" id="table-btn-add-formula" style="width:100%;"><%= scope.textAddFormula %></button>
</td>
</tr>
<tr>
<td class="padding-small" colspan=2>
<div class="separator horizontal"></div>
</td>
</tr>
<tr>
<td class="padding-small" colspan=2>
<div id="table-checkbox-repeat-row"></div>

View file

@ -0,0 +1,227 @@
/*
*
* (c) Copyright Ascensio System SIA 2010-2019
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
* street, Riga, Latvia, EU, LV-1050.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
/**
* TableFormulaDialog.js
*
* Created by Julia Radzhabova on 1/21/19
* Copyright (c) 2019 Ascensio System SIA. All rights reserved.
*
*/
define([
'common/main/lib/component/InputField',
'common/main/lib/component/Window'
], function () { 'use strict';
DE.Views.TableFormulaDialog = Common.UI.Window.extend(_.extend({
options: {
width: 300,
style: 'min-width: 230px;',
cls: 'modal-dlg'
},
initialize : function(options) {
_.extend(this.options, {
title: this.textTitle
}, options || {});
this.template = [
'<div class="box" style="height: 150px;">',
'<div class="input-row">',
'<label>' + this.textFormula + '</label>',
'</div>',
'<div id="id-dlg-formula-formula" class="input-row" style="margin-bottom: 5px;"></div>',
'<div class="input-row">',
'<label>' + this.textFormat + '</label>',
'</div>',
'<div id="id-dlg-formula-format" class="input-row" style="margin-bottom: 20px;"></div>',
'<div class="input-row">',
'<div id="id-dlg-formula-function" style="display: inline-block; width: 50%; padding-right: 10px; float: left;"></div>',
'<div id="id-dlg-formula-bookmark" style="display: inline-block; width: 50%;"></div>',
'</div>',
'</div>',
'<div class="footer right">',
'<button class="btn normal dlg-btn primary" result="ok" style="margin-right: 10px;">' + this.okButtonText + '</button>',
'<button class="btn normal dlg-btn" result="cancel">' + this.cancelButtonText + '</button>',
'</div>'
].join('');
this.options.tpl = _.template(this.template)(this.options);
this.bookmarks = this.options.bookmarks;
Common.UI.Window.prototype.initialize.call(this, this.options);
},
render: function() {
Common.UI.Window.prototype.render.call(this);
var me = this,
$window = this.getChild();
this.inputFormula = new Common.UI.InputField({
el : $('#id-dlg-formula-formula'),
allowBlank : true,
validateOnChange: true,
style : 'width: 100%;'
}).on('changing', _.bind(this.checkFormulaInput, this));
this.cmbFormat = new Common.UI.ComboBox({
el : $('#id-dlg-formula-format'),
cls : 'input-group-nr',
menuStyle : 'min-width: 100%; max-heigh: 200px;'
});
this.cmbFunction = new Common.UI.ComboBox({
el : $('#id-dlg-formula-function'),
cls : 'input-group-nr',
menuStyle : 'min-width: 100%; max-heigh: 100px;',
editable : false,
data: [
{displayValue: 'ABS', value: 1},
{displayValue: 'AND', value: 1},
{displayValue: 'AVERAGE', value: 1},
{displayValue: 'SUM', value: 0}
]
});
this.cmbFunction.on('selected', _.bind(function(combo, record) {
combo.setValue(this.textInsertFunction);
var _input = me.inputFormula._input,
end = _input[0].selectionEnd;
_input.val(_input.val().substring(0, end) + record.displayValue + '()' + _input.val().substring(end));
_input.focus();
_input[0].selectionStart = _input[0].selectionEnd = end + record.displayValue.length+1;
this.btnOk.setDisabled(false);
}, this));
this.cmbFunction.setValue(this.textInsertFunction);
this.cmbBookmark = new Common.UI.ComboBox({
el : $('#id-dlg-formula-bookmark'),
cls : 'input-group-nr',
menuStyle : 'min-width: 100%; max-heigh: 100px;',
editable : false
});
this.cmbBookmark.on('selected', _.bind(function(combo, record) {
combo.setValue(this.textBookmark);
var _input = me.inputFormula._input,
end = _input[0].selectionEnd;
_input.val(_input.val().substring(0, end) + record.displayValue + _input.val().substring(end));
_input.focus();
_input[0].selectionStart = _input[0].selectionEnd = end + record.displayValue.length;
this.btnOk.setDisabled(false);
}, this));
this.cmbBookmark.setValue(this.textBookmark);
me.btnOk = new Common.UI.Button({
el: $window.find('.primary')
});
$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
this.afterRender();
},
onSelectItem: function(picker, item, record, e){
this.btnOk.setDisabled(record.get('level')==0 && record.get('index')>0);
},
show: function() {
Common.UI.Window.prototype.show.apply(this, arguments);
var me = this;
_.delay(function(){
me.inputFormula.cmpEl.find('input').focus();
},500);
},
afterRender: function() {
this.refreshBookmarks();
this._setDefaults(this.props);
},
_setDefaults: function (props) {
if (props) {
}
this.checkFormulaInput(this.inputFormula, this.inputFormula.getValue());
},
refreshBookmarks: function() {
var arr = [];
if (this.bookmarks) {
var count = this.bookmarks.asc_GetCount();
for (var i=0; i<count; i++) {
var name = this.bookmarks.asc_GetName(i);
if (!this.bookmarks.asc_IsInternalUseBookmark(name)) {
arr.push({value: i, displayValue: name});
}
}
this.cmbBookmark.setData(arr);
this.cmbBookmark.setValue(this.textBookmark);
}
this.cmbBookmark.setDisabled(arr.length<1);
},
checkFormulaInput: function(cmp, newValue) {
var value = newValue.trim();
this.btnOk.setDisabled(value=='' || value == '=');
},
getSettings: function () {
return this.inputFormula.getValue();
},
onBtnClick: function(event) {
this._handleInput(event.currentTarget.attributes['result'].value);
},
onPrimary: function(event) {
this._handleInput('ok');
return false;
},
_handleInput: function(state) {
if (this.options.handler) {
this.options.handler.call(this, state, this.getSettings());
}
this.close();
},
textFormula: 'Formula',
textFormat: 'Number Format',
textBookmark: 'Paste Bookmark',
textInsertFunction: 'Paste Function',
cancelButtonText: 'Cancel',
okButtonText: 'Ok',
textTitle: 'Formula Settings'
}, DE.Views.TableFormulaDialog || {}))
});

View file

@ -50,7 +50,8 @@ define([
'common/main/lib/component/ComboBorderSize',
'common/main/lib/component/ComboDataView',
'common/main/lib/view/InsertTableDialog',
'documenteditor/main/app/view/TableSettingsAdvanced'
'documenteditor/main/app/view/TableSettingsAdvanced',
'documenteditor/main/app/view/TableFormulaDialog'
], function (menuTemplate, $, _, Backbone) {
'use strict';
@ -419,6 +420,12 @@ define([
this.api.asc_DistributeTableCells(true);
}, this));
this.btnAddFormula = new Common.UI.Button({
el: $('#table-btn-add-formula')
});
this.lockedControls.push(this.btnAddFormula);
this.btnAddFormula.on('click', _.bind(this.onAddFormula, this));
this.linkAdvanced = $('#table-advanced-link');
$(this.el).on('click', '#table-advanced-link', _.bind(this.openAdvancedSettings, this));
},
@ -758,6 +765,25 @@ define([
}
},
onAddFormula: function(e) {
var me = this;
var win;
if (me.api && !this._locked){
(new DE.Views.TableFormulaDialog(
{
bookmarks: me.api.asc_GetBookmarksManager(),
handler: function(result, value) {
if (result == 'ok') {
if (me.api) {
// me.api.addFormula(value.tableProps);
}
}
me.fireEvent('editcomplete', me);
}
})).show();
}
},
setLocked: function (locked) {
this._locked = locked;
},
@ -822,7 +848,8 @@ define([
textHeight: 'Height',
textWidth: 'Width',
textDistributeRows: 'Distribute rows',
textDistributeCols: 'Distribute columns'
textDistributeCols: 'Distribute columns',
textAddFormula: 'Add formula'
}, DE.Views.TableSettings || {}));
});

View file

@ -1634,6 +1634,13 @@
"DE.Views.StyleTitleDialog.textTitle": "Title",
"DE.Views.StyleTitleDialog.txtEmpty": "This field is required",
"DE.Views.StyleTitleDialog.txtNotEmpty": "Field must not be empty",
"DE.Views.TableFormulaDialog.textBookmark": "Paste Bookmark",
"DE.Views.TableFormulaDialog.textFormat": "Number Format",
"DE.Views.TableFormulaDialog.textFormula": "Formula",
"DE.Views.TableFormulaDialog.textInsertFunction": "Paste Function",
"DE.Views.TableFormulaDialog.textTitle": "Formula Settings",
"DE.Views.TableFormulaDialog.cancelButtonText": "Cancel",
"DE.Views.TableFormulaDialog.okButtonText ": "Ok",
"DE.Views.TableOfContentsSettings.cancelButtonText": "Cancel",
"DE.Views.TableOfContentsSettings.okButtonText ": "Ok",
"DE.Views.TableOfContentsSettings.strAlign": "Right align page numbers",
@ -1669,6 +1676,7 @@
"DE.Views.TableSettings.splitCellsText": "Split Cell...",
"DE.Views.TableSettings.splitCellTitleText": "Split Cell",
"DE.Views.TableSettings.strRepeatRow": "Repeat as header row at the top of each page",
"DE.Views.TableSettings.textAddFormula": "Add formula",
"DE.Views.TableSettings.textAdvanced": "Show advanced settings",
"DE.Views.TableSettings.textBackColor": "Background Color",
"DE.Views.TableSettings.textBanded": "Banded",