[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10580] pagination
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10580] pagination |
|
Date: |
Mon, 10 Dec 2012 12:51:39 +0000 |
Revision: 10580
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10580
Author: sigurdne
Date: 2012-12-10 12:51:39 +0000 (Mon, 10 Dec 2012)
Log Message:
-----------
pagination
Modified Paths:
--------------
trunk/controller/inc/class.uicontrol_register_to_component.inc.php
trunk/controller/inc/class.uicontrol_register_to_location.inc.php
trunk/phpgwapi/inc/class.uicommon.inc.php
trunk/phpgwapi/js/yahoo/common.js
trunk/phpgwapi/js/yahoo/datatable.js
trunk/property/inc/class.uicondition_survey.inc.php
Modified: trunk/controller/inc/class.uicontrol_register_to_component.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_register_to_component.inc.php
2012-12-07 18:26:01 UTC (rev 10579)
+++ trunk/controller/inc/class.uicontrol_register_to_component.inc.php
2012-12-10 12:51:39 UTC (rev 10580)
@@ -325,18 +325,17 @@
}
}
- $results = $results ? $results :
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+ $num_rows =
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] ? (int)
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] : 15;
$data = array(
'ResultSet' => array(
'totalResultsAvailable' =>
$boentity->total_records,
- 'startIndex' => $this->start,
+ 'startIndex' => $boentity->start,
'sortKey' => 'location_code',
'sortDir' => "ASC",
'Result' => $values,
- //FIXME: Sigurd 18 oct 2012...
- 'pageSize' => $results,
- 'activePage' => floor($this->bo->start
/ $results) + 1
+ 'pageSize' => $num_rows,
+ 'activePage' => floor($boentity->start
/ $num_rows) + 1
)
);
Modified: trunk/controller/inc/class.uicontrol_register_to_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_register_to_location.inc.php
2012-12-07 18:26:01 UTC (rev 10579)
+++ trunk/controller/inc/class.uicontrol_register_to_location.inc.php
2012-12-10 12:51:39 UTC (rev 10580)
@@ -380,7 +380,7 @@
}
}
- $results = $results ? $results :
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+ $num_rows =
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] ? (int)
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] : 15;
$data = array(
'ResultSet' => array(
@@ -389,9 +389,8 @@
'sortKey' => 'location_code',
'sortDir' => "ASC",
'Result' => $values,
- //FIXME: Sigurd 18 oct 2012...
- 'pageSize' => $results,
- 'activePage' => floor($this->bo->start
/ $results) + 1
+ 'pageSize' => $num_rows,
+ 'activePage' => floor($this->bo->start
/ $num_rows) + 1
)
);
Modified: trunk/phpgwapi/inc/class.uicommon.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.uicommon.inc.php 2012-12-07 18:26:01 UTC (rev
10579)
+++ trunk/phpgwapi/inc/class.uicommon.inc.php 2012-12-10 12:51:39 UTC (rev
10580)
@@ -375,11 +375,14 @@
$result['results'] = array();
}
+ $num_rows =
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] ? (int)
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] : 15;
+
return array(
'ResultSet' => array(
'totalResultsAvailable' =>
$results['total_records'],
'totalRecords' =>
$results['total_records'],// temeporary
'recordsReturned' =>
count($results['results']),
+ 'pageSize' =>
$num_rows,
'startIndex' =>
$results['start'],
'sortKey' =>
$results['sort'],
'sortDir' =>
$results['dir'],
Modified: trunk/phpgwapi/js/yahoo/common.js
===================================================================
--- trunk/phpgwapi/js/yahoo/common.js 2012-12-07 18:26:01 UTC (rev 10579)
+++ trunk/phpgwapi/js/yahoo/common.js 2012-12-10 12:51:39 UTC (rev 10580)
@@ -326,6 +326,8 @@
if(!disablePagination)
{
options.paginator =
YAHOO.portico.setupInlineTablePaginator(paginatorContainer);
+// options.paginator.setRowsPerPage(20,true);
+
url += '&results=' + options.paginator.getRowsPerPage() + '&';
YAHOO.portico.Paginator[PaginatorName] =options.paginator;
@@ -339,7 +341,14 @@
myDataSource.connXhrMode = "queueRequests";
myDataSource.responseSchema = {
resultsList: "ResultSet.Result",
- metaFields : { totalResultsAvailable:
"ResultSet.totalResultsAvailable", actions: 'Actions' }
+ metaFields : {
+ totalResultsAvailable:
'ResultSet.totalResultsAvailable',
+ actions: 'Actions',
+ pageSize: 'ResultSet.pageSize',
+ startIndex: 'ResultSet.startIndex',
+ sortKey: 'ResultSet.sortKey',
+ sortDir: 'ResultSet.sortDir'
+ }
};
var myDataTable = new YAHOO.widget.DataTable(dataTableContainer,
colDefs, myDataSource, options);
@@ -349,10 +358,24 @@
return oPayload;
}
- myDataTable.doBeforeLoadData = function(nothing, data) {
- if (!data.meta.actions) return data;
+ myDataTable.doBeforeLoadData = function(nothing, oResponse, oPayload) {
+
+ oPayload.totalRecords = oResponse.meta.totalResultsAvailable;
+// oPayload.pagination.rowsPerPage= oResponse.meta.pageSize || 10;
+
+ oPayload.pagination = {
+ rowsPerPage: oResponse.meta.pageSize || 10,
+ recordOffset: oResponse.meta.startIndex || 0
+ }
+/*
+ oPayload.sortedBy = {
+ key: oResponse.meta.sortKey || "id",
+ dir: (oResponse.meta.sortDir) ? "yui-dt-" +
oResponse.meta.sortDir : "yui-dt-asc"
+ };
+*/
+ if (!oResponse.meta.actions) return oResponse;
- actions = data.meta.actions;
+ actions = oResponse.meta.actions;
for (var key in actions) {
var actionLink = document.createElement('a');
@@ -361,7 +384,7 @@
YAHOO.util.Dom.insertAfter(actionLink, container);
};
- return data;
+ return oResponse;
};
YAHOO.portico.DataTable[DatatableName] = myDataTable;
Modified: trunk/phpgwapi/js/yahoo/datatable.js
===================================================================
--- trunk/phpgwapi/js/yahoo/datatable.js 2012-12-07 18:26:01 UTC (rev
10579)
+++ trunk/phpgwapi/js/yahoo/datatable.js 2012-12-10 12:51:39 UTC (rev
10580)
@@ -70,7 +70,7 @@
// baseUrl += 'sort=' + fields[0];
}
- baseUrl += '&results=' + pag.getRowsPerPage() + '&';
+// baseUrl += '&results=' + pag.getRowsPerPage() + '&';
var myDataSource = new YAHOO.util.DataSource(baseUrl);
myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
@@ -81,6 +81,7 @@
metaFields : {
totalResultsAvailable: "ResultSet.totalResultsAvailable",
startIndex: 'ResultSet.startIndex',
+ pageSize: 'ResultSet.pageSize',
sortKey: 'ResultSet.sortKey',
sortDir: 'ResultSet.sortDir'
}
@@ -463,7 +464,7 @@
myDataTable.doBeforeLoadData = function(oRequest, oResponse, oPayload) {
oPayload.totalRecords = oResponse.meta.totalResultsAvailable;
oPayload.pagination = {
- rowsPerPage: oResponse.meta.paginationRowsPerPage ||
10,
+ rowsPerPage: oResponse.meta.pageSize || 10,
recordOffset: oResponse.meta.startIndex || 0
}
oPayload.sortedBy = {
Modified: trunk/property/inc/class.uicondition_survey.inc.php
===================================================================
--- trunk/property/inc/class.uicondition_survey.inc.php 2012-12-07 18:26:01 UTC
(rev 10579)
+++ trunk/property/inc/class.uicondition_survey.inc.php 2012-12-10 12:51:39 UTC
(rev 10580)
@@ -595,6 +595,7 @@
//------ Start pagination
$start = phpgw::get_var('startIndex', 'int', 'REQUEST',
0);
+
$total_records = count($values);
$num_rows =
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] ? (int)
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] : 15;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10580] pagination,
Sigurd Nes <=