extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix not working subtraction option for infolog-value widget

Browse Source
This commit is contained in:
Hadi Nategh 2016-01-08 13:35:35 +00:00
parent dc2b48c43f
commit e8bc6dcd19
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etemplate/js/et2_widget_entry.js
View File

@ -45,7 +45,7 @@ var et2_entry = et2_valueWidget.extend(
}, },
alternate_fields: { alternate_fields: {
name: 'Alternate fields', name: 'Alternate fields',
description: 'colon (:) separated list of alternative fields. The first non-empty one is used if the selected field is empty', description: 'colon (:) separated list of alternative fields. The first non-empty one is used if the selected field is empty, (-) used for subtraction',
type: 'string', type: 'string',
default: et2_no_init default: et2_no_init
}, },
@ -134,7 +134,8 @@ var et2_entry = et2_valueWidget.extend(
var fields = this.options.alternate_fields.split(':'); var fields = this.options.alternate_fields.split(':');
for(var i = 0; i < fields.length; i++) for(var i = 0; i < fields.length; i++)
{ {
var value = this.getArrayMgr('content').getEntry(fields[i]); var value = (fields[i][0] == "-")? this.getArrayMgr('content').getEntry(fields[i].replace('-',''))*-1:
this.getArrayMgr('content').getEntry(fields[i]);
sum += parseFloat(value); sum += parseFloat(value);
if(value && this.options.field !== 'sum') if(value && this.options.field !== 'sum')
{ {

11
infolog/inc/class.infolog_widget.inc.php
View File

@ -10,6 +10,17 @@
* @version $Id$ * @version $Id$
*/ */
/**
* Infolog widget et2 representation:
* Both infolog-value and infolog-fields widgets are using client-side et2_widget_entry
* and the format to address them in template is as follows:
*
* <infolog-value id="fieldname" or value="@fieldname"
* options="[field(e.g. sum), compare, alternate_fields(e.g. (-)#customfileds, use '-' if we need subtraction)]"
* />
*
*/
/** /**
* eTemplate extension: InfoLog widget * eTemplate extension: InfoLog widget
* *