[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14585] clean up from yui
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14585] clean up from yui |
|
Date: |
Sun, 13 Dec 2015 17:08:42 +0000 |
Revision: 14585
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14585
Author: sigurdne
Date: 2015-12-13 17:08:42 +0000 (Sun, 13 Dec 2015)
Log Message:
-----------
clean up from yui
Modified Paths:
--------------
branches/dev-syncromind/booking/inc/class.uiaccount_code_set.inc.php
branches/dev-syncromind/booking/inc/class.uiactivity.inc.php
branches/dev-syncromind/booking/inc/class.uiagegroup.inc.php
branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
branches/dev-syncromind/booking/inc/class.uiapplication_settings.inc.php
branches/dev-syncromind/booking/inc/class.uiaudience.inc.php
branches/dev-syncromind/booking/inc/class.uibooking.inc.php
branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export.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.uidocument_view.inc.php
branches/dev-syncromind/booking/inc/class.uidocumentation.inc.php
branches/dev-syncromind/booking/inc/class.uievent.inc.php
branches/dev-syncromind/booking/inc/class.uievent_mail_settings.inc.php
branches/dev-syncromind/booking/inc/class.uigroup.inc.php
branches/dev-syncromind/booking/inc/class.uimail_settings.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
branches/dev-syncromind/bookingfrontend/inc/class.uiallocation.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uicontactperson.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
Modified: branches/dev-syncromind/booking/inc/class.uiaccount_code_set.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiaccount_code_set.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uiaccount_code_set.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -68,8 +68,6 @@
self::add_javascript('booking', 'booking',
'account_code_set.js');
// self::add_javascript('booking', 'booking',
'datatable.js');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('paginator');
$data
= array(
'form' => array(
'toolbar' => array(
@@ -132,17 +130,6 @@
return $results;
}
-// public function index_json()
-// {
-// $account_code_sets = $this->bo->read();
-// array_walk($account_code_sets["results"], array($this,
"_add_links"), $this->module.".uiaccount_code_set.show");
-// //foreach($account_code_sets["results"] as
&$account_code_set) {}
-//
-// $results = $this->yui_results($account_code_sets);
-//
-// return $results;
-// }
-
protected function add_default_display_data(&$account_code_set)
{
$account_code_set['edit_link'] =
$this->link_to('edit', array('id' => $account_code_set['id']));
Modified: branches/dev-syncromind/booking/inc/class.uiactivity.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiactivity.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uiactivity.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -77,7 +77,6 @@
$children[$activity['parent_id']][] = $activity;
}
$treedata =
json_encode($this->treeitem($children, null, $show_all));
-// phpgwapi_yui::load_widget('treeview');
phpgwapi_jquery::load_widget('treeview');
$links = array(
'show_inactive' =>
self::link(array('menuaction' => 'booking.uiactivity.index',
Modified: branches/dev-syncromind/booking/inc/class.uiagegroup.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiagegroup.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uiagegroup.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -60,10 +60,6 @@
return $this->query();
}
-// self::add_javascript('booking', 'booking',
'datatable.js');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('paginator');
-// phpgwapi_yui::load_widget('treeview');
$data = array(
'form' => array(
'toolbar' => array(
@@ -138,17 +134,6 @@
return $this->jquery_results($groups);
}
-// public function index_json()
-// {
-// $groups = $this->bo->read();
-// foreach($groups['results'] as &$agegroup)
-// {
-// $agegroup['link'] =
$this->link(array('menuaction' => 'booking.uiagegroup.edit', 'id' =>
$agegroup['id']));
-// $agegroup['active'] = $agegroup['active'] ?
lang('Active') : lang('Inactive');
-// }
-// return $this->yui_results($groups);
-// }
-
public function add()
{
$errors = array();
Modified: branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -45,9 +45,7 @@
return $this->query();
}
self::add_javascript('booking', 'booking',
'allocation_list.js');
-// self::add_javascript('booking', 'booking',
'datatable.js');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('paginator');
+
phpgwapi_jquery::load_widget('menu');
phpgwapi_jquery::load_widget('autocomplete');
$build_id = phpgw::get_var('buildings', 'int',
'REQUEST', null);
Modified: branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -244,9 +244,6 @@
{
return $this->query();
}
-// self::add_javascript('booking', 'booking',
'datatable.js');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('paginator');
$data = array(
'form' => array(
@@ -613,7 +610,6 @@
'event_id' => $association['id'],
'application_id' => $association['application_id']));
$association['type'] =
lang($association['type']);
}
-// return $this->yui_results($associations);
return $associations;
}
Modified:
branches/dev-syncromind/booking/inc/class.uiapplication_settings.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiapplication_settings.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uiapplication_settings.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -44,7 +44,6 @@
$settings = array();
$settings['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
phpgwapi_jquery::init_ckeditor('field_description');
-// $this->use_yui_editor();
self::render_template_xsl('application_settings',
array('config_data' => $config->config_data,
'data' => $settings));
}
Modified: branches/dev-syncromind/booking/inc/class.uiaudience.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiaudience.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uiaudience.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -73,11 +73,6 @@
$this->bo->actUnSet();
}
-
-// self::add_javascript('booking', 'booking',
'datatable.js');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('paginator');
-// phpgwapi_yui::load_widget('treeview');
$sessionLink = $this->link(array('menuaction' =>
'booking.uiaudience.index', 'sessionShowAll' => 'activate'));
$data = array(
'form' => array(
@@ -155,18 +150,6 @@
return $this->jquery_results($groups);
}
-// public function index_json()
-// {
-//
-// $groups = $this->bo->read();
-//
-// foreach($groups['results'] as &$audience)
-// {
-// $audience['link'] =
$this->link(array('menuaction' => 'booking.uiaudience.edit', 'id' =>
$audience['id']));
-// $audience['active'] = $audience['active'] ?
lang('Active') : lang('Inactive');
-// }
-// return $this->yui_results($groups);
-// }
public function add()
{
Modified: branches/dev-syncromind/booking/inc/class.uibooking.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uibooking.inc.php 2015-12-13
16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uibooking.inc.php 2015-12-13
17:08:42 UTC (rev 14585)
@@ -54,9 +54,7 @@
return $this->query();
}
self::add_javascript('booking', 'booking',
'allocation_list.js');
-// self::add_javascript('booking', 'booking',
'datatable.js');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('paginator');
+
phpgwapi_jquery::load_widget('autocomplete');
$data = array(
'form' => array(
Modified: branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -81,7 +81,9 @@
public function find_buildings_used_by()
{
if(!phpgw::get_var('phpgw_return_as') == 'json')
- { return;}
+ {
+ return;
+ }
if(($organization_id =
phpgw::get_var('organization_id', 'int', 'REQUEST', null)))
{
@@ -99,9 +101,7 @@
{
return $this->query();
}
-// self::add_javascript('booking', 'booking',
'datatable.js');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('paginator');
+
$data = array(
'form' => array(
'toolbar' => array(
@@ -199,7 +199,6 @@
$this->flash_form_errors($errors);
$building['buildings_link'] =
self::link(array('menuaction' => 'booking.uibuilding.index'));
$building['cancel_link'] =
self::link(array('menuaction' => 'booking.uibuilding.index'));
-// $this->use_yui_editor();
phpgwapi_jquery::load_widget('autocomplete');
phpgwapi_jquery::init_ckeditor('field_description');
@@ -249,7 +248,6 @@
}
}
$this->flash_form_errors($errors);
-// $this->use_yui_editor();
phpgwapi_jquery::load_widget('autocomplete');
phpgwapi_jquery::init_ckeditor('field_description');
Modified:
branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -127,9 +127,7 @@
phpgwapi_jquery::load_widget('datepicker');
self::add_javascript('booking', 'booking',
'completed_reservation.js');
-// self::add_javascript('booking', 'booking',
'datatable.js');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('paginator');
+
$data = array(
'form' => array(
'toolbar' => array(
@@ -480,192 +478,6 @@
return $results;
}
-// public function index_json()
-// {
-// $start = phpgw::get_var('startIndex', 'int', 'REQUEST',
0);
-// $results = phpgw::get_var('results', 'int', 'REQUEST',
null);
-// $query = phpgw::get_var('query');
-// $sort = phpgw::get_var('sort');
-// $dir = phpgw::get_var('dir');
-//
-// /*
-// * Due to problem on order with offset - we need to set
an additional parameter in some cases
-// *
http://stackoverflow.com/questions/13580826/postgresql-repeating-rows-from-limit-offset
-// */
-//
-// switch($sort)
-// {
-// case 'cost':
-// $_sort = array('cost','id');
-// break;
-// case 'reservation_type':
-// $_sort = array('reservation_type','id');
-// break;
-// case 'building_name':
-// $_sort = array('building_name','id');
-// break;
-// case 'organization_name':
-// $_sort =
array('organization_name','id');
-// break;
-// case 'contact_name':
-// $_sort = array('contact_name','id');
-// break;
-// case 'customer_type':
-// $_sort = array('customer_type','id');
-// break;
-// case 'from_':
-// $_sort = array('from_','id');
-// break;
-// case 'to_':
-// $_sort = array('to_','id');
-// break;
-// case 'exported':
-// $_sort = array('exported','id');
-// break;
-// case 'export_file_id':
-// $_sort = array('export_file_id','id');
-// break;
-// default:
-// $_sort = $sort;
-// break;
-// }
-//
-// $filters = array();
-// foreach($this->bo->so->get_field_defs() as $field =>
$params) {
-// if(phpgw::get_var("filter_$field")) {
-// $filters[$field] =
phpgw::get_var("filter_$field");
-// }
-// }
-//
-// $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));
-// }
-//
-// 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
-//
-// $accessable_buildings =
$this->bo->accessable_buildings($GLOBALS['phpgw_info']['user']['id']);
-//
-// // if no buildings are searched for, show all
accessable buildings
-// if ( !isset($filters['building_id']) ) {
-// $filters['building_id'] =
$accessable_buildings;
-// } else { // before displaying search result,
check if the building search for is accessable
-// if (!in_array($filters['building_id'],
$accessable_buildings)) {
-// $filters['building_id'] = -1;
-//
unset($filters['building_name']);
-// }
-// }
-// }
-//
-// if(!isset($_SESSION['showall'])) {
-// $filters['active'] = "1";
-// }
-//
-// if
(!isset($_SESSION['show_all_completed_reservations'])) {
-// $filters['exported'] = '';
-// }
-//
-// $params = array(
-// 'start' => $start,
-// 'results' => $results,
-// 'query' => $query,
-// 'sort' => $_sort,
-// 'dir' => $dir,
-// 'filters' => $filters
-// );
-//
-// $reservations = $this->bo->so->read($params);
-//
-// array_walk($reservations["results"], array($this,
"_add_links"), $this->module.".uicompleted_reservation.show");
-// foreach($reservations["results"] as &$reservation) {
-//
-// if (!empty($reservation['exported']))
-// {
-// $reservation['exported'] = array(
-// 'href' =>
$this->link_to('show', array('ui' => 'completed_reservation_export', 'id' =>
$reservation['exported'])),
-// 'label' =>
(string)$reservation['exported'],
-// );
-// } else {
-// $reservation['exported'] =
array('label' => lang('No'));
-// }
-//
-// $reservation['reservation_type'] = array(
-// 'href' =>
$this->link_to($reservation['reservation_type'] == 'event' ? 'edit' : 'show',
array('ui' => $reservation['reservation_type'], 'id' =>
$reservation['reservation_id'])),
-// 'label' =>
lang($reservation['reservation_type']),
-// );
-//
-// if (isset($reservation['export_file_id']) &&
!empty($reservation['export_file_id'])) {
-// $reservation['export_file_id'] = array(
-// 'label' =>
(string)$reservation['export_file_id'],
-// 'href' =>
$this->link_to('show', array('ui' => 'completed_reservation_export_file', 'id'
=> $reservation['export_file_id']))
-// );
-// } else {
-// $reservation['export_file_id'] =
array('label' => lang("Not Generated"));
-// }
-//
-// if
(empty($reservation['invoice_file_order_id'])) {
-// $reservation['invoice_file_order_id'] =
lang("Not Generated");
-// }
-//
-// $this->db = & $GLOBALS['phpgw']->db;
-//
-// if ($reservation['reservation_type']['label']
== 'Arrangement') {
-// $sql = "select description,contact_name
from bb_event where id=".$reservation['reservation_id'];
-// $this->db->limit_query($sql, 0,
__LINE__, __FILE__, 1);
-// $this->db->next_record();
-// $reservation['event_id'] =
$reservation['reservation_id'];
-// $reservation['description'] =
$this->db->f('description', false);
-// $reservation['contact_name'] =
$this->db->f('contact_name', false);
-//
-// } elseif
($reservation['reservation_type']['label'] == 'Booking') {
-// $sql = "select application_id from
bb_booking where id=".$reservation['reservation_id'];
-// $this->db->limit_query($sql, 0,
__LINE__, __FILE__, 1);
-// $this->db->next_record();
-// if (!$this->db->f('application_id',
false)) {
-// $reservation['contact_name'] =
'';
-// } else {
-// $sql = "select contact_name
from bb_application where id=".$this->db->f('application_id', false);
-// $this->db->limit_query($sql, 0,
__LINE__, __FILE__, 1);
-// $this->db->next_record();
-// $reservation['contact_name'] =
$this->db->f('contact_name', false);
-// }
-// $reservation['event_id'] = '';
-// $reservation['description'] = '';
-// } else {
-// $sql = "select application_id from
bb_allocation where id=".$reservation['reservation_id'];
-// $this->db->limit_query($sql, 0,
__LINE__, __FILE__, 1);
-// $this->db->next_record();
-// if (!$this->db->f('application_id',
false)) {
-// $reservation['contact_name'] =
'';
-// } else {
-// $sql = "select contact_name
from bb_application where id=".$this->db->f('application_id', false);
-// $this->db->limit_query($sql, 0,
__LINE__, __FILE__, 1);
-// $this->db->next_record();
-// $reservation['contact_name'] =
$this->db->f('contact_name', false);
-// }
-// $reservation['event_id'] = '';
-// $reservation['description'] = '';
-// }
-// $reservation['from_'] =
substr($reservation['from_'], 0, -3);
-// $reservation['to_'] =
substr($reservation['to_'], 0, -3);
-// $reservation['from_'] =
pretty_timestamp($reservation['from_']);
-// $reservation['to_'] =
pretty_timestamp($reservation['to_']);
-// $reservation['customer_type'] =
lang($reservation['customer_type']);
-//
-//
$this->add_current_customer_identifier_info($reservation);
-//
-// $reservation['customer_identifier'] =
isset($reservation['customer_identifier_label']) ?
-//
$reservation['customer_identifier_value'] : lang('None');
-// }
-//
-// $results = $this->yui_results($reservations);
-//
-// return $results;
-// }
-
protected function add_default_display_data(&$reservation)
{
$reservation['reservations_link'] =
$this->link_to('index');
Modified:
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export.inc.php
===================================================================
---
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -102,9 +102,6 @@
$GLOBALS['phpgw']->jqcal->add_listener('filter_to');
phpgwapi_jquery::load_widget('datepicker');
-// self::add_javascript('booking', 'booking',
'datatable.js');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('paginator');
$data = array(
'form' => array(
@@ -360,26 +357,6 @@
}
}
-// public function index_json()
-// {
-// $this->db = $GLOBALS['phpgw']->db;
-// $exports = $this->bo->read();
-// array_walk($exports["results"], array($this,
"_add_links"), $this->module.".uicompleted_reservation_export.show");
-//
-// foreach($exports["results"] as &$export) {
-// $export =
$this->bo->so->initialize_entity($export);
-// $this->add_default_display_data($export);
-//
-// $sql = "SELECT account_lastname,
account_firstname FROM phpgw_accounts WHERE account_lid =
'".$export['created_by_name']."'";
-// $this->db->query($sql);
-// while ($record =
array_shift($this->db->resultSet)) {
-// $export['created_by_name'] =
$record['account_firstname']." ".$record['account_lastname'];
-// }
-// }
-// $results = $this->yui_results($exports);
-// return $results;
-// }
-
public function show()
{
$export =
$this->bo->read_single(phpgw::get_var('id', 'int'));
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-12-13 16:36:11 UTC (rev 14584)
+++
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export_file.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -72,25 +72,7 @@
return $this->query();
}
-// self::add_javascript('booking', 'booking',
'datatable.js');
-// 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')
-// ),
-// ),
-// ),
-// ),
'datatable' => array(
'source' =>
$this->link_to('index', array('phpgw_return_as' => 'json')),
'sorted_by' => array('key' =>
'id', 'dir' => 'desc'),
@@ -207,56 +189,6 @@
return $results;
}
-// public function index_json()
-// {
-// $this->db = $GLOBALS['phpgw']->db;
-// $config = CreateObject('phpgwapi.config','booking');
-// $config->read();
-//# if ($config->config_data['output_files'] == 'single')
-// $export_files = $this->bo->read();
-// array_walk($export_files["results"], array($this,
"_add_links"), $this->module.".uicompleted_reservation_export_file.show");
-// foreach($export_files["results"] as &$export_file) {
-// $export_file['created_on'] =
pretty_timestamp(substr($export_file['created_on'], 0, 19));
-// $export_file['type'] =
lang($export_file['type']);
-//
-// $export_file['download'] = array(
-// 'label' => lang('Download'),
-// 'href' => $this->link_to('download',
array('id' => $export_file['id']))
-// );
-// if ($export_file['total_items'] > 0 and $export_file['id'] >
$config->config_data['invoice_last_id'] and
!empty($export_file['log_filename'])) {
-// $export_file['log'] = array(
-// 'label' => lang('log'),
-// 'href' => $this->link_to('log',
array('id' => $export_file['id']))
-// );
-// } else {
-// $export_file['log'] = array(
-// 'label' => ' ',
-// 'href' => '#'
-// );
-// }
-// if ($export_file['total_items'] > 0 and
$export_file['id'] > $config->config_data['invoice_last_id'])
-// {
-// $export_file['upload'] = array(
-// 'label' => lang('Upload'),
-// 'href' =>
$this->link_to('upload', array('id' => $export_file['id']))
-// );
-// } else {
-// $export_file['upload'] = array(
-// 'label' => ' ',
-// 'href' => '#'
-// );
-// }
-// $sql = "SELECT account_lastname,
account_firstname FROM phpgw_accounts WHERE account_lid =
'".$export_file['created_by_name']."'";
-// $this->db->query($sql);
-// while ($record =
array_shift($this->db->resultSet)) {
-// $export_file['created_by_name'] =
$record['account_firstname']." ".$record['account_lastname'];
-// }
-// }
-//
-// $results = $this->yui_results($export_files);
-// return $results;
-// }
-
public function show()
{
$export_file =
$this->bo->read_single(phpgw::get_var('id', 'int'));
Modified: branches/dev-syncromind/booking/inc/class.uidashboard.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uidashboard.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uidashboard.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -77,9 +77,7 @@
}
$GLOBALS['phpgw_info']['apps']['manual']['section'] =
'booking_manual';
-// self::add_javascript('booking', 'booking',
'datatable.js');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('paginator');
+
phpgwapi_jquery::load_widget('autocomplete');
$data = array(
@@ -218,41 +216,4 @@
return $this->jquery_results($applications);
}
- public function index_json()
- {
- $this->db = $GLOBALS['phpgw']->db;
-
- $applications =
$this->bo->read_dashboard_data($this->show_all_dashboard_applications() ? array(
- null, $this->current_account_id()) : array(1,
$this->current_account_id()));
- foreach($applications['results'] as &$application)
- {
- $application['status']
= lang($application['status']);
- $application['type']
= lang($application['type']);
- $application['created']
= pretty_timestamp($application['created']);
- $application['modified']
= pretty_timestamp($application['modified']);
- $application['frontend_modified'] =
pretty_timestamp($application['frontend_modified']);
- $application['resources']
= $this->resource_bo->so->read(array('filters' => array(
- 'id' =>
$application['resources'])));
- $application['resources']
= $application['resources']['results'];
- if($application['resources'])
- {
- $names = array();
- foreach($application['resources'] as
$res)
- {
- $names[] = $res['name'];
- }
- $application['what'] =
$application['resources'][0]['building_name'] . ' (' . join(', ', $names) . ')';
- }
-
- $sql = "SELECT account_lastname,
account_firstname FROM phpgw_accounts WHERE account_lid = '" .
$application['case_officer_name'] . "'";
- $this->db->query($sql);
- while($record =
array_shift($this->db->resultSet))
- {
- $application['case_officer_name'] =
$record['account_firstname'] . " " . $record['account_lastname'];
- }
- }
- array_walk($applications["results"], array($this,
"_add_links"), "booking.uiapplication.show");
-
- return $this->yui_results($applications);
- }
}
\ No newline at end of file
Modified: branches/dev-syncromind/booking/inc/class.uidocument.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uidocument.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uidocument.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -143,10 +143,6 @@
$this->redirect_to_parent_if_inline();
-// self::add_javascript('booking', 'booking',
'datatable.js');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('paginator');
-
$data = array(
'form' => array(
'toolbar' => array(
@@ -243,38 +239,6 @@
return $this->jquery_results($documents);
}
-// public function index_json()
-// {
-// $documents = $this->bo->read();
-// foreach($documents['results'] as &$document)
-// {
-// $document['link'] =
$this->get_owner_typed_link('download', array('id' => $document['id']));
-// $document['category'] =
lang(self::humanize($document['category']));
-// #$document['active'] = $document['active'] ?
lang('Active') : lang('Inactive');
-//
-// $document_actions = array();
-// if ($this->bo->allow_write($document))
$document_actions[] = $this->get_owner_typed_link('edit', array('id' =>
$document['id']));
-// if ($this->bo->allow_delete($document))
$document_actions[] = $this->get_owner_typed_link('delete', array('id' =>
$document['id']));
-//
-// $document['actions'] = $document_actions;
-// }
-// if (phpgw::get_var('no_images'))
-// {
-// $documents['results'] =
array_filter($documents['results'], array($this, 'is_image'));
-//
-// // the array_filter function preserves the
array keys. The javascript that later iterates over the resultset don't like
gaps in the array keys
-// // reindexing the results array solves the
problem
-// $doc_backup = $documents;
-// unset($documents['results']);
-// foreach($doc_backup['results'] as $doc)
-// {
-// $documents['results'][] = $doc;
-// }
-// $documents['total_records'] =
count($documents['results']);
-// }
-// return $this->yui_results($documents);
-// }
-
private function is_image($document)
{
return $document['is_image'] == false;
Modified: branches/dev-syncromind/booking/inc/class.uidocument_view.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uidocument_view.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uidocument_view.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -65,8 +65,6 @@
}
self::add_javascript('booking', 'booking',
'datatable.js');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('paginator');
$data = array(
'form' => array(
@@ -100,7 +98,6 @@
)
);
-// self::render_template('datatable', $data);
self::render_template_xsl('datatable_jquery', $data);
}
@@ -134,20 +131,4 @@
return $this->jquery_results($documents);
}
-// public function regulations_json()
-// {
-// $documents = $this->bo->read_regulations();
-//
-// foreach($documents['results'] as &$document) {
-// $document['link'] = $this->link_to('download',
array('id' => $document['id']));
-// $document['name'] =
isset($document['description']) && strlen(trim($document['description'])) > 0 ?
-// $document['description'] :
$document['name'];
-// }
-//
-// //Resort because the sorting order from the database
may have been screwed up above
-// //when choosing between name and description of document
-// usort($documents['results'], array(self,
'sort_by_params'));
-//
-// return $this->yui_results($documents);
-// }
}
\ No newline at end of file
Modified: branches/dev-syncromind/booking/inc/class.uidocumentation.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uidocumentation.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uidocumentation.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -39,10 +39,6 @@
return $this->query();
}
-// self::add_javascript('booking', 'booking',
'datatable.js');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('paginator');
-
$data = array(
'form' => array(
'toolbar' => array(
@@ -120,24 +116,6 @@
return $this->jquery_results($documents);
}
-// public function index_json()
-// {
-// $documents = $this->bo->read();
-//
-// foreach($documents['results'] as &$document)
-// {
-// $document['link'] =
self::link(array('menuaction' => $this->module.'.uidocumentation.download',
'id' => $document['id']));
-// $document['category'] =
lang(self::humanize($document['category']));
-// #$document['active'] = $document['active'] ?
lang('Active') : lang('Inactive');
-//
-// $document_actions = array();
-// $document_actions[] =
self::link(array('menuaction' => $this->module.'.uidocumentation.edit', 'id' =>
$document['id']));
-// $document_actions[] =
self::link(array('menuaction' => $this->module.'.uidocumentation.delete', 'id'
=> $document['id']));
-//
-// $document['actions'] = $document_actions;
-// }
-// return $this->yui_results($documents);
-// }
public function index_images()
{
Modified: branches/dev-syncromind/booking/inc/class.uievent.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uievent.inc.php 2015-12-13
16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uievent.inc.php 2015-12-13
17:08:42 UTC (rev 14585)
@@ -47,9 +47,7 @@
{
return $this->query();
}
-// self::add_javascript('booking', 'booking', 'datatable.js');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('paginator');
+
$data = array(
'form' => array(
'toolbar' => array(
@@ -184,55 +182,6 @@
return $this->jquery_results($events);
}
- public function index_json()
- {
- if(isset($_SESSION['showall']))
- {
- unset($filters['building_name']);
- unset($filters['activity_id']);
- }
- else
- {
- $testdata = phpgw::get_var('buildings', 'int',
'REQUEST', null);
- if($testdata != 0)
- {
- $filters['building_name'] =
$this->bo->so->get_building(phpgw::get_var('buildings', 'int', 'REQUEST',
null));
- }
- else
- {
- unset($filters['building_name']);
- }
- $testdata2 = phpgw::get_var('activities',
'int', 'REQUEST', null);
- if($testdata2 != 0)
- {
- $filters['activity_id'] =
$this->bo->so->get_activities(phpgw::get_var('activities', 'int', 'REQUEST',
null));
- }
- else
- {
- unset($filters['activity_id']);
- }
- }
-
- $params = array(
- 'start' =>
phpgw::get_var('startIndex', 'int', 'REQUEST', 0),
- 'results' => phpgw::get_var('results',
'int', 'REQUEST', null),
- 'query' => phpgw::get_var('query'),
- 'sort' => phpgw::get_var('sort'),
- 'dir' => phpgw::get_var('dir'),
- 'filters' => $filters
- );
- $events = $this->bo->so->read($params);
-
- foreach($events['results'] as &$event)
- {
- $event['from_'] =
pretty_timestamp($event['from_']);
- $event['to_'] =
pretty_timestamp($event['to_']);
- }
-
- array_walk($events["results"], array($this,
"_add_links"), "booking.uievent.edit");
- return $this->yui_results($events);
- }
-
private function _combine_dates($from_, $to_)
{
return array('from_' => $from_, 'to_' => $to_);
Modified:
branches/dev-syncromind/booking/inc/class.uievent_mail_settings.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uievent_mail_settings.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uievent_mail_settings.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -43,7 +43,6 @@
$settings = array();
$settings['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
-// $this->use_yui_editor();
self::render_template_xsl('event_mail_settings',
array('config_data' => $config->config_data,
'data' => $settings));
}
Modified: branches/dev-syncromind/booking/inc/class.uigroup.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uigroup.inc.php 2015-12-13
16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uigroup.inc.php 2015-12-13
17:08:42 UTC (rev 14585)
@@ -118,9 +118,7 @@
{
return $this->query();
}
-// self::add_javascript('booking', 'booking',
'datatable.js');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('paginator');
+
$data = array(
'form' => array(
'toolbar' => array(
@@ -223,41 +221,6 @@
return $results;
}
-// public function index_json()
-// {
-// $groups = $this->bo->read();
-// array_walk($groups["results"], array($this,
"_add_links"), $this->module.".uigroup.show");
-// foreach($groups["results"] as &$group) {
-//
-// $contact = (isset($group['contacts']) &&
isset($group['contacts'][0])) ? $group['contacts'][0] : null;
-// $contact2 = (isset($group['contacts']) &&
isset($group['contacts'][1])) ? $group['contacts'][1] : null;
-//
-// if ($contact) {
-// $group += array(
-//
"primary_contact_name" => ($contact["name"]) ? $contact["name"] : '',
-//
"primary_contact_phone" => ($contact["phone"]) ? $contact["phone"] : '',
-//
"primary_contact_email" => ($contact["email"]) ? $contact["email"] : '',
-// );
-// }
-// if ($contact2) {
-// $group += array(
-//
"secondary_contact_name" => ($contact2["name"]) ? $contact2["name"] : '',
-//
"secondary_contact_phone" => ($contact2["phone"]) ? $contact2["phone"] : '',
-//
"secondary_contact_email" => ($contact2["email"]) ? $contact2["email"] : '',
-// );
-// }
-// }
-//
-// $results = $this->yui_results($groups);
-//
-// if (is_array($parent_entity =
$this->get_parent_if_inline())) {
-// if
($this->bo->allow_create(array($this->get_current_parent_type().'_id' =>
$parent_entity['id']))) {
-// $results['Actions']['add'] =
array('text' => lang('Add Group'), 'href' => $this->link_to('edit'));
-// }
-// }
-//
-// return $results;
-// }
public function edit()
{
@@ -344,7 +307,6 @@
$group[$this->get_current_parent_type() .
'_name'] = $parent_entity['name'];
}
-// $this->use_yui_editor();
$activities =
$this->activity_bo->fetch_activities();
$activities = $activities['results'];
Modified: branches/dev-syncromind/booking/inc/class.uimail_settings.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uimail_settings.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uimail_settings.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -41,7 +41,6 @@
}
$config->save_repository();
}
-// $this->use_yui_editor();
$tabs = array();
$tabs['generic'] = array('label' => lang('Mail
Settings'), 'link' => '#mail_settings');
$active_tab = 'generic';
Modified: branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -37,9 +37,7 @@
{
return $this->query();
}
-// self::add_javascript('booking', 'booking',
'datatable.js');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('paginator');
+
$data = array(
'form' => array(
'toolbar' => array(
@@ -102,19 +100,6 @@
return $this->jquery_results($buildings);
}
- public function index_json()
- {
-
- $buildings = $this->bo->read();
- foreach($buildings['results'] as &$building)
- {
- $building['link'] =
$this->link(array('menuaction' => 'booking.uimassbooking.schedule',
- 'id' => $building['id']));
- $building['active'] = $building['active']
? lang('Active') : lang('Inactive');
- }
- return $this->yui_results($buildings);
- }
-
private function item_link(&$item, $key)
{
if(in_array($item['type'], array('allocation',
'booking', 'event')))
Modified: branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -1,5 +1,4 @@
<?php
-// phpgw::import_class('phpgwapi.uicommon_jquery');
phpgw::import_class('booking.uicommon');
class booking_uiorganization extends booking_uicommon
@@ -53,7 +52,9 @@
public function building_users()
{
if(!phpgw::get_var('phpgw_return_as') == 'json')
- { return;}
+ {
+ return;
+ }
if(($building_id = phpgw::get_var('building_id', 'int',
'REQUEST', null)))
{
@@ -71,9 +72,7 @@
{
return $this->query();
}
-// self::add_javascript('booking', 'booking',
'datatable.js');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('paginator');
+
$data = array(
'form' => array(
'toolbar' => array(
@@ -247,7 +246,6 @@
$activities =
$activities['results'];
$this->install_customer_identifier_ui($organization);
-// $this->use_yui_editor();
phpgwapi_jquery::init_ckeditor('field_description');
$this->add_template_helpers();
@@ -320,11 +318,8 @@
$activities = $activities['results'];
$this->install_customer_identifier_ui($organization);
-// $this->use_yui_editor();
phpgwapi_jquery::init_ckeditor('field_description');
-// $this->rich_text_editor('field-description');
-
$this->add_template_helpers();
self::render_template_xsl('organization_edit',
array('organization' => $organization,
"save_or_create_text" => "Save", "module" =>
$this->module, "contact_form_link" => $contact_form_link,
Modified: branches/dev-syncromind/booking/inc/class.uipermission.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uipermission.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uipermission.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -132,10 +132,6 @@
$this->redirect_to_parent_if_inline();
-// self::add_javascript('booking', 'booking',
'datatable.js');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('paginator');
-
$data = array(
'form' => array(
'toolbar' => array(
@@ -221,32 +217,6 @@
return $this->jquery_results($permissions);
}
-// public function index_json()
-// {
-// $this->db = $GLOBALS['phpgw']->db;
-//
-// $permissions = $this->bo->read();
-// foreach($permissions['results'] as &$permission)
-// {
-// $permission['link'] =
$this->get_object_typed_link('edit', array('id' => $permission['id']));
-// $permission['role'] =
lang(self::humanize($permission['role']));
-// #$permission['active'] = $permission['active']
? lang('Active') : lang('Inactive');
-//
-// $permission_actions = array();
-// if ($this->bo->allow_write($permission))
$permission_actions[] = $this->get_object_typed_link('edit', array('id' =>
$permission['id']));
-// if ($this->bo->allow_delete($permission))
$permission_actions[] = $this->get_object_typed_link('delete', array('id' =>
$permission['id']));
-//
-// $sql = "SELECT account_lastname,
account_firstname FROM phpgw_accounts WHERE account_lid =
'".$permission['subject_name']."'";
-// $this->db->query($sql);
-// while ($record =
array_shift($this->db->resultSet)) {
-// $permission['subject_name'] =
$record['account_firstname']." ".$record['account_lastname'];
-// }
-//
-// $permission['actions'] = $permission_actions;
-// }
-// return $this->yui_results($permissions);
-// }
-
public function index_accounts()
{
return booking_account_ui_utils::yui_accounts();
Modified: branches/dev-syncromind/booking/inc/class.uipermission_root.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uipermission_root.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uipermission_root.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -60,10 +60,6 @@
return $this->query();
}
-// self::add_javascript('booking', 'booking',
'datatable.js');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('paginator');
-
$data = array(
'form' => array(
'toolbar' => array(
@@ -136,27 +132,6 @@
return $this->jquery_results($permissions);
}
-// public function index_json()
-// {
-// $this->db = $GLOBALS['phpgw']->db;
-//
-// $permissions = $this->bo->read();
-// foreach($permissions['results'] as &$permission)
-// {
-// $permission['link'] =
$this->generate_link('edit', array('id' => $permission['id']));
-// #$permission['active'] = $permission['active']
? lang('Active') : lang('Inactive');
-// $permission['actions'] = array(
-// $this->generate_link('delete',
array('id' => $permission['id'])),
-// );
-//
-// $sql = "SELECT account_lastname,
account_firstname FROM phpgw_accounts WHERE account_lid =
'".$permission['subject_name']."'";
-// $this->db->query($sql);
-// while ($record =
array_shift($this->db->resultSet)) {
-// $permission['subject_name'] =
$record['account_firstname']." ".$record['account_lastname'];
-// }
-// }
-// return $this->yui_results($permissions);
-// }
public function index_accounts()
{
Modified: branches/dev-syncromind/booking/inc/class.uiresource.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiresource.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uiresource.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -50,9 +50,7 @@
{
return $this->query();
}
-// self::add_javascript('booking', 'booking',
'datatable.js');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('paginator');
+
$data = array(
'form' => array(
'toolbar' => array(
@@ -167,13 +165,11 @@
$this->flash_form_errors($errors);
self::add_javascript('booking', 'booking',
'resource_new.js');
phpgwapi_jquery::load_widget('autocomplete');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('autocomplete');
+
phpgwapi_jquery::init_ckeditor('field_description');
$activity_data =
$this->activity_bo->fetch_activities();
$resource['types'] =
$this->resource_types();
$resource['cancel_link'] =
self::link(array('menuaction' => 'booking.uiresource.index'));
-// $this->use_yui_editor();
$tabs = array();
$tabs['generic'] = array('label' =>
lang('Permission Edit'), 'link' => '#resource');
$active_tab = 'generic';
@@ -219,7 +215,6 @@
}
$this->flash_form_errors($errors);
self::add_javascript('booking', 'booking',
'resource_new.js');
-// phpgwapi_yui::load_widget('datatable');
phpgwapi_jquery::load_widget('autocomplete');
phpgwapi_jquery::init_ckeditor('field_description');
$activity_data = $this->activity_bo->fetch_activities();
@@ -227,7 +222,6 @@
{
$activity_data['results'][$acKey]['resource_id'] = $resource['activity_id'];
}
-// $this->use_yui_editor();
$tabs = array();
$tabs['generic'] = array('label' => lang('Permission
Edit'), 'link' => '#resource');
$active_tab = 'generic';
Modified: branches/dev-syncromind/booking/inc/class.uiseason.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiseason.inc.php 2015-12-13
16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uiseason.inc.php 2015-12-13
17:08:42 UTC (rev 14585)
@@ -50,9 +50,7 @@
{
return $this->query();
}
-// self::add_javascript('booking', 'booking',
'datatable.js');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('paginator');
+
$data = array(
'form' => array(
'toolbar' => array(
@@ -154,36 +152,6 @@
return $this->jquery_results($seasons);
}
-// public function index_json()
-// {
-// $seasons = $this->bo->read();
-// array_walk($seasons["results"], array($this,
"_add_links"), "booking.uiseason.show");
-//
-// foreach($seasons['results'] as &$season) {
-// $season['status'] = lang($season['status']);
-// $season['from_'] =
pretty_timestamp($season['from_']);
-// $season['to_'] =
pretty_timestamp($season['to_']);
-//
-// $resources =
$this->resource_bo->read_single($season['id']);
-// if (isset($season['resources'])) {
-// $filters['filters']['id'] =
$season['resources'];
-// $resources =
$this->resource_bo->so->read($filters);
-// $temparray = array();
-// foreach($resources['results'] as
$resource) {
-// $temparray[] =
$resource['name'];
-// }
-// $season['resource_list'] = implode(',
', $temparray);
-// }
-//
-// $sql = "SELECT account_lastname,
account_firstname FROM phpgw_accounts WHERE account_lid =
'".$season['officer_name']."'";
-// $this->db->query($sql);
-// while ($record =
array_shift($this->db->resultSet)) {
-// $season['officer_name'] =
$record['account_firstname']." ".$record['account_lastname'];
-// }
-// }
-// return $this->yui_results($seasons);
-// }
-
public function add()
{
$errors = array();
Modified: branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -140,7 +140,6 @@
)
);
self::render_template_xsl('datatable_jquery', $data);
-// self::render_template('datatable', $data);
}
public function query()
@@ -251,109 +250,6 @@
return $this->jquery_results($system_messages);
}
- public function index_json()
- {
- $this->db = & $GLOBALS['phpgw']->db;
-
- $current_user =
$this->current_account_id();
- $current_user_building_data = array();
- $sql =
"select object_id from bb_permission where subject_id=" . $current_user . " and
role='case_officer';";
- $this->db->query($sql);
- while($record
= array_shift($this->db->resultSet))
- {
- $current_user_building_data[] =
$record['object_id'];
- }
-
- $filters['building_id'] = $current_user_building_data;
-
- if(isset($_SESSION['showall']))
- {
- unset($filters['building_id']);
- }
- else
- {
- $filters['building_id'] =
$current_user_building_data;
- }
-
- $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('type', 'string',
'REQUEST');
- if($testdata2 != '')
- {
- $filters['type'] = phpgw::get_var('type',
'string', 'REQUEST');
- }
- else
- {
- unset($filters['type']);
- }
- $testdata2 = phpgw::get_var('status', 'string',
'REQUEST');
- if($testdata2 != '')
- {
- $filters['status'] = phpgw::get_var('status',
'string', 'REQUEST');
- }
- else
- {
- unset($filters['status']);
- }
-
- $params = array(
- 'start' =>
phpgw::get_var('startIndex', 'int', 'REQUEST', 0),
- 'results' => phpgw::get_var('results',
'int', 'REQUEST', null),
- 'query' => phpgw::get_var('query'),
- 'sort' => phpgw::get_var('sort'),
- 'dir' => phpgw::get_var('dir'),
- 'filters' => $filters
- );
-
- $system_messages = $this->bo->so->read($params);
- array_walk($system_messages["results"], array($this,
"_add_links"), $this->module . ".uisystem_message.show");
-
-
- foreach($system_messages['results'] as &$system_message)
- {
- $building_case_officers_data = array();
- $building_case_officers = array();
- $sql
= "SELECT account_id, account_lid, account_firstname, account_lastname FROM
phpgw_accounts WHERE account_id IN (SELECT subject_id FROM bb_permission WHERE
object_id=" . $system_message['building_id'] . " AND role='case_officer')";
- $this->db->query($sql);
- while($record
= array_shift($this->db->resultSet))
- {
- $building_case_officers_data[] =
array('account_id' => $record['account_id'],
- 'account_lid' =>
$record['account_lid'], 'account_name' => $record['account_firstname'] . " " .
$record['account_lastname']);
- $building_case_officers[]
= $record['account_id'];
- }
-
- $system_message['created']
= pretty_timestamp($system_message['created']);
- $system_message['type']
= lang($system_message['type']);
- $system_message['status']
= lang($system_message['status']);
- $system_message['modified']
= '';
- $system_message['activity_name'] = '';
- $system_message['contact_name'] =
$system_message['name'];
- $system_message['case_officer_name'] =
$for_case_officer_id;
- $system_message['what']
= $system_message['title'];
- if(strstr($system_message['what'], "%"))
- {
- $search
= array('%2C', '%C3%85', '%C3%A5', '%C3%98', '%C3%B8', '%C3%86',
- '%C3%A6');
- $replace
= array(',', 'Å', 'å', 'Ø', 'ø', 'Æ', 'æ');
- $system_message['what'] =
str_replace($search, $replace, $system_message['what']);
- }
-
- while($case_officer =
array_shift($building_case_officers_data))
- {
- if($system_message['case_officer_name']
= $case_officer['account_id'])
-
$system_message['case_officer_name'] = $case_officer['account_name'];
- }
- }
- return $this->yui_results($system_messages);
- }
-
public function edit()
{
$id = phpgw::get_var('id', 'int');
@@ -408,7 +304,6 @@
}
$this->flash_form_errors($errors);
-// $this->use_yui_editor();
phpgwapi_jquery::init_ckeditor('field-message');
$tabs = array();
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uiallocation.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uiallocation.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uiallocation.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -127,8 +127,6 @@
$allocation['to_'] =
pretty_timestamp($allocation['to_']);
$GLOBALS['phpgw']->jqcal->add_listener('field_repeat_until', 'date');
-// $this->use_yui_editor();
-
phpgwapi_jquery::init_ckeditor('field-message');
self::render_template_xsl('allocation_cancel',
array('allocation' => $allocation));
}
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -860,8 +860,6 @@
$allocation['cancel_link'] =
self::link(array('menuaction' => 'bookingfrontend.uibuilding.schedule',
'id' => $allocation['building_id']));
-// $this->use_yui_editor();
-
phpgwapi_jquery::init_ckeditor('field-message');
self::render_template_xsl('booking_cancel',
array('booking' => $booking));
}
Modified:
branches/dev-syncromind/bookingfrontend/inc/class.uicontactperson.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uicontactperson.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uicontactperson.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -31,11 +31,11 @@
if($id = phpgw::get_var('id', 'int'))
{
$person = $this->bo->read_single($id);
- return
$this->yui_results(array("totalResultsAvailable" => 1, "results" => $person));
+ return
$this->jquery_results(array("total_records" => 1, "results" => $person));
}
$persons = $this->bo->read();
array_walk($persons["results"], array($this,
"_add_links"), "bookingfrontend.uicontactperson.show");
- return $this->yui_results($persons);
+ return $this->jquery_results($persons);
}
}
\ No newline at end of file
Modified:
branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
2015-12-13 16:36:11 UTC (rev 14584)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
2015-12-13 17:08:42 UTC (rev 14585)
@@ -70,7 +70,6 @@
phpgwapi_jquery::formvalidator_generate(array('location', 'date', 'security',
'file'));
-// $this->use_yui_editor();
self::render_template_xsl('system_message',
array('system_message' => $system_message));
}
}
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14585] clean up from yui,
Sigurd Nes <=