[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13984] fixing forms toolbars
|
From: |
Saul |
|
Subject: |
[Fmsystem-commits] [13984] fixing forms toolbars |
|
Date: |
Tue, 22 Sep 2015 00:13:47 +0000 |
Revision: 13984
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13984
Author: psaul
Date: 2015-09-22 00:13:47 +0000 (Tue, 22 Sep 2015)
Log Message:
-----------
fixing forms toolbars
Modified Paths:
--------------
branches/dev-syncromind/booking/inc/class.socommon.inc.php
branches/dev-syncromind/booking/inc/class.uiaccount_code_set.inc.php
branches/dev-syncromind/booking/inc/class.uiagegroup.inc.php
branches/dev-syncromind/booking/inc/class.uiapplication.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_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.uidocumentation.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.uisend_email.inc.php
branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
branches/dev-syncromind/booking/js/booking/email_send.js
branches/dev-syncromind/booking/js/booking/permission_root.js
branches/dev-syncromind/booking/js/booking/season.js
branches/dev-syncromind/booking/templates/base/email_index.xsl
Modified: branches/dev-syncromind/booking/inc/class.socommon.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.socommon.inc.php 2015-09-21
20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/inc/class.socommon.inc.php 2015-09-22
00:13:47 UTC (rev 13984)
@@ -434,6 +434,7 @@
}
$base_sql = "SELECT $cols FROM $this->table_name $joins
WHERE $condition $order ";
+// echo $base_sql;exit();
if ($results)
{
Modified: branches/dev-syncromind/booking/inc/class.uiaccount_code_set.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiaccount_code_set.inc.php
2015-09-21 20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/inc/class.uiaccount_code_set.inc.php
2015-09-22 00:13:47 UTC (rev 13984)
@@ -62,9 +62,9 @@
$config->read();
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');
+// self::add_javascript('booking', 'booking',
'datatable.js');
+// phpgwapi_yui::load_widget('datatable');
+// phpgwapi_yui::load_widget('paginator');
$data = array(
'form' => array(
'toolbar' => array(
Modified: branches/dev-syncromind/booking/inc/class.uiagegroup.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiagegroup.inc.php
2015-09-21 20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/inc/class.uiagegroup.inc.php
2015-09-22 00:13:47 UTC (rev 13984)
@@ -56,10 +56,10 @@
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');
+// 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(
Modified: branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
2015-09-21 20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
2015-09-22 00:13:47 UTC (rev 13984)
@@ -233,9 +233,9 @@
if(phpgw::get_var('phpgw_return_as') == 'json') {
return $this->query();
}
- self::add_javascript('booking', 'booking',
'datatable.js');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('paginator');
+// self::add_javascript('booking', 'booking',
'datatable.js');
+// phpgwapi_yui::load_widget('datatable');
+// phpgwapi_yui::load_widget('paginator');
$data = array(
'form' => array(
Modified: branches/dev-syncromind/booking/inc/class.uiaudience.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiaudience.inc.php
2015-09-21 20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/inc/class.uiaudience.inc.php
2015-09-22 00:13:47 UTC (rev 13984)
@@ -71,10 +71,10 @@
}
- self::add_javascript('booking', 'booking',
'datatable.js');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('paginator');
- phpgwapi_yui::load_widget('treeview');
+// 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(
Modified: branches/dev-syncromind/booking/inc/class.uibooking.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uibooking.inc.php 2015-09-21
20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/inc/class.uibooking.inc.php 2015-09-22
00:13:47 UTC (rev 13984)
@@ -52,9 +52,10 @@
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');
+// 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(
'toolbar' => array(
@@ -139,6 +140,7 @@
public function query()
{
+
if(isset($_SESSION['showall']))
{
unset($filters['building_name']);
Modified: branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
2015-09-21 20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
2015-09-22 00:13:47 UTC (rev 13984)
@@ -69,9 +69,9 @@
if(phpgw::get_var('phpgw_return_as') == 'json') {
return $this->query();
}
- self::add_javascript('booking', 'booking',
'datatable.js');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('paginator');
+// self::add_javascript('booking', 'booking',
'datatable.js');
+// phpgwapi_yui::load_widget('datatable');
+// phpgwapi_yui::load_widget('paginator');
$data = array(
'form' => array(
'toolbar' => array(
Modified:
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export.inc.php
===================================================================
---
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export.inc.php
2015-09-21 20:04:36 UTC (rev 13983)
+++
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export.inc.php
2015-09-22 00:13:47 UTC (rev 13984)
@@ -89,19 +89,19 @@
$this->generate_files();
}
- $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',
'datatable.js');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('paginator');
+// 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' => 'date-picker',
+ 'type' =>
'date-picker',
'id' => 'to',
'name' => 'to',
'value' => '',
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-21 20:04:36 UTC (rev 13983)
+++
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export_file.inc.php
2015-09-22 00:13:47 UTC (rev 13984)
@@ -68,9 +68,9 @@
return $this->query();
}
- self::add_javascript('booking', 'booking',
'datatable.js');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('paginator');
+// self::add_javascript('booking', 'booking',
'datatable.js');
+// phpgwapi_yui::load_widget('datatable');
+// phpgwapi_yui::load_widget('paginator');
$data = array(
// 'form' => array(
// 'toolbar' => array(
Modified: branches/dev-syncromind/booking/inc/class.uidashboard.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uidashboard.inc.php
2015-09-21 20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/inc/class.uidashboard.inc.php
2015-09-22 00:13:47 UTC (rev 13984)
@@ -69,9 +69,10 @@
}
$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');
+// 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(
@@ -158,10 +159,15 @@
'key' => 'link',
'hidden' => true
)
+ ,
+ array(
+ 'key' => 'building',
+ 'hidden' => true
+ )
)
)
);
- self::render_template_xsl('datatable_jquery',$data);
+ self::render_template_xsl('datatable_jquery',$data);
// self::render_template('datatable', $data);
}
Modified: branches/dev-syncromind/booking/inc/class.uidocument.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uidocument.inc.php
2015-09-21 20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/inc/class.uidocument.inc.php
2015-09-22 00:13:47 UTC (rev 13984)
@@ -138,9 +138,9 @@
$this->redirect_to_parent_if_inline();
- self::add_javascript('booking', 'booking',
'datatable.js');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('paginator');
+// self::add_javascript('booking', 'booking',
'datatable.js');
+// phpgwapi_yui::load_widget('datatable');
+// phpgwapi_yui::load_widget('paginator');
$data = array(
'form' => array(
@@ -200,7 +200,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.uidocumentation.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uidocumentation.inc.php
2015-09-21 20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/inc/class.uidocumentation.inc.php
2015-09-22 00:13:47 UTC (rev 13984)
@@ -38,9 +38,9 @@
return $this->query();
}
- self::add_javascript('booking', 'booking',
'datatable.js');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('paginator');
+// self::add_javascript('booking', 'booking',
'datatable.js');
+// phpgwapi_yui::load_widget('datatable');
+// phpgwapi_yui::load_widget('paginator');
$data = array(
'form' => array(
Modified: branches/dev-syncromind/booking/inc/class.uievent.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uievent.inc.php 2015-09-21
20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/inc/class.uievent.inc.php 2015-09-22
00:13:47 UTC (rev 13984)
@@ -46,9 +46,9 @@
if(phpgw::get_var('phpgw_return_as') == 'json') {
return $this->query();
}
- self::add_javascript('booking', 'booking', 'datatable.js');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('paginator');
+// self::add_javascript('booking', 'booking', 'datatable.js');
+// phpgwapi_yui::load_widget('datatable');
+// phpgwapi_yui::load_widget('paginator');
$data = array(
'form' => array(
'toolbar' => array(
Modified: branches/dev-syncromind/booking/inc/class.uigroup.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uigroup.inc.php 2015-09-21
20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/inc/class.uigroup.inc.php 2015-09-22
00:13:47 UTC (rev 13984)
@@ -109,9 +109,9 @@
if(phpgw::get_var('phpgw_return_as') == 'json') {
return $this->query();
}
- self::add_javascript('booking', 'booking',
'datatable.js');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('paginator');
+// self::add_javascript('booking', 'booking',
'datatable.js');
+// phpgwapi_yui::load_widget('datatable');
+// phpgwapi_yui::load_widget('paginator');
$data = array(
'form' => array(
'toolbar' => array(
Modified: branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
2015-09-21 20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
2015-09-22 00:13:47 UTC (rev 13984)
@@ -35,9 +35,9 @@
if(phpgw::get_var('phpgw_return_as') == 'json') {
return $this->query();
}
- self::add_javascript('booking', 'booking',
'datatable.js');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('paginator');
+// self::add_javascript('booking', 'booking',
'datatable.js');
+// phpgwapi_yui::load_widget('datatable');
+// phpgwapi_yui::load_widget('paginator');
$data = array(
'form' => array(
'toolbar' => array(
Modified: branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
2015-09-21 20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
2015-09-22 00:13:47 UTC (rev 13984)
@@ -56,9 +56,9 @@
if(phpgw::get_var('phpgw_return_as') == 'json') {
return $this->query();
}
- self::add_javascript('booking', 'booking',
'datatable.js');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('paginator');
+// self::add_javascript('booking', 'booking',
'datatable.js');
+// phpgwapi_yui::load_widget('datatable');
+// phpgwapi_yui::load_widget('paginator');
$data = array(
'form' => array(
'toolbar' => array(
Modified: branches/dev-syncromind/booking/inc/class.uipermission.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uipermission.inc.php
2015-09-21 20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/inc/class.uipermission.inc.php
2015-09-22 00:13:47 UTC (rev 13984)
@@ -127,9 +127,9 @@
$this->redirect_to_parent_if_inline();
- self::add_javascript('booking', 'booking',
'datatable.js');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('paginator');
+// self::add_javascript('booking', 'booking',
'datatable.js');
+// phpgwapi_yui::load_widget('datatable');
+// phpgwapi_yui::load_widget('paginator');
$data = array(
'form' => array(
Modified: branches/dev-syncromind/booking/inc/class.uipermission_root.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uipermission_root.inc.php
2015-09-21 20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/inc/class.uipermission_root.inc.php
2015-09-22 00:13:47 UTC (rev 13984)
@@ -59,9 +59,9 @@
return $this->query();
}
- self::add_javascript('booking', 'booking',
'datatable.js');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('paginator');
+// self::add_javascript('booking', 'booking',
'datatable.js');
+// phpgwapi_yui::load_widget('datatable');
+// phpgwapi_yui::load_widget('paginator');
$data = array(
'form' => array(
@@ -182,7 +182,7 @@
// }
public function add()
- {
+ {
$errors = array();
$permission = array();
@@ -198,6 +198,7 @@
}
self::add_javascript('booking', 'booking',
'permission_root.js');
+ phpgwapi_jquery::load_widget('autocomplete');
$this->add_default_display_data($permission);
Modified: branches/dev-syncromind/booking/inc/class.uiresource.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiresource.inc.php
2015-09-21 20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/inc/class.uiresource.inc.php
2015-09-22 00:13:47 UTC (rev 13984)
@@ -38,9 +38,9 @@
if(phpgw::get_var('phpgw_return_as') == 'json') {
return $this->query();
}
- self::add_javascript('booking', 'booking',
'datatable.js');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('paginator');
+// self::add_javascript('booking', 'booking',
'datatable.js');
+// phpgwapi_yui::load_widget('datatable');
+// phpgwapi_yui::load_widget('paginator');
$data = array(
'form' => array(
'toolbar' => array(
Modified: branches/dev-syncromind/booking/inc/class.uiseason.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiseason.inc.php 2015-09-21
20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/inc/class.uiseason.inc.php 2015-09-22
00:13:47 UTC (rev 13984)
@@ -46,9 +46,9 @@
if(phpgw::get_var('phpgw_return_as') == 'json') {
return $this->query();
}
- self::add_javascript('booking', 'booking',
'datatable.js');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('paginator');
+// self::add_javascript('booking', 'booking',
'datatable.js');
+// phpgwapi_yui::load_widget('datatable');
+// phpgwapi_yui::load_widget('paginator');
$data = array(
'form' => array(
'toolbar' => array(
Modified: branches/dev-syncromind/booking/inc/class.uisend_email.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uisend_email.inc.php
2015-09-21 20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/inc/class.uisend_email.inc.php
2015-09-22 00:13:47 UTC (rev 13984)
@@ -73,6 +73,7 @@
$this->flash_form_errors($errors);
self::add_javascript('booking', 'booking',
'email_send.js');
+ phpgwapi_jquery::load_widget('autocomplete');
$tabs = array();
$tabs['generic'] = array('label' => lang('Building
Send'), 'link' => '#building');
Modified: branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
2015-09-21 20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
2015-09-22 00:13:47 UTC (rev 13984)
@@ -36,7 +36,8 @@
}
$GLOBALS['phpgw_info']['apps']['manual']['section'] =
'booking_manual';
- self::add_javascript('booking', 'booking',
'datatable.js');
+// self::add_javascript('booking', 'booking',
'datatable.js');
+ phpgwapi_jquery::load_widget('autocomplete');
phpgwapi_yui::load_widget('datatable');
phpgwapi_yui::load_widget('paginator');
Modified: branches/dev-syncromind/booking/js/booking/email_send.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/email_send.js 2015-09-21
20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/js/booking/email_send.js 2015-09-22
00:13:47 UTC (rev 13984)
@@ -1,19 +1,55 @@
-populateSeasonTable = function(building_id, selection) {
- YAHOO.booking.checkboxTableHelper('season_container',
'index.php?menuaction=booking.uiseason.index&sort=name&filter_building_id=' +
building_id + '&phpgw_return_as=json&',
- 'seasons[]', selection);
-}
+var building_id_selection = "";
-YAHOO.util.Event.addListener(window, "load", function() {
- var building_id = YAHOO.util.Dom.get('field_building_id').value;
- if(building_id) {
- populateSeasonTable(building_id, [YAHOO.booking.season_id * 1]);
+$(document).ready(function() {
+
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
+ 'field_building_name',
'field_building_id', 'building_container');
+});
+
+
+$(window).load(function(){
+ building_id = $('#field_building_id').val();
+ if (building_id) {
+ populateTableChkSeasons(building_id, []);
+ building_id_selection = building_id;
}
- var ac =
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
- 'field_building_name',
'field_building_id', 'building_container');
- // Update the season table as soon a new building is selected
- ac.itemSelectEvent.subscribe(function(sType, aArgs) {
- populateSeasonTable(aArgs[2].id, []);
+ $('#field_building_name').on('autocompleteselect', function(event, ui){
+ var building_id = ui.item.value;
+ var selection = [];
+ if (building_id != building_id_selection) {
+ populateTableChkSeasons(building_id, selection);
+ building_id_selection = building_id;
+ }
});
-
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uiorganization.index&phpgw_return_as=json&',
- 'field_org_name', 'field_org_id',
'org_container');
});
+
+function populateTableChkSeasons (building_id, selection) {
+ var url =
'index.php?menuaction=booking.uiseason.index&sort=name&filter_building_id=' +
building_id + '&phpgw_return_as=json&';
+ var container = 'season_container';
+ var colDefsSeasons = [{label: '', object: [{type: 'input', attrs: [{name:
'type', value: 'checkbox'},{name: 'name', value: 'seasons[]'}]}], value: 'id',
checked: selection}, {key: 'name', label: lang['Name']}];
+ populateTableChk(url, container, colDefsSeasons);
+}
+
+function populateTableChk (url, container, colDefs) {
+ createTable(container,url,colDefs);
+}
+
+//
+//populateSeasonTable = function(building_id, selection) {
+// YAHOO.booking.checkboxTableHelper('season_container',
'index.php?menuaction=booking.uiseason.index&sort=name&filter_building_id=' +
building_id + '&phpgw_return_as=json&',
+// 'seasons[]', selection);
+//}
+//
+//YAHOO.util.Event.addListener(window, "load", function() {
+// var building_id = YAHOO.util.Dom.get('field_building_id').value;
+// if(building_id) {
+// populateSeasonTable(building_id, [YAHOO.booking.season_id * 1]);
+// }
+// var ac =
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
+// 'field_building_name',
'field_building_id', 'building_container');
+// // Update the season table as soon a n ew building is selected
+// ac.itemSelectEvent.subscribe(function(sType, aArgs) {
+// populateSeasonTable(aArgs[2].id, []);
+// });
+//
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uiorganization.index&phpgw_return_as=json&',
+// 'field_org_name', 'field_org_id',
'org_container');
+//});
Modified: branches/dev-syncromind/booking/js/booking/permission_root.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/permission_root.js
2015-09-21 20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/js/booking/permission_root.js
2015-09-22 00:13:47 UTC (rev 13984)
@@ -1,4 +1,9 @@
-YAHOO.util.Event.addListener(window, "load", function() {
-
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uipermission_root.index_accounts&phpgw_return_as=json&',
- 'field_subject_name', 'field_subject_id',
'subject_container');
-});
\ No newline at end of file
+$(document).ready(function() {
+
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uipermission_root.index_accounts&phpgw_return_as=json&',
+ 'field_subject_name',
'field_subject_id', 'subject_container');
+});
+
+//YAHOO.util.Event.addListener(window, "load", function() {
+//
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uipermission_root.index_accounts&phpgw_return_as=json&',
+// 'field_subject_name',
'field_subject_id', 'subject_container');
+//});
\ No newline at end of file
Modified: branches/dev-syncromind/booking/js/booking/season.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/season.js 2015-09-21
20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/js/booking/season.js 2015-09-22
00:13:47 UTC (rev 13984)
@@ -25,7 +25,6 @@
});
function populateTableChkResources (building_id, selection) {
- console.log(selection);
var url =
'index.php?menuaction=booking.uiresource.index&sort=name&filter_building_id=' +
building_id + '&phpgw_return_as=json&';
var container = 'resources-container';
var colDefsResources = [{label: '', object: [{type: 'input', attrs:
[{name: 'type', value: 'checkbox'},{name: 'name', value: 'resources[]'}]}],
value: 'id', checked: selection},{key: 'name', label: lang['Name']}, {key:
'type', label: lang['Resource Type']}];
Modified: branches/dev-syncromind/booking/templates/base/email_index.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/email_index.xsl
2015-09-21 20:04:36 UTC (rev 13983)
+++ branches/dev-syncromind/booking/templates/base/email_index.xsl
2015-09-22 00:13:47 UTC (rev 13984)
@@ -25,10 +25,10 @@
</div-->
</div>
<div class="pure-control-group">
- <label>
+ <label style="vertical-align:top;">
<h4><xsl:value-of select="php:function('lang',
'Season')" /></h4>
</label>
- <!--div id="season_container"--><xsl:value-of
select="php:function('lang', 'Select a building first')" /><!--/div-->
+ <div id="season_container"
style="display:inline-block;"><xsl:value-of select="php:function('lang',
'Select a building first')" /></div>
</div>
<div class="pure-control-group">
<label for="field_mailsubject">
@@ -52,5 +52,8 @@
</input>
</div>
</form>
+ <script type="text/javascript">
+ var lang = <xsl:value-of select="php:function('js_lang', 'Name')"/>;
+ </script>
<!--/div-->
</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13984] fixing forms toolbars,
Saul <=