[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13395] class.uibooking.inc
From: |
Saul |
Subject: |
[Fmsystem-commits] [13395] class.uibooking.inc |
Date: |
Tue, 09 Jun 2015 22:53:48 +0000 |
Revision: 13395
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13395
Author: psaul
Date: 2015-06-09 22:53:47 +0000 (Tue, 09 Jun 2015)
Log Message:
-----------
class.uibooking.inc
Modified Paths:
--------------
branches/dev-syncromind/booking/inc/class.uibooking.inc.php
Modified: branches/dev-syncromind/booking/inc/class.uibooking.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uibooking.inc.php 2015-06-09
22:53:09 UTC (rev 13394)
+++ branches/dev-syncromind/booking/inc/class.uibooking.inc.php 2015-06-09
22:53:47 UTC (rev 13395)
@@ -1,12 +1,18 @@
<?php
- phpgw::import_class('booking.uicommon');
+// phpgw::import_class('booking.uicommon');
phpgw::import_class('phpgwapi.send');
+
+ phpgw::import_class('booking.uidocument_building');
+ phpgw::import_class('booking.uipermission_building');
+
+ phpgw::import_class('phpgwapi.uicommon_jquery');
- class booking_uibooking extends booking_uicommon
+ class booking_uibooking extends phpgwapi_uicommon_jquery
{
public $public_functions = array
(
'index' => true,
+ 'query' => true,
'add' => true,
'show' => true,
'edit' => true,
@@ -21,7 +27,7 @@
{
parent::__construct();
- self::process_booking_unauthorized_exceptions();
+// Analizar esta linea
self::process_booking_unauthorized_exceptions();
$this->bo = CreateObject('booking.bobooking');
$this->activity_bo = CreateObject('booking.boactivity');
@@ -43,7 +49,7 @@
public function index()
{
if(phpgw::get_var('phpgw_return_as') == 'json') {
- return $this->index_json();
+ return $this->query();
}
self::add_javascript('booking', 'booking',
'allocation_list.js');
self::add_javascript('booking', 'booking',
'datatable.js');
@@ -93,7 +99,7 @@
array(
'key' =>
'activity_name',
'label' =>
lang('Activity'),
- 'formatter' =>
'YAHOO.booking.formatLink'
+ 'formatter' =>
'JqueryPortico.formatLink'
),
array(
'key' => 'group_name',
@@ -135,9 +141,66 @@
));
}
$data['filters'] = $this->export_filters;
- self::render_template('datatable', $data);
+// self::render_template('datatable', $data);
+ self::render_template_xsl('datatable_jquery',$data);
}
+ public function query()
+ {
+ if(isset($_SESSION['showall']))
+ {
+ unset($filters['building_name']);
+ unset($filters['group_id']);
+ unset($filters['season_id']);
+ } else {
+ $testdata = phpgw::get_var('filter_building_id', 'int',
'REQUEST', null);
+ if ($testdata != 0) {
+ $filters['building_name'] =
$this->bo->so->get_building(phpgw::get_var('filter_building_id', 'int',
'REQUEST', null));
+ } else {
+ unset($filters['building_name']);
+ }
+ $testdata2 = phpgw::get_var('organizations', 'int',
'REQUEST', null);
+ if ($testdata2 != 0) {
+ $filters['group_id'] =
$this->bo->so->get_group_of_organization(phpgw::get_var('organizations', 'int',
'REQUEST', null));
+ } else {
+ unset($filters['group_id']);
+ }
+ $testdata3 = phpgw::get_var('filter_season_id', 'int',
'REQUEST', null);
+ if ($testdata3 != 0 and $testdata3 != '') {
+ $filters['season_id'] =
$this->bo->so->get_season(phpgw::get_var('filter_season_id', 'int', 'REQUEST',
null));
+ } else {
+ unset($filters['season_id']);
+ }
+ }
+
+ $search = phpgw::get_var('search');
+ $order = phpgw::get_var('order');
+ $columns = phpgw::get_var('columns');
+
+ $params = array(
+ 'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
+ 'results' => phpgw::get_var('length', 'int',
'REQUEST', null),
+ 'query' => $search['value'],
+ 'order' =>
$columns[$order[0]['column']]['data'],
+ 'sort' =>
$columns[$order[0]['column']]['data'],
+ 'dir' => $order[0]['dir'],
+ 'filters' => $filters
+ );
+
+ $bookings = $this->bo->so->read($params);
+
+ foreach($bookings['results'] as &$booking) {
+ $building =
$this->building_bo->read_single($booking['building_id']);
+ $booking['building_name'] = $building['name'];
+ $booking['from_'] =
pretty_timestamp($booking['from_']);
+ $booking['to_'] =
pretty_timestamp($booking['to_']);
+ }
+
+ array_walk($bookings["results"], array($this,
"_add_links"), "booking.uibooking.show");
+
+ return $this->jquery_results($bookings);
+ }
+
public function index_json()
{
if(isset($_SESSION['showall']))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13395] class.uibooking.inc,
Saul <=