|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [12634] uitts: switch to use separate xsl for inline table |
| Date: | Tue, 20 Jan 2015 08:33:59 +0000 |
Revision: 12634
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12634
Author: sigurdne
Date: 2015-01-20 08:33:58 +0000 (Tue, 20 Jan 2015)
Log Message:
-----------
uitts: switch to use separate xsl for inline table
Modified Paths:
--------------
branches/dev-syncromind/property/inc/class.notify.inc.php
branches/dev-syncromind/property/inc/class.uitts.inc.php
branches/dev-syncromind/property/templates/base/tts.xsl
Modified: branches/dev-syncromind/property/inc/class.notify.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.notify.inc.php 2015-01-19
23:51:41 UTC (rev 12633)
+++ branches/dev-syncromind/property/inc/class.notify.inc.php 2015-01-20
08:33:58 UTC (rev 12634)
@@ -350,56 +350,6 @@
);
}
- /*
- $tabletools = <<<JS
-
- {
- sSwfPath:
"phpgwapi/js/DataTables/extensions/TableTools/swf/copy_csv_xls_pdf.swf",
- sRowSelect: "multi",
- aButtons: [
- "select_all",
- "select_none"
-JS;
-
- foreach($buttons as $entry)
- {
- $tabletools .= <<<JS
- ,
- {
- sExtends: "select",
- sButtonText: "{$entry['value']}",
- fnClick: function (nButton, oConfig,
oFlash) {
-
- var oTT = TableTools.fnGetInstance(
'datatable-container_{$count}' );
- var selected = oTT.fnGetSelectedData();
-
- var numSelected = selected.length;
-
- if (numSelected ==0){
- alert('None selected');
- return false;
- }
- var ids = [];
- for ( var n = 0; n < selected.length;
++n )
- {
- var aData = selected[n];
- ids.push(aData['id']);
- }
- {$entry['funct']}('{$entry['id']}',
ids);
-
JqueryPortico.updateinlineTableHelper(oTable{$count}, {$requestUrl});
- }
- }
-
-JS;
- }
-
- $tabletools .= <<<JS
-
- ]
- }
-JS;
- */
-
$GLOBALS['phpgw']->js->validate_file( 'portico',
'notify', 'property' );
$lang_view = lang('view');
Modified: branches/dev-syncromind/property/inc/class.uitts.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uitts.inc.php 2015-01-19
23:51:41 UTC (rev 12633)
+++ branches/dev-syncromind/property/inc/class.uitts.inc.php 2015-01-20
08:33:58 UTC (rev 12634)
@@ -1444,7 +1444,7 @@
$receipt = array();
}
- $GLOBALS['phpgw']->xslttpl->add_file(array('tts',
'files', 'attributes_form'));
+ $GLOBALS['phpgw']->xslttpl->add_file(array('tts',
'files', 'attributes_form', 'datatable_inline'));
$historylog =
CreateObject('property.historylog','tts');
@@ -2219,7 +2219,11 @@
'container' =>
'datatable-container_0',
'requestUrl' => "''",
'ColumnDefs' => $note_def,
- 'data' =>
json_encode($additional_notes)
+ 'data' =>
json_encode($additional_notes),
+ 'config' => array(
+ array('disableFilter' => true),
+ array('disablePagination' => true)
+ )
);
//_debug_Array($additional_notes);die();
@@ -2234,7 +2238,11 @@
array('key' => 'value_action',
'label'=>lang('Action'), 'sortable'=>true,'resizeable'=>true),
array('key' =>
'value_old_value','label'=>lang('old value'),
'sortable'=>true,'resizeable'=>true),
array('key' =>
'value_new_value','label'=>lang('New
value'),'sortable'=>true,'resizeable'=>true)),
- 'data' =>
json_encode($record_history)
+ 'data' =>
json_encode($record_history),
+ 'config' => array(
+ array('disableFilter' => true),
+ array('disablePagination' => true)
+ )
);
$link_to_files =
(isset($this->bo->config->config_data['files_url'])?$this->bo->config->config_data['files_url']:'');
@@ -2272,7 +2280,11 @@
'container' =>
'datatable-container_2',
'requestUrl' => "''",
'ColumnDefs' => $attach_file_def,
- 'data' =>
json_encode($content_files)
+ 'data' =>
json_encode($content_files),
+ 'config' => array(
+ array('disableFilter' => true),
+ array('disablePagination' => true)
+ )
);
@@ -2284,7 +2296,11 @@
'requestUrl' => "''",
'ColumnDefs' => array(array('key' =>
'value_email', 'label'=>lang('email'), 'sortable'=>true,'resizeable'=>true),
array('key' =>
'value_select','label'=>lang('select'),'sortable'=>false,'resizeable'=>true)),
- 'data' =>
json_encode($content_email)
+ 'data' =>
json_encode($content_email),
+ 'config' => array(
+ array('disableFilter' => true),
+ array('disablePagination' => true)
+ )
);
$payments = $this->bo->get_payments($id);
@@ -2295,7 +2311,11 @@
'ColumnDefs' => array(array('key' =>
'period','label'=>lang('period'),'sortable'=>true,'resizeable'=>true),
array('key' =>
'amount','label'=>lang('amount'),'sortable'=>true,'resizeable'=>true,
'formatter'=> 'FormatterAmount2'),
array('key' =>
'remark','label'=>lang('remark'),'sortable'=>false,'resizeable'=>true)),
- 'data' =>
json_encode($payments)
+ 'data' =>
json_encode($payments),
+ 'config' => array(
+ array('disableFilter' => true),
+ array('disablePagination' => true)
+ )
);
$location_id =
$GLOBALS['phpgw']->locations->get_id('property', $this->acl_location);
@@ -2314,7 +2334,11 @@
'requestUrl' =>
json_encode(self::link(array('menuaction' => 'property.notify.update_data',
'location_id'=>$location_id, 'location_item_id'=>$id,'action'
=>'refresh_notify_contact','phpgw_return_as'=>'json'))),
'ColumnDefs' =>
$notify_info['column_defs']['values'],
'data' => json_encode(array()),
- 'tabletools' => $notify_info['tabletools']
+ 'tabletools' => $notify_info['tabletools'],
+ 'config' => array(
+ array('disableFilter' => true),
+ array('disablePagination' => true)
+ )
);
$_filter_buildingpart = array();
@@ -2383,7 +2407,6 @@
foreach($membership as $group_id => $group)
{
$my_groups[$group_id] = $group->firstname;
-
}
$data = array
Modified: branches/dev-syncromind/property/templates/base/tts.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/tts.xsl 2015-01-19
23:51:41 UTC (rev 12633)
+++ branches/dev-syncromind/property/templates/base/tts.xsl 2015-01-20
08:33:58 UTC (rev 12634)
@@ -1,22 +1,6 @@
<!-- $Id$ -->
-<func:function name="phpgw:conditional">
- <xsl:param name="test"/>
- <xsl:param name="true"/>
- <xsl:param name="false"/>
- <func:result>
- <xsl:choose>
- <xsl:when test="$test">
- <xsl:value-of select="$true"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$false"/>
- </xsl:otherwise>
- </xsl:choose>
- </func:result>
-</func:function>
-
<xsl:template match="data">
<xsl:choose>
<xsl:when test="add">
@@ -401,9 +385,10 @@
<xsl:if test="container = 'datatable-container_0'">
<xsl:call-template name="table_setup">
<xsl:with-param name="container" select ='container'/>
-
<xsl:with-param name="requestUrl" select
='requestUrl' />
-
<xsl:with-param name="ColumnDefs" select
='ColumnDefs' />
-
<xsl:with-param name="data" select ='data' />
+
<xsl:with-param name="requestUrl" select
='requestUrl'/>
+
<xsl:with-param name="ColumnDefs" select
='ColumnDefs'/>
+
<xsl:with-param name="data" select ='data'/>
+
<xsl:with-param name="config" select ='config'/>
</xsl:call-template>
</xsl:if>
</xsl:for-each>
@@ -556,9 +541,11 @@
<xsl:if test="container = 'datatable-container_2'">
<xsl:call-template name="table_setup">
<xsl:with-param name="container" select ='container'/>
-
<xsl:with-param name="requestUrl" select ='requestUrl' />
-
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
-
<xsl:with-param name="data" select ='data' />
+
<xsl:with-param name="requestUrl" select ='requestUrl'/>
+
<xsl:with-param name="ColumnDefs" select ='ColumnDefs'/>
+
<xsl:with-param name="data" select ='data'/>
+
<xsl:with-param name="tabletools" select ='tabletools' />
+
<xsl:with-param name="config" select ='config'/>
</xsl:call-template>
</xsl:if>
</xsl:for-each>
@@ -776,9 +763,11 @@
<xsl:if test="container = 'datatable-container_4'">
<xsl:call-template name="table_setup">
<xsl:with-param name="container" select ='container'/>
-
<xsl:with-param name="requestUrl" select
='requestUrl' />
-
<xsl:with-param name="ColumnDefs" select
='ColumnDefs' />
-
<xsl:with-param name="data" select ='data' />
+
<xsl:with-param name="requestUrl" select
='requestUrl'/>
+
<xsl:with-param name="ColumnDefs" select
='ColumnDefs'/>
+
<xsl:with-param name="data" select ='data'/>
+
<xsl:with-param name="tabletools" select
='tabletools' />
+
<xsl:with-param name="config" select ='config'/>
</xsl:call-template>
</xsl:if>
</xsl:for-each>
@@ -865,9 +854,11 @@
<xsl:if test="container =
'datatable-container_3'">
<xsl:call-template name="table_setup">
<xsl:with-param name="container"
select ='container'/>
-
<xsl:with-param name="requestUrl"
select ='requestUrl' />
-
<xsl:with-param name="ColumnDefs"
select ='ColumnDefs' />
-
<xsl:with-param name="data" select
='data' />
+
<xsl:with-param name="requestUrl"
select ='requestUrl'/>
+
<xsl:with-param name="ColumnDefs"
select ='ColumnDefs'/>
+
<xsl:with-param name="data" select
='data'/>
+
<xsl:with-param
name="tabletools" select ='tabletools' />
+
<xsl:with-param name="config"
select ='config'/>
</xsl:call-template>
</xsl:if>
</xsl:for-each>
@@ -949,10 +940,11 @@
<xsl:if test="container
= 'datatable-container_5'">
<xsl:call-template name="table_setup">
<xsl:with-param name="container" select ='container'/>
-
<xsl:with-param name="requestUrl" select ='requestUrl' />
-
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
-
<xsl:with-param name="data" select ='data' />
-
<xsl:with-param name="tabletools" select ='tabletools' />
+
<xsl:with-param name="requestUrl" select ='requestUrl'/>
+
<xsl:with-param name="ColumnDefs" select ='ColumnDefs'/>
+
<xsl:with-param name="data" select ='data'/>
+
<xsl:with-param name="tabletools" select ='tabletools'/>
+ <xsl:with-param
name="config" select ='config'/>
</xsl:call-template>
</xsl:if>
</xsl:for-each>
@@ -966,9 +958,11 @@
<xsl:if test="container =
'datatable-container_1'">
<xsl:call-template
name="table_setup">
<xsl:with-param
name="container" select ='container'/>
- <xsl:with-param
name="requestUrl" select ='requestUrl' />
- <xsl:with-param
name="ColumnDefs" select ='ColumnDefs' />
- <xsl:with-param
name="data" select ='data' />
+ <xsl:with-param
name="requestUrl" select ='requestUrl'/>
+ <xsl:with-param
name="ColumnDefs" select ='ColumnDefs'/>
+ <xsl:with-param
name="data" select ='data'/>
+ <xsl:with-param
name="tabletools" select ='tabletools' />
+ <xsl:with-param
name="config" select ='config'/>
</xsl:call-template>
</xsl:if>
</xsl:for-each>
@@ -1216,255 +1210,3 @@
</td>
</tr>
</xsl:template>
-
- <xsl:template name="table_setup">
- <xsl:param name="container" />
- <xsl:param name="requestUrl" />
- <xsl:param name="ColumnDefs" />
- <xsl:param name="data" />
- <xsl:param name="tabletools" />
- <table id="{$container}" class="display cell-border compact
responsive no-wrap" width="100%">
- <thead>
- <tr>
- <xsl:for-each select="$ColumnDefs">
- <xsl:choose>
- <xsl:when test="hidden">
- <xsl:if
test="hidden =0">
- <th>
-
<xsl:value-of select="label"/>
- </th>
-
</xsl:if>
- </xsl:when>
- <xsl:otherwise>
- <th>
-
<xsl:value-of select="label"/>
- </th>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </tr>
- </thead>
- <tfoot>
- <tr>
- <xsl:for-each select="$ColumnDefs">
- <xsl:choose>
- <xsl:when test="hidden">
- <xsl:if
test="hidden =0">
- <th>
- </th>
- </xsl:if>
- </xsl:when>
- <xsl:otherwise>
- <th>
- </th>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </tr>
- </tfoot>
- </table>
- <script>
-
- <xsl:variable name="num">
- <xsl:number count="*"/>
- </xsl:variable>
- var oTable<xsl:number value="($num - 1)"/> = null;
-
- <xsl:choose>
- <xsl:when test="$tabletools">
- JqueryPortico.TableTools<xsl:number
value="($num - 1)"/> = {
- "sSwfPath":
"phpgwapi/js/DataTables/extensions/TableTools/swf/copy_csv_xls_pdf.swf",
- "sRowSelect": "multi",
- "aButtons":
- [
-
"select_all",
-
"select_none",
-
<xsl:choose>
-
<xsl:when test="download">
-
{
-
"sExtends": "download",
-
"sButtonText": "Download",
-
"sUrl": '<xsl:value-of select="download"/>'
-
},
-
</xsl:when>
-
</xsl:choose>
-
<xsl:for-each select="$tabletools">
-
<xsl:choose>
-
<xsl:when test="type = 'custom'">
-
{
-
sExtends: "select",
-
sButtonText: "<xsl:value-of select="text"/>",
-
fnClick: function (nButton, oConfig,
oFlash) {
-
-
<xsl:if
test="confirm_msg">
-
var confirm_msg
= "<xsl:value-of select="confirm_msg"/>";
-
var r =
confirm(confirm_msg);
-
if (r != true) {
-
return
false;
-
}
-
</xsl:if>
-
-
var action =
"<xsl:value-of select="action"/>";
-
-
<xsl:if
test="parameters">
-
var parameters
= <xsl:value-of select="parameters"/>;
-
var i = 0;
-
len =
parameters.parameter.length;
-
for (; i <
len; ) {
-
action
+= '&' + parameters.parameter[i]['name'] + '=' +
aData[parameters.parameter[i]['source']];
-
i++;
-
}
-
</xsl:if>
-
-
<xsl:value-of
select="custom_code"/>
-
}
-
-
}<xsl:value-of select="phpgw:conditional(not(position() =
last()), ',', '')"/>
-
</xsl:when>
-
<xsl:otherwise>
-
{
-
sExtends: "select",
-
sButtonText: "<xsl:value-of select="text"/>",
-
fnClick: function (nButton, oConfig,
oFlash) {
-
var receiptmsg = [];
-
var selected =
JqueryPortico.fnGetSelected(oTable<xsl:number value="($num - 1)"/>);
-
var numSelected =
selected.length;
-
-
if (numSelected ==0){
-
alert('None
selected');
-
return false;
-
}
-
-
<xsl:if
test="confirm_msg">
-
var confirm_msg
= "<xsl:value-of select="confirm_msg"/>";
-
var r =
confirm(confirm_msg);
-
if (r != true) {
-
return
false;
-
}
-
</xsl:if>
-
-
var target =
"<xsl:value-of select="target"/>";
-
if(!target)
-
{
-
target =
'_self';
-
}
-
-
if (numSelected > 1){
-
target =
'_blank';
-
}
-
-
var n = 0;
-
for (; n <
numSelected; ) {
-
-
//
console.log(selected[n]);
-
var aData =
oTable<xsl:number value="($num - 1)"/>.fnGetData( selected[n] ); //complete
dataset from json returned from server
-
//
console.log(aData);
-
-
//delete stuff
comes here
-
var action =
"<xsl:value-of select="action"/>";
-
-
<xsl:if
test="parameters">
-
var
parameters = <xsl:value-of select="parameters"/>;
-
//
console.log(parameters.parameter);
-
var i =
0;
-
len =
parameters.parameter.length;
-
for (;
i < len; ) {
-
action += '&' + parameters.parameter[i]['name'] + '=' +
aData[parameters.parameter[i]['source']];
-
i++;
-
}
-
</xsl:if>
-
-
// look for the
word "DELETE" in URL
-
if(JqueryPortico.substr_count(action,'delete')>0)
-
{
-
action += "&confirm=yes&phpgw_return_as=json";
-
JqueryPortico.execute_ajax(action, function(result){
-
document.getElementById("message").innerHTML += '<br/>' + result;
-
});
-
oTable<xsl:number value="($num - 1)"/>.fnDraw();
-
}
-
else if (target
== 'ajax')
-
{
-
action += "&phpgw_return_as=json";
-
JqueryPortico.execute_ajax(action, function(result){
-
document.getElementById("message").innerHTML += '<br/>' + result;
-
});
-
oTable<xsl:number value="($num - 1)"/>.fnDraw();
-
}
-
else
-
{
-
window.open(action,target);
-
}
-
-
n++;
-
}
-
}
-
-
}<xsl:value-of select="phpgw:conditional(not(position() =
last()), ',', '')"/>
-
</xsl:otherwise>
-
</xsl:choose>
-
</xsl:for-each>
- ]
- };
- </xsl:when>
- </xsl:choose>
-
- JqueryPortico.inlineTablesDefined += 1;
- var PreColumns = [
- <xsl:for-each select="$ColumnDefs">
- {
- data:
"<xsl:value-of select="key"/>",
- class:
"<xsl:value-of select="className"/>",
- orderable:
<xsl:value-of select="phpgw:conditional(not(sortable = 0), 'true', 'false')"/>,
- <xsl:choose>
- <xsl:when test="hidden">
- <xsl:if
test="hidden =0">
- visible
:true,
- </xsl:if>
- <xsl:if
test="hidden =1">
- class:
'none',
- visible
:false,
- </xsl:if>
- </xsl:when>
- <xsl:otherwise>
- visible
:true,
- </xsl:otherwise>
- </xsl:choose>
- <xsl:if test="formatter">
- render: function (dummy1,
dummy2, oData) {
- try {
- var ret
= <xsl:value-of select="formatter"/>("<xsl:value-of select="key"/>", oData);
- }
- catch(err) {
- return
err.message;
- }
- return ret;
- },
-
- </xsl:if>
- defaultContent: "<xsl:value-of
select="defaultContent"/>"
- }<xsl:value-of
select="phpgw:conditional(not(position() = last()), ',', '')"/>
- </xsl:for-each>
- ];
- <![CDATA[
- columns = [];
-
- for(i=0;i < PreColumns.length;i++)
- {
- if ( PreColumns[i]['visible'] == true )
- {
- columns.push(PreColumns[i]);
- }
- }
- ]]>
- var options<xsl:number value="($num - 1)"/> =
{disablePagination:true, disableFilter:true};
- if (JqueryPortico.TableTools<xsl:number value="($num -
1)"/>)
- {
- options<xsl:number value="($num -
1)"/>.TableTools = JqueryPortico.TableTools<xsl:number value="($num - 1)"/>;
- }
-
- oTable<xsl:number value="($num - 1)"/> =
JqueryPortico.inlineTableHelper("<xsl:value-of select="$container"/>",
<xsl:value-of select="$requestUrl"/>, columns, options<xsl:number value="($num
- 1)"/>, <xsl:value-of select="$data"/>);
-
- </script>
-
- </xsl:template>
| [Prev in Thread] | Current Thread | [Next in Thread] |