|
| From: | Saul |
| Subject: | [Fmsystem-commits] [13830] fixing datatable and forms |
| Date: | Tue, 01 Sep 2015 23:53:49 +0000 |
Revision: 13830
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13830
Author: psaul
Date: 2015-09-01 23:53:48 +0000 (Tue, 01 Sep 2015)
Log Message:
-----------
fixing datatable and forms
Modified Paths:
--------------
branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export_file.inc.php
branches/dev-syncromind/booking/inc/class.uidashboard.inc.php
branches/dev-syncromind/booking/inc/class.uidocument.inc.php
branches/dev-syncromind/booking/inc/class.uievent.inc.php
branches/dev-syncromind/booking/inc/class.uigroup.inc.php
branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
branches/dev-syncromind/booking/inc/class.uipermission.inc.php
branches/dev-syncromind/booking/inc/class.uipermission_root.inc.php
branches/dev-syncromind/booking/inc/class.uiresource.inc.php
branches/dev-syncromind/booking/inc/class.uiseason.inc.php
branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
Modified:
branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
2015-09-01 23:53:02 UTC (rev 13829)
+++ branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
2015-09-01 23:53:48 UTC (rev 13830)
@@ -109,8 +109,8 @@
return $this->export();
}
- $GLOBALS['phpgw']->jqcal->add_listener('filter_to');
- phpgwapi_jquery::load_widget('datepicker');
+ $GLOBALS['phpgw']->jqcal->add_listener('filter_to');
+ phpgwapi_jquery::load_widget('datepicker');
self::add_javascript('booking', 'booking',
'completed_reservation.js');
self::add_javascript('booking', 'booking',
'datatable.js');
@@ -134,10 +134,10 @@
'requestGenerator' => 'requestWithBuildingFilter',
),
array(
- 'type' => 'date-picker',
- 'id' => 'to',
+ 'type' =>
'date-picker',
+ 'id' => 'to',
'name' => 'to',
- 'value'=> '',
+ 'value'=> '',
'text' =>
lang('To').':',
),
array(
@@ -308,12 +308,23 @@
}
}
- $to = strtotime(phpgw::get_var('filter_to', 'string',
'REQUEST', null));
- $filter_to = date("Y-m-d",$to);
-
+// $to = strtotime(phpgw::get_var('filter_to', 'string',
'REQUEST', null));
+// $filter_to = date("Y-m-d",$to);
+//
+// if ($filter_to) {
+// $filters['where'][] = "%%table%%".sprintf(".to_
<= '%s 23:59:59'", $GLOBALS['phpgw']->db->db_addslashes($filter_to));
+// }
+//
+// echo 'xxx ' . $filter_to;
+// exit();
+
+ $filter_to = phpgw::get_var('filter_to', 'string',
'REQUEST', null);
if ($filter_to) {
$filters['where'][] = "%%table%%".sprintf(".to_
<= '%s 23:59:59'", $GLOBALS['phpgw']->db->db_addslashes($filter_to));
}
+//
+// echo $filter_to;
+// exit();
if (
!isset($GLOBALS['phpgw_info']['user']['apps']['admin']) && // admin users
should have access to all buildings
!$this->bo->has_role(booking_sopermission::ROLE_MANAGER) ) { // users with the
booking role admin should have access to all buildings
Modified:
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export_file.inc.php
===================================================================
---
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export_file.inc.php
2015-09-01 23:53:02 UTC (rev 13829)
+++
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export_file.inc.php
2015-09-01 23:53:48 UTC (rev 13830)
@@ -72,21 +72,21 @@
phpgwapi_yui::load_widget('datatable');
phpgwapi_yui::load_widget('paginator');
$data = array(
- 'form' => array(
- 'toolbar' => array(
- 'item' => array(
- array(
- 'type' =>
'text',
- 'name' =>
'query'
- ),
- array(
- 'type' =>
'submit',
- 'name' =>
'search',
- 'value' =>
lang('Search')
- ),
- ),
- ),
- ),
+// 'form' => array(
+// 'toolbar' => array(
+// 'item' => array(
+// array(
+// 'type' =>
'text',
+// 'name' =>
'query'
+// ),
+// array(
+// 'type' =>
'submit',
+// 'name' =>
'search',
+// 'value' =>
lang('Search')
+// ),
+// ),
+// ),
+// ),
'datatable' => array(
'source' => $this->link_to('index',
array('phpgw_return_as' => 'json')),
'sorted_by' => array('key' => 'id',
'dir' => 'desc'),
Modified: branches/dev-syncromind/booking/inc/class.uidashboard.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uidashboard.inc.php
2015-09-01 23:53:02 UTC (rev 13829)
+++ branches/dev-syncromind/booking/inc/class.uidashboard.inc.php
2015-09-01 23:53:48 UTC (rev 13830)
@@ -78,40 +78,37 @@
'toolbar' => array(
'item' => array(
array(
- 'type' => 'filter',
- 'name' =>
'status',
- 'text' => lang('Status').':',
- 'list' => array(
- array(
- 'id' => '',
- 'name' => lang('All')
- ),
- array(
- 'id' => 'NEW',
- 'name' => lang('NEW')
- ),
- array(
- 'id' => 'PENDING',
- 'name' => lang('PENDING')
- ),
- array(
- 'id' => 'REJECTED',
- 'name' => lang('REJECTED')
- ),
- array(
- 'id' => 'ACCEPTED',
- 'name' => lang('ACCEPTED')
- ),
- )
- ),
+ 'type' =>
'filter',
+ 'name' => 'status',
+ 'text' =>
lang('Status').':',
+ 'list' => array(
+ array(
+ 'id' => '',
+ 'name' =>
lang('All')
+ ),
+ array(
+ 'id' =>
'NEW',
+ 'name' =>
lang('NEW')
+ ),
+ array(
+ 'id' =>
'PENDING',
+ 'name' =>
lang('PENDING')
+ ),
+ array(
+ 'id' =>
'REJECTED',
+ 'name' =>
lang('REJECTED')
+ ),
+ array(
+ 'id' =>
'ACCEPTED',
+ 'name' =>
lang('ACCEPTED')
+ ),
+ )
+ ),
array('type' =>
'autocomplete',
'name' =>
'building',
'ui' =>
'building',
'text' =>
lang('Building').':',
),
- array('type' => 'text',
- 'name' =>
'query'
- ),
array(
'type' =>
'submit',
'name' =>
'search',
@@ -147,7 +144,8 @@
),
array(
'key' => 'what',
- 'label' => lang('What')
+ 'label' => lang('What'),
+ 'sortable' => false
),
array(
'key' =>
'activity_name',
Modified: branches/dev-syncromind/booking/inc/class.uidocument.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uidocument.inc.php
2015-09-01 23:53:02 UTC (rev 13829)
+++ branches/dev-syncromind/booking/inc/class.uidocument.inc.php
2015-09-01 23:53:48 UTC (rev 13830)
@@ -146,15 +146,7 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'text',
- 'name' =>
'query'
- ),
- array(
- 'type' =>
'submit',
- 'name' =>
'search',
- 'value' =>
lang('Search')
- ),
+
)
),
),
@@ -182,11 +174,13 @@
'key' => 'opcion_edit',
'label' => lang('Edit'),
'formatter' =>
'JqueryPortico.formatLinkGeneric',
+ 'sortable' => false
),
- array(
+ array(
'key' =>
'opcion_delete',
'label' =>
lang('Delete'),
'formatter' =>
'JqueryPortico.formatLinkGeneric',
+ 'sortable' => false
),
array(
'key' => 'link',
Modified: branches/dev-syncromind/booking/inc/class.uievent.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uievent.inc.php 2015-09-01
23:53:02 UTC (rev 13829)
+++ branches/dev-syncromind/booking/inc/class.uievent.inc.php 2015-09-01
23:53:48 UTC (rev 13830)
@@ -68,9 +68,6 @@
'text' =>
lang('Activity').':',
'list' =>
$this->bo->so->get_activities_main_level(),
),
- array('type' => 'text',
- 'name' => 'query'
- ),
array(
'type' => 'submit',
'name' => 'search',
Modified: branches/dev-syncromind/booking/inc/class.uigroup.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uigroup.inc.php 2015-09-01
23:53:02 UTC (rev 13829)
+++ branches/dev-syncromind/booking/inc/class.uigroup.inc.php 2015-09-01
23:53:48 UTC (rev 13830)
@@ -11,7 +11,7 @@
public $public_functions = array
(
'index' => true,
- 'query' => true,
+ 'query' => true,
'show' => true,
'edit' => true,
'toggle_show_inactive' => true,
@@ -121,15 +121,7 @@
'value' =>
lang('New group'),
'href' =>
self::link(array('menuaction' => 'booking.uigroup.edit'))
),
- array('type' => 'text',
- 'name' =>
'query'
- ),
array(
- 'type' =>
'submit',
- 'name' =>
'search',
- 'value' =>
lang('Search')
- ),
- array(
'type' =>
'link',
'value' =>
$_SESSION['showall'] ? lang('Show only active') : lang('Show all'),
'href' =>
self::link(array('menuaction' => $this->url_prefix.'.toggle_show_inactive'))
Modified: branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
2015-09-01 23:53:02 UTC (rev 13829)
+++ branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
2015-09-01 23:53:48 UTC (rev 13830)
@@ -43,15 +43,6 @@
'toolbar' => array(
'item' => array(
array(
- 'type' =>
'text',
- 'name' =>
'query'
- ),
- array(
- 'type' =>
'submit',
- 'name' =>
'search',
- 'value' =>
lang('Search')
- ),
- array(
'type' =>
'link',
'value' =>
$_SESSION['showall'] ? lang('Show only active') : lang('Show all'),
'href' =>
self::link(array('menuaction' => $this->url_prefix.'.toggle_show_inactive'))
Modified: branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
2015-09-01 23:53:02 UTC (rev 13829)
+++ branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
2015-09-01 23:53:48 UTC (rev 13830)
@@ -98,7 +98,8 @@
),
array(
'key' =>
'primary_contact_name',
- 'label' => lang('Admin
1')
+ 'label' => lang('Admin
1'),
+ 'sortable' => false
),
array(
'key' => 'phone',
@@ -139,7 +140,7 @@
);
}
}
- return $this->jquery_results($organizations);
+ return $this->jquery_results($organizations);
}
protected function get_customer_identifier() {
Modified: branches/dev-syncromind/booking/inc/class.uipermission.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uipermission.inc.php
2015-09-01 23:53:02 UTC (rev 13829)
+++ branches/dev-syncromind/booking/inc/class.uipermission.inc.php
2015-09-01 23:53:48 UTC (rev 13830)
@@ -135,15 +135,7 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'text',
- 'name' =>
'query'
- ),
- array(
- 'type' =>
'submit',
- 'name' =>
'search',
- 'value' =>
lang('Search')
- ),
+
)
),
),
@@ -166,11 +158,13 @@
'key' => 'opcion_edit',
'label' => lang('Edit'),
'formatter' =>
'JqueryPortico.formatLinkGeneric',
+ 'sortable' => false
),
- array(
+ array(
'key' =>
'opcion_delete',
'label' =>
lang('Delete'),
'formatter' =>
'JqueryPortico.formatLinkGeneric',
+ 'sortable' => false
),
// array(
// 'key' => 'link',
Modified: branches/dev-syncromind/booking/inc/class.uipermission_root.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uipermission_root.inc.php
2015-09-01 23:53:02 UTC (rev 13829)
+++ branches/dev-syncromind/booking/inc/class.uipermission_root.inc.php
2015-09-01 23:53:48 UTC (rev 13830)
@@ -71,16 +71,7 @@
'type' =>
'link',
'value' =>
lang('New Root Permission'),
'href' =>
$this->generate_link('add')
- ),
- array(
- 'type' =>
'text',
- 'name' =>
'query'
- ),
- array(
- 'type' =>
'submit',
- 'name' =>
'search',
- 'value' =>
lang('Search')
- ),
+ )
)
),
),
Modified: branches/dev-syncromind/booking/inc/class.uiresource.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiresource.inc.php
2015-09-01 23:53:02 UTC (rev 13829)
+++ branches/dev-syncromind/booking/inc/class.uiresource.inc.php
2015-09-01 23:53:48 UTC (rev 13830)
@@ -45,15 +45,7 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array('type' => 'text',
- 'name' =>
'query'
- ),
array(
- 'type' =>
'submit',
- 'name' =>
'search',
- 'value' =>
lang('Search')
- ),
- array(
'type' =>
'link',
'value' =>
$_SESSION['showall'] ? lang('Show only active') : lang('Show all'),
'href' =>
self::link(array('menuaction' => $this->url_prefix.'.toggle_show_inactive'))
@@ -123,7 +115,6 @@
public function query()
{
-
return
$this->jquery_results($this->bo->populate_grid_data("booking.uiresource.show"));
}
Modified: branches/dev-syncromind/booking/inc/class.uiseason.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiseason.inc.php 2015-09-01
23:53:02 UTC (rev 13829)
+++ branches/dev-syncromind/booking/inc/class.uiseason.inc.php 2015-09-01
23:53:48 UTC (rev 13830)
@@ -119,7 +119,7 @@
}
// self::render_template('datatable', $data);
- self::render_template_xsl('datatable_jquery',$data);
+ self::render_template_xsl('datatable_jquery',$data);
}
public function query()
Modified: branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
2015-09-01 23:53:02 UTC (rev 13829)
+++ branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
2015-09-01 23:53:48 UTC (rev 13830)
@@ -45,53 +45,49 @@
'toolbar' => array(
'item' => array(
array(
- 'type' => 'filter',
- 'name' =>
'status',
- 'text' => lang('Status').':',
- 'list' => array(
- array(
- 'id' => '',
- 'name' => lang('All')
- ),
- array(
- 'id' => 'NEW',
- 'name' => lang('NEW')
- ),
- array(
- 'id' => 'CLOSED',
- 'name' => lang('CLOSED')
- )
- )
- ),
+ 'type' =>
'filter',
+ 'name' => 'status',
+ 'text' =>
lang('Status').':',
+ 'list' => array(
+ array(
+ 'id' => '',
+ 'name' =>
lang('All')
+ ),
+ array(
+ 'id' =>
'NEW',
+ 'name' =>
lang('NEW')
+ ),
+ array(
+ 'id' =>
'CLOSED',
+ 'name' =>
lang('CLOSED')
+ )
+ )
+ ),
array(
- 'type' => 'filter',
- 'name' =>
'type',
- 'text' => lang('Type').':',
- 'list' => array(
- array(
- 'id' => '',
- 'name' => lang('All')
- ),
- array(
- 'id' => 'message',
- 'name' => lang('Message')
- ),
- array(
- 'id' => 'cancelation',
- 'name' => lang('Cancelation')
- ),
- )
- ),
+ 'type' =>
'filter',
+ 'name' => 'type',
+ 'text' =>
lang('Type').':',
+ 'list' => array(
+ array(
+ 'id' => '',
+ 'name' =>
lang('All')
+ ),
+ array(
+ 'id' =>
'message',
+ 'name' =>
lang('Message')
+ ),
+ array(
+ 'id' =>
'cancelation',
+ 'name' =>
lang('Cancelation')
+ ),
+ )
+ ),
array(
- 'type' => 'autocomplete',
+ 'type' =>
'autocomplete',
'name' =>
'building',
'ui' =>
'building',
'text' =>
lang('Building').':',
),
- array(
- 'type' => 'text',
- 'name' =>
'query'
- ),
array(
'type' =>
'submit',
'name' =>
'search',
@@ -127,15 +123,18 @@
),
array(
'key' => 'what',
- 'label' => lang('What')
+ 'label' => lang('What'),
+ 'sortable' => false
),
array(
'key' => 'contact_name',
- 'label' =>
lang('Contact')
+ 'label' =>
lang('Contact'),
+ 'sortable' => false
),
array(
'key' =>
'case_officer_name',
- 'label' => lang('Case
Officer')
+ 'label' => lang('Case
Officer'),
+ 'sortable' => false
),
array(
'key' => 'link',
@@ -144,7 +143,7 @@
)
)
);
- self::render_template_xsl('datatable_jquery', $data);
+ self::render_template_xsl('datatable_jquery', $data);
// self::render_template('datatable', $data);
}
| [Prev in Thread] | Current Thread | [Next in Thread] |