[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13968] fixing forms
|
From: |
Saul |
|
Subject: |
[Fmsystem-commits] [13968] fixing forms |
|
Date: |
Sat, 19 Sep 2015 00:17:03 +0000 |
Revision: 13968
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13968
Author: psaul
Date: 2015-09-19 00:17:02 +0000 (Sat, 19 Sep 2015)
Log Message:
-----------
fixing forms
Modified Paths:
--------------
branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
branches/dev-syncromind/booking/inc/class.uiapplication.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.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.uipermission.inc.php
branches/dev-syncromind/booking/inc/class.uiresource.inc.php
branches/dev-syncromind/booking/inc/class.uiseason.inc.php
branches/dev-syncromind/booking/js/booking/allocation.js
branches/dev-syncromind/booking/js/booking/application.js
branches/dev-syncromind/booking/js/booking/booking.js
branches/dev-syncromind/booking/js/booking/document.js
branches/dev-syncromind/booking/js/booking/event.js
branches/dev-syncromind/booking/js/booking/permission.js
branches/dev-syncromind/booking/js/booking/resource_new.js
branches/dev-syncromind/booking/js/booking/season.js
branches/dev-syncromind/booking/templates/base/allocation_delete.xsl
branches/dev-syncromind/booking/templates/base/application_edit.xsl
branches/dev-syncromind/booking/templates/base/application_new.xsl
branches/dev-syncromind/booking/templates/base/booking_delete.xsl
branches/dev-syncromind/booking/templates/base/booking_edit.xsl
branches/dev-syncromind/booking/templates/base/booking_new.xsl
branches/dev-syncromind/booking/templates/base/document_form.xsl
branches/dev-syncromind/booking/templates/base/event_edit.xsl
branches/dev-syncromind/booking/templates/base/event_new.xsl
branches/dev-syncromind/booking/templates/base/group_edit.xsl
branches/dev-syncromind/booking/templates/base/permission_form.xsl
branches/dev-syncromind/booking/templates/base/resource.xsl
branches/dev-syncromind/booking/templates/base/resource_form.xsl
branches/dev-syncromind/booking/templates/base/season_edit.xsl
branches/dev-syncromind/booking/templates/base/season_new.xsl
Modified: branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
2015-09-18 19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
2015-09-19 00:17:02 UTC (rev 13968)
@@ -596,7 +596,7 @@
$active_tab = 'generic';
$allocation['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
-
$GLOBALS['phpgw']->jqcal->add_listener('field_repeat_until', 'datetime');
+
$GLOBALS['phpgw']->jqcal->add_listener('field_repeat_until', 'date');
if ($step < 2)
{
Modified: branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
2015-09-18 19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
2015-09-19 00:17:02 UTC (rev 13968)
@@ -41,8 +41,8 @@
$this->assoc_bo = new
booking_boapplication_association();
$this->agegroup_bo = CreateObject('booking.boagegroup');
$this->resource_bo = CreateObject('booking.boresource');
- $this->building_bo = CreateObject('booking.bobuilding');
- $this->organization_bo = CreateObject('booking.boorganization');
+ $this->building_bo =
CreateObject('booking.bobuilding');
+ $this->organization_bo =
CreateObject('booking.boorganization');
$this->document_bo =
CreateObject('booking.bodocument_building');
self::set_active_menu('booking::applications');
$this->fields = array('description', 'equipment',
'resources', 'activity_id',
@@ -638,16 +638,16 @@
public function add()
{
- $config = CreateObject('phpgwapi.config','booking');
+ $config =
CreateObject('phpgwapi.config','booking');
$config->read();
- $orgnr = phpgwapi_cache::session_get($this->module,
self::ORGNR_SESSION_KEY);
- $application_text = $config->config_data;
+ $orgnr = phpgwapi_cache::session_get($this->module,
self::ORGNR_SESSION_KEY);
+ $application_text = $config->config_data;
$errors = array();
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
- $building = $this->building_bo->so->read(array('filters' =>
array('id' => phpgw::get_var('building_id', 'GET'))));
+ $building =
$this->building_bo->so->read(array('filters' => array('id' =>
phpgw::get_var('building_id', 'GET'))));
array_set_default($_POST, 'resources', array());
array_set_default($_POST, 'accepted_documents',
array());
@@ -687,9 +687,9 @@
$errors['agegroups'] =
lang('Agegroups can not be larger than 9999 peoples');
}
}
- if ($building['results'][0]['deactivate_application']) {
- $errors['application_deactivated'] = lang('Application on
this building is not possible.');
- }
+ if
($building['results'][0]['deactivate_application']) {
+ $errors['application_deactivated'] =
lang('Application on this building is not possible.');
+ }
if(!$errors)
{
@@ -702,7 +702,7 @@
$receipt = $this->bo->add($application);
$application['id'] = $receipt['id'];
$this->bo->send_notification($application, true);
- $this->bo->so->update_id_string();
+ $this->bo->so->update_id_string();
$this->flash(lang("Your application has
now been registered and a confirmation email has been sent to you.")."<br />".
lang("A Case
officer will review your application as soon as possible.")."<br />".
lang("Please
check your Spam Filter if you are missing mail."));
@@ -711,12 +711,12 @@
}
if(phpgw::get_var('resource', 'GET') == 'null')
{
- array_set_default($application, 'resources', array());
+ array_set_default($application, 'resources',
array());
}
else
{
- $resources = explode(",",phpgw::get_var('resource', 'GET'));
- array_set_default($application, 'resources', $resources);
+ $resources =
explode(",",phpgw::get_var('resource', 'GET'));
+ array_set_default($application, 'resources',
$resources);
}
array_set_default($application, 'building_id',
phpgw::get_var('building_id', 'GET'));
@@ -787,6 +787,7 @@
$active_tab = 'generic';
$application['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
+ self::add_javascript('booking', 'booking',
'application.js');
self::add_javascript('booking', 'booking',
'adddatetimepicker.js');
self::render_template_xsl('application_new',
array('application' => $application, 'activities' => $activities, 'agegroups'
=> $agegroups, 'audience' => $audience,'config' => $application_text));
@@ -797,7 +798,7 @@
$id = intval(phpgw::get_var('id', 'GET'));
$application = $this->bo->read_single($id);
-//
$this->check_application_assigned_to_current_user($application);
+
$this->check_application_assigned_to_current_user($application);
$building_info = $this->bo->so->get_building_info($id);
$application['building_id'] = $building_info['id'];
@@ -933,18 +934,18 @@
public function show()
{
- $config = CreateObject('phpgwapi.config','booking');
+ $config =
CreateObject('phpgwapi.config','booking');
$config->read();
$application_text = $config->config_data;
$id = intval(phpgw::get_var('id', 'GET'));
$application = $this->bo->read_single($id);
- $tabs = array();
+ $tabs = array();
$tabs['generic'] = array('label' =>
lang('Application'), 'link' => '#application');
$active_tab = 'generic';
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
- if($_POST['create'])
+ if($_POST['create'])
{
$this->redirect(array('menuaction' =>
$this->url_prefix . '.show', 'id'=>$application['id']));
}
@@ -1007,8 +1008,8 @@
$notify = true;
}
- $update AND $receipt = $this->bo->update($application);
- $notify AND $this->bo->send_notification($application);
+ $update AND $receipt =
$this->bo->update($application);
+ $notify AND
$this->bo->send_notification($application);
$this->redirect(array('menuaction' =>
$this->url_prefix . '.show', 'id'=>$application['id']));
}
@@ -1061,15 +1062,15 @@
else
$application['currentuser'] = false;
- $collision_dates = array();
- foreach($application['dates'] as &$date)
- {
- $collision =
$this->bo->so->check_collision($application['resources'], $date['from_'],
$date['to_']);
- if($collision) {
- $collision_dates[] = $date['from_'];
- }
- }
- $collision_dates = array("data" => implode(',',$collision_dates));
+ $collision_dates = array();
+ foreach($application['dates'] as &$date)
+ {
+ $collision =
$this->bo->so->check_collision($application['resources'], $date['from_'],
$date['to_']);
+ if($collision) {
+ $collision_dates[] = $date['from_'];
+ }
+ }
+ $collision_dates = array("data" =>
implode(',',$collision_dates));
self::check_date_availability($application);
// echo '<pre>';print_r($application); echo '</pre>';
// echo '<pre>';print_r($audience); echo '</pre>';
@@ -1079,7 +1080,7 @@
// echo '<pre>';print_r($collision_dates); echo '</pre>';
// echo '<pre>';print_r($comments); echo '</pre>';
// echo '<pre>';print_r($application_text); echo '</pre>';
- $application['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
+ $application['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
self::render_template_xsl('application',
array('application' => $application,
'audience' =>
$audience, 'agegroups' => $agegroups,
Modified: branches/dev-syncromind/booking/inc/class.uibooking.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uibooking.inc.php 2015-09-18
19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/inc/class.uibooking.inc.php 2015-09-19
00:17:02 UTC (rev 13968)
@@ -534,9 +534,9 @@
$tabs['generic'] = array('label' => lang('Booking
New'), 'link' => '#booking_new');
$active_tab = 'generic';
- $GLOBALS['phpgw']->jqcal->add_listener('start',
'datetime');
+ $GLOBALS['phpgw']->jqcal->add_listener('start',
'date');
$GLOBALS['phpgw']->jqcal->add_listener('start_date',
'datetime');
-
$GLOBALS['phpgw']->jqcal->add_listener('end_date', 'datetime');
+ $GLOBALS['phpgw']->jqcal->add_listener('end_date',
'datetime');
$booking['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
@@ -555,7 +555,7 @@
'date_from' => $time_from[0],
'date_to' => $time_to[0],
'application_id' => $application_id,
- 'noallocation' => $noallocation)
+ 'noallocation' => $noallocation)
);
}
@@ -576,7 +576,7 @@
'invalid_dates' => $invalid_dates,
'groups' => $groups,
'application_id' => $application_id,
- 'noallocation' => $noallocation)
+ 'noallocation' => $noallocation)
);
}
}
@@ -672,15 +672,15 @@
$field_interval =
intval(phpgw::get_var('field_interval', 'GET'));
$delete_allocation =
phpgw::get_var('delete_allocation', 'GET');
$booking = $this->bo->read_single($id);
- $allocation =
$this->allocation_bo->read_single($booking['allocation_id']);
- $season = $this->season_bo->read_single($booking['season_id']);
+ $allocation =
$this->allocation_bo->read_single($booking['allocation_id']);
+ $season =
$this->season_bo->read_single($booking['season_id']);
$step = phpgw::get_var('step', 'str', 'POST');
- if (! isset($step)) $step = 1;
- $errors = array();
+ if (! isset($step)) $step = 1;
+ $errors = array();
$invalid_dates = array();
$valid_dates = array();
- $allocation_delete = array();
- $allocation_keep = array();
+ $allocation_delete = array();
+ $allocation_keep = array();
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
@@ -688,126 +688,134 @@
$to_date = $_POST['to_'];
if ($_POST['recurring'] != 'on' &&
$_POST['outseason'] != 'on' )
- {
- if ($_POST['allocation_delete'] != 'on') {
- $this->bo->so->delete_booking($id);
- $this->redirect(array('menuaction' =>
'booking.uimassbooking.schedule', 'id'=>$booking['building_id']));
- }
- else
- {
- $allocation_id = $booking['allocation_id'];
- $this->bo->so->delete_booking($id);
- $err =
$this->allocation_bo->so->check_for_booking($allocation_id);
- if ($err)
- {
- $errors['booking'] = lang('Could not delete
allocation due to a booking still use it');
- }
- else
- {
- $err =
$this->allocation_bo->so->delete_allocation($allocation_id);
- $this->redirect(array('menuaction' =>
'booking.uimassbooking.schedule', 'id'=>$booking['building_id']));
- }
- }
- }
- else
- {
- $step++;
- if ($_POST['recurring'] == 'on') {
- $repeat_until =
strtotime($_POST['repeat_until'])+60*60*24;
- }
- else
- {
- $repeat_until =
strtotime($season['to_'])+60*60*24;
- $_POST['repeat_until'] =
$season['to_'];
- }
+ {
+ if ($_POST['allocation_delete'] !=
'on') {
+
$this->bo->so->delete_booking($id);
+
$this->redirect(array('menuaction' => 'booking.uimassbooking.schedule',
'id'=>$booking['building_id']));
+ }
+ else
+ {
+ $allocation_id =
$booking['allocation_id'];
+
$this->bo->so->delete_booking($id);
+ $err =
$this->allocation_bo->so->check_for_booking($allocation_id);
+ if ($err)
+ {
+ $errors['booking'] =
lang('Could not delete allocation due to a booking still use it');
+ }
+ else
+ {
+ $err =
$this->allocation_bo->so->delete_allocation($allocation_id);
+
$this->redirect(array('menuaction' => 'booking.uimassbooking.schedule',
'id'=>$booking['building_id']));
+ }
+ }
+ }
+ else
+ {
+ $step++;
+ if ($_POST['recurring'] == 'on') {
+ $repeat_until =
strtotime($_POST['repeat_until'])+60*60*24;
+ }
+ else
+ {
+ $repeat_until =
strtotime($season['to_'])+60*60*24;
+ $_POST['repeat_until'] =
$season['to_'];
+ }
- $max_dato = strtotime($_POST['to_']);
// highest date from input
- $interval =
$_POST['field_interval']*60*60*24*7; // weeks in seconds
- $i = 0;
- // calculating valid and invalid dates
from the first booking's to-date to the repeat_until date is reached
- // the form from step 1 should validate
and if we encounter any errors they are caused by double bookings.
+ $max_dato = strtotime($_POST['to_']);
// highest date from input
+ $interval =
$_POST['field_interval']*60*60*24*7; // weeks in seconds
+ $i = 0;
+ // calculating valid and invalid dates
from the first booking's to-date to the repeat_until date is reached
+ // the form from step 1 should
validate and if we encounter any errors they are caused by double bookings.
- while (($max_dato+($interval*$i)) <=
$repeat_until)
- {
- $fromdate = date('Y-m-d H:i',
strtotime($_POST['from_']) + ($interval*$i));
- $todate = date('Y-m-d H:i',
strtotime($_POST['to_']) + ($interval*$i));
- $booking['from_'] = $fromdate;
- $booking['to_'] = $todate;
+ while (($max_dato+($interval*$i)) <=
$repeat_until)
+ {
+ $fromdate = date('Y-m-d H:i',
strtotime($_POST['from_']) + ($interval*$i));
+ $todate = date('Y-m-d H:i',
strtotime($_POST['to_']) + ($interval*$i));
+ $booking['from_'] = $fromdate;
+ $booking['to_'] = $todate;
- $id = $this->bo->so->get_booking_id($booking);
- if($id) {
- $aid = $this->bo->so->check_allocation($id);
- } else {
- $aid = $this->bo->so->check_for_booking($booking);
- }
-
- if ($id)
- {
-
$valid_dates[$i]['from_'] = $fromdate;
- $valid_dates[$i]['to_']
= $todate;
- if ($step == 3)
- {
- $stat = $this->bo->so->delete_booking($id);
- }
- }
- if ($_POST['delete_allocation'] == 'on')
{
- if (!$aid)
- {
-
$allocation_keep[$i]['from_'] = $fromdate;
-
$allocation_keep[$i]['to_'] = $todate;
- }
- else
- {
-
$allocation_delete[$i]['from_'] = $fromdate;
-
$allocation_delete[$i]['to_'] = $todate;
- if ($step == 3)
- {
- $stat =
$this->bo->so->delete_allocation($aid);
- }
- }
- }
- $i++;
- }
- if ($step == 3)
- {
-
$this->redirect(array('menuaction' => 'booking.uimassbooking.schedule',
'id'=>$allocation['building_id']));
- }
- }
+ $id =
$this->bo->so->get_booking_id($booking);
+ if($id) {
+ $aid =
$this->bo->so->check_allocation($id);
+ } else {
+ $aid =
$this->bo->so->check_for_booking($booking);
+ }
+
+ if ($id)
+ {
+
$valid_dates[$i]['from_'] = $fromdate;
+
$valid_dates[$i]['to_'] = $todate;
+ if ($step == 3)
+ {
+ $stat =
$this->bo->so->delete_booking($id);
+ }
+ }
+ if
($_POST['delete_allocation'] == 'on') {
+ if (!$aid)
+ {
+
$allocation_keep[$i]['from_'] = $fromdate;
+
$allocation_keep[$i]['to_'] = $todate;
+ }
+ else
+ {
+
$allocation_delete[$i]['from_'] = $fromdate;
+
$allocation_delete[$i]['to_'] = $todate;
+ if ($step == 3)
+ {
+ $stat
= $this->bo->so->delete_allocation($aid);
+ }
+ }
+ }
+ $i++;
+ }
+ if ($step == 3)
+ {
+
$this->redirect(array('menuaction' => 'booking.uimassbooking.schedule',
'id'=>$allocation['building_id']));
+ }
+ }
}
$this->flash_form_errors($errors);
+ phpgwapi_jquery::load_widget('autocomplete');
self::add_javascript('booking', 'booking',
'booking.js');
$booking['resources_json'] =
json_encode(array_map('intval', $booking['resources']));
$booking['cancel_link'] = self::link(array('menuaction'
=> 'booking.uibooking.show', 'id' => $booking['id']));
$booking['booking_link'] =
self::link(array('menuaction' => 'booking.uibooking.show', 'id' =>
$booking['id']));
-
+
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Booking
Delete'), 'link' => '#booking_delete');
+ $active_tab = 'generic';
+ $booking['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
+
+
$GLOBALS['phpgw']->jqcal->add_listener('field_repeat_until', 'date');
+
if ($step < 2)
- {
- self::render_template('booking_delete', array('booking'
=> $booking,
- 'recurring' => $recurring,
- 'outseason' => $outseason,
- 'interval' => $field_interval,
- 'repeat_until' => $repeat_until,
- 'delete_allocation' => $delete_allocation,
- ));
- }
+ {
+ self::render_template('booking_delete',
array('booking' => $booking,
+ 'recurring' => $recurring,
+ 'outseason' => $outseason,
+ 'interval' => $field_interval,
+ 'repeat_until' => $repeat_until,
+ 'delete_allocation' =>
$delete_allocation,
+ ));
+ }
elseif ($step == 2)
- {
- self::render_template('booking_delete_preview',
array('booking' => $booking,
- 'step' => $step,
- 'recurring' => $_POST['recurring'],
- 'outseason' => $_POST['outseason'],
- 'interval' => $_POST['field_interval'],
- 'repeat_until' =>
$_POST['repeat_until'],
- 'from_date' => $from_date,
- 'to_date' => $to_date,
- 'delete_allocation' => $_POST['delete_allocation'],
- 'allocation_keep' => $allocation_keep,
- 'allocation_delete' =>
$allocation_delete,
- 'valid_dates' => $valid_dates,
- 'invalid_dates' => $invalid_dates
- ));
- }
+ {
+
self::render_template('booking_delete_preview', array('booking' => $booking,
+ 'step' => $step,
+ 'recurring' => $_POST['recurring'],
+ 'outseason' => $_POST['outseason'],
+ 'interval' => $_POST['field_interval'],
+ 'repeat_until' =>
$_POST['repeat_until'],
+ 'from_date' => $from_date,
+ 'to_date' => $to_date,
+ 'delete_allocation' =>
$_POST['delete_allocation'],
+ 'allocation_keep' => $allocation_keep,
+ 'allocation_delete' =>
$allocation_delete,
+ 'valid_dates' => $valid_dates,
+ 'invalid_dates' => $invalid_dates
+ ));
+ }
}
public function show()
Modified: branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
2015-09-18 19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
2015-09-19 00:17:02 UTC (rev 13968)
@@ -163,8 +163,7 @@
$building['cancel_link'] =
self::link(array('menuaction' => 'booking.uibuilding.index'));
// $this->use_yui_editor();
- $GLOBALS['phpgw']->jqcal->add_listener('start_date',
'datetime');
- $GLOBALS['phpgw']->jqcal->add_listener('end_date',
'datetime');
+ phpgwapi_jquery::load_widget('autocomplete');
$tabs = array();
$tabs['generic'] = array('label' => lang('Building
New'), 'link' => '#building_form');
@@ -206,6 +205,9 @@
}
$this->flash_form_errors($errors);
// $this->use_yui_editor();
+
+ phpgwapi_jquery::load_widget('autocomplete');
+
$tabs = array();
$tabs['generic'] = array('label' => lang('Building
Edit'), 'link' => '#building_form');
$active_tab = 'generic';
Modified: branches/dev-syncromind/booking/inc/class.uidocument.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uidocument.inc.php
2015-09-18 19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/inc/class.uidocument.inc.php
2015-09-19 00:17:02 UTC (rev 13968)
@@ -337,6 +337,7 @@
}
self::add_javascript('booking', 'booking',
'document.js');
+ phpgwapi_jquery::load_widget('autocomplete');
$this->add_default_display_data($document);
@@ -380,17 +381,18 @@
}
self::add_javascript('booking', 'booking',
'document.js');
+ phpgwapi_jquery::load_widget('autocomplete');
$this->add_default_display_data($document);
$this->flash_form_errors($errors);
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Document Edit'), 'link'
=> '#document');
- $active_tab = 'generic';
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Document
Edit'), 'link' => '#document');
+ $active_tab = 'generic';
+
+ $document['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- $document['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
-
self::render_template_xsl('document_form',
array('document' => $document));
}
Modified: branches/dev-syncromind/booking/inc/class.uievent.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uievent.inc.php 2015-09-18
19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/inc/class.uievent.inc.php 2015-09-19
00:17:02 UTC (rev 13968)
@@ -12,7 +12,7 @@
public $public_functions = array
(
'index' => true,
- 'query' => true,
+ 'query' => true,
'add' => true,
'edit' => true,
'delete' => true,
@@ -508,7 +508,7 @@
$this->flash_form_errors($errors);
}
-// self::add_javascript('booking', 'booking', 'event.js');
+ self::add_javascript('booking', 'booking', 'event.js');
array_set_default($event, 'resources', array());
$event['resources_json'] = json_encode(array_map('intval',
$event['resources']));
$event['cancel_link'] = self::link(array('menuaction' =>
'booking.uievent.index'));
@@ -522,16 +522,16 @@
$this->install_customer_identifier_ui($event);
- $GLOBALS['phpgw']->jqcal->add_listener('start_date', 'datetime');
- $GLOBALS['phpgw']->jqcal->add_listener('end_date', 'datetime');
+ $GLOBALS['phpgw']->jqcal->add_listener('start_date',
'datetime');
+ $GLOBALS['phpgw']->jqcal->add_listener('end_date', 'datetime');
+
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Event New'), 'link'
=> '#event_new');
+ $active_tab = 'generic';
+
+ $event['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
+ self::add_javascript('booking', 'booking',
'adddatetimepicker.js');
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Event New'), 'link' =>
'#event_new');
- $active_tab = 'generic';
-
- $event['tabs'] = phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- self::add_javascript('booking', 'booking', 'adddatetimepicker.js');
-
$this->add_template_helpers();
self::render_template_xsl('event_new', array('event' => $event,
'activities' => $activities, 'agegroups' => $agegroups, 'audience' =>
$audience));
}
Modified: branches/dev-syncromind/booking/inc/class.uigroup.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uigroup.inc.php 2015-09-18
19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/inc/class.uigroup.inc.php 2015-09-19
00:17:02 UTC (rev 13968)
@@ -316,6 +316,8 @@
// $this->use_yui_editor();
$activities = $this->activity_bo->fetch_activities();
$activities = $activities['results'];
+
+ phpgwapi_jquery::load_widget('autocomplete');
$tabs = array();
$tabs['generic'] = array('label' => lang('Group
Edit'), 'link' => '#group_edit');
Modified: branches/dev-syncromind/booking/inc/class.uipermission.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uipermission.inc.php
2015-09-18 19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/inc/class.uipermission.inc.php
2015-09-19 00:17:02 UTC (rev 13968)
@@ -271,7 +271,7 @@
}
public function add()
- {
+ {
$errors = array();
$permission = array();
@@ -292,6 +292,7 @@
}
self::add_javascript('booking', 'booking',
'permission.js');
+ phpgwapi_jquery::load_widget('autocomplete');
$this->add_default_display_data($permission);
@@ -335,17 +336,18 @@
}
self::add_javascript('booking', 'booking',
'permission.js');
+ phpgwapi_jquery::load_widget('autocomplete');
$this->add_default_display_data($permission);
$this->flash_form_errors($errors);
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Permission Edit'),
'link' => '#permission');
- $active_tab = 'generic';
-
- $permission['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Permission
Edit'), 'link' => '#permission');
+ $active_tab = 'generic';
+ $permission['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
+
self::render_template_xsl('permission_form',
array('permission' => $permission));
}
Modified: branches/dev-syncromind/booking/inc/class.uiresource.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiresource.inc.php
2015-09-18 19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/inc/class.uiresource.inc.php
2015-09-19 00:17:02 UTC (rev 13968)
@@ -150,6 +150,7 @@
}
$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');
$activity_data = $this->activity_bo->fetch_activities();
@@ -195,20 +196,20 @@
}
$this->flash_form_errors($errors);
self::add_javascript('booking', 'booking',
'resource_new.js');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('autocomplete');
+// phpgwapi_yui::load_widget('datatable');
+ phpgwapi_jquery::load_widget('autocomplete');
$activity_data = $this->activity_bo->fetch_activities();
foreach($activity_data['results'] as $acKey => $acValue)
{
$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';
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Permission
Edit'), 'link' => '#resource');
+ $active_tab = 'generic';
+
+ $resource['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- $resource['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
-
self::render_template_xsl('resource_form',
array('resource' => $resource, 'activitydata' => $activity_data));
}
Modified: branches/dev-syncromind/booking/inc/class.uiseason.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiseason.inc.php 2015-09-18
19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/inc/class.uiseason.inc.php 2015-09-19
00:17:02 UTC (rev 13968)
@@ -11,7 +11,7 @@
public $public_functions = array
(
'index' => true,
- 'query' => true,
+ 'query' => true,
'add' => true,
'show' => true,
'edit' => true,
@@ -214,8 +214,8 @@
$season['resources_json'] =
json_encode(array_map('intval', $season['resources']));
$season['cancel_link'] = self::link(array('menuaction'
=> 'booking.uiseason.index'));
- $GLOBALS['phpgw']->jqcal->add_listener('start_date',
'datetime');
- $GLOBALS['phpgw']->jqcal->add_listener('end_date',
'datetime');
+ $GLOBALS['phpgw']->jqcal->add_listener('start_date',
'date');
+ $GLOBALS['phpgw']->jqcal->add_listener('end_date',
'date');
$tabs = array();
$tabs['generic'] = array('label' => lang('Season
New'), 'link' => '#season_new');
Modified: branches/dev-syncromind/booking/js/booking/allocation.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/allocation.js 2015-09-18
19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/js/booking/allocation.js 2015-09-19
00:17:02 UTC (rev 13968)
@@ -20,8 +20,8 @@
$("#field_building_name").on("autocompleteselect", function(event, ui){
var building_id = ui.item.value;
if (building_id != building_id_selection){
- populateSelectSeason(building_id, season_id);
- populateTableChkResources(building_id, initialSelection);
+ populateSelectSeason(building_id, '');
+ populateTableChkResources(building_id, []);
building_id_selection = building_id;
}
});
@@ -42,27 +42,8 @@
function populateTableChk (url, container, colDefs) {
createTable(container,url,colDefs);
}
-function populateSelect (url, selection, container) {
- container.html("");
- var select = document.createElement('select');
- var option = document.createElement('option');
- container.append(select);
- option.setAttribute('value', '');
- option.text = '-----';
- select.appendChild(option);
- $.get(url, function(r){
- $.each(r.data, function(index, value){
- var option = document.createElement('option');
- option.text = value.name;
- option.setAttribute('value', value.id);
- if(value.id == selection) {
- option.selected = true;
- }
- select.appendChild(option);
- });
- });
-}
+
/*
populateSeasonTable = function(building_id, selection) {
YAHOO.booking.radioTableHelper('season_container',
'index.php?menuaction=booking.uiseason.index&sort=name&filter_building_id=' +
building_id + '&phpgw_return_as=json&',
Modified: branches/dev-syncromind/booking/js/booking/application.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/application.js 2015-09-18
19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/js/booking/application.js 2015-09-19
00:17:02 UTC (rev 13968)
@@ -1,38 +1,41 @@
var building_id_selection = "";
var regulations_select_all = "";
+
$(document).ready(function() {
JqueryPortico.autocompleteHelper('index.php?menuaction=bookingfrontend.uibuilding.index&phpgw_return_as=json&',
'field_building_name',
'field_building_id', 'building_container');
});
-
-
-
$(window).load(function(){
building_id = $('#field_building_id').val();
regulations_select_all = initialAcceptAllTerms;
+ resources = initialSelection;
if (building_id) {
populateTableChkResources(building_id, initialSelection);
- populateTableChkRegulations(building_id, initialDocumentSelection);
+ populateTableChkRegulations(building_id, initialDocumentSelection,
resources);
building_id_selection = building_id;
}
$("#field_building_name").on("autocompleteselect", function(event, ui){
var building_id = ui.item.value;
+ var selection = [];
+ var resources = [];
if (building_id != building_id_selection){
populateTableChkResources(building_id, initialSelection);
- populateTableChkRegulations(building_id, initialDocumentSelection);
+ populateTableChkRegulations(building_id, selection, resources);
building_id_selection = building_id;
}
});
- $('#resources_container').on('click', '.chkRegulations', function(){
- if($(this).is(':checked')) {
- alert("Está activado, id: " + $(this).val());
- }
+ $('#resources_container').on('change', '.chkRegulations', function(){
+ var resources = new Array();
+ $('#resources_container
input.chkRegulations[name="resources[]"]:checked').each(function() {
+ resources.push($(this).val());
+ });
+ var selection = [];
+ populateTableChkRegulations(building_id_selection, selection,
resources);
});
});
-
function populateTableChkResources (building_id, selection) {
var url =
'index.php?menuaction=bookingfrontend.uiresource.index_json&sort=name&filter_building_id='
+ building_id + '&phpgw_return_as=json&';
var container = 'resources_container';
@@ -40,13 +43,19 @@
populateTableResources(url, container, colDefsResources);
}
-function populateTableChkRegulations (building_id, selection) {
+function populateTableChkRegulations (building_id, selection, resources) {
+ console.log(selection);
+ console.log(resources);
var url =
'index.php?menuaction=booking.uidocument_view.regulations&sort=name&phpgw_return_as=json&owner[]=building::'+building_id;
+ for(var r in resources) {
+ url += '&owner[]=resource::'+resources[r];
+ }
var container = 'regulation_documents';
var colDefsRegulations = [{label: lang['Accepted'], object: [{type:
'input', attrs: [{name: 'type', value: 'checkbox'},{name: 'name', value:
'resources[]'}]}], value: 'id', checked: selection},{key: 'name',label:
lang['Document'],formatter: genericLink}];
if (regulations_select_all){
colDefsRegulations[0]['object'][0]['attrs'].push({name:'checked',value:
'checked'});
}
+ regulations_select_all = false;
populateTableRegulations(url, container, colDefsRegulations);
}
@@ -60,7 +69,6 @@
-
/*
YAHOO.booking.RegulationsTable = function() {
this.building_id = null;
Modified: branches/dev-syncromind/booking/js/booking/booking.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/booking.js 2015-09-18
19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/js/booking/booking.js 2015-09-19
00:17:02 UTC (rev 13968)
@@ -1,3 +1,71 @@
+var building_id_selection = "";
+var organization_id_selection = "";
+$(document).ready(function() {
+
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
+ 'field_building_name',
'field_building_id', 'building_container');
+
+
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uiorganization.index&phpgw_return_as=json&',
+ 'field_org_name', 'field_org_id',
'org_container');
+
+
+});
+
+
+$(window).load(function() {
+ var building_id = $('#field_building_id').val();
+ var organization_id = $('#field_org_id').val();
+ if(building_id) {
+ populateSelectSeason(building_id, season_id);
+ populateTableChkResources(building_id, initialSelection);
+ building_id_selection = building_id;
+ }
+ if (organization_id) {
+ populateSelectGroup(organization_id, group_id);
+ organization_id_selection = organization_id;
+ }
+ $("#field_building_name").on("autocompleteselect", function(event, ui){
+ var building_id = ui.item.value;
+ if (building_id != building_id_selection){
+ populateSelectSeason(building_id, '');
+ populateTableChkResources(building_id, []);
+ building_id_selection = building_id;
+ }
+ });
+ $('#field_org_name').on('autocompleteselect', function(event, ui){
+ var organization_id = ui.item.value;
+ if (organization_id != organization_id_selection) {
+ populateSelectGroup(organization_id, '');
+ organization_id_selection = organization_id;
+ }
+ });
+});
+
+function populateSelectSeason (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');
+ populateSelect(url, selection, container);
+}
+function populateSelectGroup (organization_id, selection) {
+ var url =
'index.php?menuaction=booking.uigroup.index&filter_organization_id=' +
organization_id + '&phpgw_return_as=json';
+ var container = $('#group_container');
+ populateSelect(url, selection, container);
+};
+function populateTableChkResources (building_id, 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']}];
+ populateTableChk(url, container, colDefsResources);
+}
+
+function populateTableChk (url, container, colDefs) {
+ createTable(container,url,colDefs);
+}
+
+
+
+
+
+/*
populateSeasonTable = function(building_id, selection) {
YAHOO.booking.radioTableHelper('season_container',
'index.php?menuaction=booking.uiseason.index&sort=name&filter_building_id=' +
building_id + '&phpgw_return_as=json&',
'season_id', selection);
@@ -100,3 +168,4 @@
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uigroup.index&phpgw_return_as=json&',
'field_group_name', 'field_group_id',
'group_container');
});
+*/
\ No newline at end of file
Modified: branches/dev-syncromind/booking/js/booking/document.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/document.js 2015-09-18
19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/js/booking/document.js 2015-09-19
00:17:02 UTC (rev 13968)
@@ -1,9 +1,20 @@
-YAHOO.util.Event.addListener(window, "load", function() {
- var ownerType = YAHOO.booking.documentOwnerType;
-
- if (YAHOO.booking.documentOwnerAutocomplete) {
+var ownerType = "";
+$(document).ready(function() {
+ var ownerType = documentOwnerType;
+ if (documentOwnerAutocomplete) {
label_attr = ownerType == 'resource' ? 'full_name' : 'name';
-
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.ui'+ownerType+'.index&phpgw_return_as=json&',
+
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.ui'+ownerType+'.index&phpgw_return_as=json&',
'field_owner_name', 'field_owner_id',
'owner_container', label_attr);
}
-});
\ No newline at end of file
+});
+
+
+//YAHOO.util.Event.addListener(window, "load", function() {
+// var ownerType = YAHOO.booking.documentOwnerType;
+//
+// if (YAHOO.booking.documentOwnerAutocomplete) {
+// label_attr = ownerType == 'resource' ? 'full_name' : 'name';
+//
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.ui'+ownerType+'.index&phpgw_return_as=json&',
+// 'field_owner_name',
'field_owner_id', 'owner_container', label_attr);
+// }
+//});
\ No newline at end of file
Modified: branches/dev-syncromind/booking/js/booking/event.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/event.js 2015-09-18 19:13:22 UTC
(rev 13967)
+++ branches/dev-syncromind/booking/js/booking/event.js 2015-09-19 00:17:02 UTC
(rev 13968)
@@ -1,3 +1,43 @@
+var building_id_selection = "";
+$(document).ready(function() {
+
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
+ 'field_building_name',
'field_building_id', 'building_container');
+
+
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uiorganization.index&phpgw_return_as=json&',
+ 'field_org_name', 'field_org_id',
'org_container');
+
+
+});
+
+$(window).load(function() {
+ var building_id = $('#field_building_id').val();
+ if(building_id) {
+ populateTableChkResources(building_id, initialSelection);
+ building_id_selection = building_id;
+ }
+ $("#field_building_name").on("autocompleteselect", function(event, ui){
+ var building_id = ui.item.value;
+ if (building_id != building_id_selection){
+ populateTableChkResources(building_id, []);
+ building_id_selection = building_id;
+ }
+ });
+});
+
+function populateTableChkResources (building_id, 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']}];
+ populateTableChk(url, container, colDefsResources);
+}
+
+function populateTableChk (url, container, colDefs) {
+ createTable(container,url,colDefs);
+}
+
+
+/*
+
populateResourceTable = function(building_id, selection) {
YAHOO.booking.checkboxTableHelper('resources_container',
'index.php?menuaction=booking.uiresource.index&sort=name&filter_building_id=' +
building_id + '&phpgw_return_as=json&',
'resources[]', selection, {additional_fields: [{key: 'type', label:
lang['Resource Type']}]});
@@ -57,3 +97,4 @@
});
+*/
\ No newline at end of file
Modified: branches/dev-syncromind/booking/js/booking/permission.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/permission.js 2015-09-18
19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/js/booking/permission.js 2015-09-19
00:17:02 UTC (rev 13968)
@@ -1,12 +1,24 @@
-YAHOO.util.Event.addListener(window, "load", function() {
- var objectType = YAHOO.booking.objectType;
-
- if (YAHOO.booking.objectAutocomplete) {
- label_attr = objectType == 'resource' ? 'full_name' : 'name';
-
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.ui'+objectType+'.index&phpgw_return_as=json&',
- 'field_object_name',
'field_object_id', 'object_container', label_attr);
- }
-
-
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uipermission_'+objectType+'.index_accounts&phpgw_return_as=json&',
- 'field_subject_name', 'field_subject_id',
'subject_container');
-});
\ No newline at end of file
+var objectType = "";
+$(document).ready(function() {
+ if (objectAutocomplete){
+ label_attr = objectType == 'resource' ? 'full_name' : 'name';
+
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.ui'+objectType+'.index&phpgw_return_as=json&',
+ 'field_object_name', 'field_object_id',
'object_container', label_attr);
+ }
+
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uipermission_'+objectType+'.index_accounts&phpgw_return_as=json&',
+ 'field_subject_name',
'field_subject_id', 'subject_container');
+});
+
+
+////YAHOO.util.Event.addListener(window, "load", function() {
+// var objectType = YAHOO.booking.objectType;
+//
+// if (YAHOO.booking.objectAutocomplete) {
+// label_attr = objectType == 'resource' ? 'full_name' : 'name';
+//
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.ui'+objectType+'.index&phpgw_return_as=json&',
+// 'field_object_name',
'field_object_id', 'object_container', label_attr);
+// }
+//
+//
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uipermission_'+objectType+'.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/resource_new.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/resource_new.js 2015-09-18
19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/js/booking/resource_new.js 2015-09-19
00:17:02 UTC (rev 13968)
@@ -1,3 +1,9 @@
+$(document).ready(function() {
+
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
+ 'field_building_name',
'field_building_id', 'building_container');
+});
+
+/*
YAHOO.util.Event.addListener(window, "load", function() {
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
'field_building_name',
'field_building_id', 'building_container');
@@ -2 +8,2 @@
});
+*/
\ 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-18
19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/js/booking/season.js 2015-09-19
00:17:02 UTC (rev 13968)
@@ -1,3 +1,44 @@
+var building_id_selection = "";
+var regulations_select_all = "";
+
+$(document).ready(function() {
+
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uipermission_root.index_accounts&phpgw_return_as=json&',
+ 'field_officer_name',
'field_officer_id', 'officer_container');
+
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) {
+ populateTableChkResources(building_id, initialSelection);
+ building_id_selection = building_id;
+ }
+ $("#field_building_name").on("autocompleteselect", function(event, ui){
+ var building_id = ui.item.value;
+ var selection = [];
+ if (building_id != building_id_selection){
+ populateTableChkResources(building_id, selection);
+ building_id_selection = building_id;
+ }
+ });
+});
+
+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']}];
+ populateTableChk(url, container, colDefsResources);
+}
+
+function populateTableChk (url, container, colDefs) {
+ createTable(container,url,colDefs);
+}
+
+
+
+/*
populateResourceTable = function(building_id, selection) {
YAHOO.booking.checkboxTableHelper('resources-container',
'index.php?menuaction=booking.uiresource.index&sort=name&filter_building_id=' +
building_id + '&phpgw_return_as=json&',
'resources[]', selection, {additional_fields: [{key: 'type', label:
lang['Resource Type']}]});
@@ -17,5 +58,5 @@
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uipermission_root.index_accounts&phpgw_return_as=json&',
'field_officer_name',
'field_officer_id', 'officer_container');
});
+*/
-
Modified: branches/dev-syncromind/booking/templates/base/allocation_delete.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/allocation_delete.xsl
2015-09-18 19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/templates/base/allocation_delete.xsl
2015-09-19 00:17:02 UTC (rev 13968)
@@ -1,7 +1,7 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<xsl:call-template name="msgbox"/>
<!--xsl:call-template name="yui_booking_i18n"/-->
- <form action="" method="POST" id='form' class="pure-form
pure-form-aligned" name="form">
+ <form action="" method="POST" id='form' class="pure-form
pure-form-aligned" name="form">
<fieldset>
<input type="hidden" name="tab" value=""/>
<div id="tab-content">
@@ -11,111 +11,111 @@
<legend><h3><xsl:value-of select="php:function('lang',
'Delete allocation')"/></h3></legend>
</div>
- <div class="pure-control-group">
- <h4><xsl:value-of select="php:function('lang',
'Delete Information')"/></h4>
- <h4><xsl:value-of select="php:function('lang',
'Delete Information2')"/></h4>
+ <div class="pure-control-group">
+ <h4><xsl:value-of select="php:function('lang', 'Delete
Information')"/></h4>
+ <h4><xsl:value-of select="php:function('lang', 'Delete
Information2')"/></h4>
+ </div>
+ <div class="pure-control-group">
+ <input type="hidden" name="application_id"
value="{allocation/application_id}"/>
+ <input id="field_org_id" name="organization_id"
type="hidden" value="{allocation/organization_id}" />
+ <input id="field_building_id" name="building_id"
type="hidden" value="{allocation/building_id}" />
+ <input id="field_from" name="from_" type="hidden"
value="{allocation/from_}" />
+ <input id="field_to" name="to_" type="hidden"
value="{allocation/to_}" />
+ </div>
+ <div class="pure-control-group">
+ <label for="field_building"
style="vertical-align:top;">
+ <h4><xsl:value-of select="php:function('lang',
'Building')" /></h4>
+ </label>
+ <div class="autocomplete"
style="display:inline-block;">
+ <xsl:value-of select="allocation/building_name"/>
</div>
- <div class="pure-control-group">
- <input type="hidden" name="application_id"
value="{allocation/application_id}"/>
- <input id="field_org_id" name="organization_id"
type="hidden" value="{allocation/organization_id}" />
- <input id="field_building_id" name="building_id"
type="hidden" value="{allocation/building_id}" />
- <input id="field_from" name="from_" type="hidden"
value="{allocation/from_}" />
- <input id="field_to" name="to_" type="hidden"
value="{allocation/to_}" />
+ </div>
+ <div class="pure-control-group">
+ <label for="field_org" style="vertical-align:top;">
+ <h4><xsl:value-of select="php:function('lang',
'Organization')" /></h4>
+ </label>
+ <div class="autocomplete"
style="display:inline-block;">
+ <xsl:value-of
select="allocation/organization_name"/>
</div>
- <div class="pure-control-group">
- <label for="field_building"
style="vertical-align:top;">
- <h4><xsl:value-of select="php:function('lang',
'Building')" /></h4>
- </label>
- <div class="autocomplete"
style="display:inline-block;">
- <xsl:value-of
select="allocation/building_name"/>
- </div>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_from" style="vertical-align:top;">
+ <h4><xsl:value-of select="php:function('lang',
'From')" /></h4>
+ </label>
+ <div style="display:inline-block;">
+ <xsl:value-of select="allocation/from_"/>
</div>
- <div class="pure-control-group">
- <label for="field_org" style="vertical-align:top;">
- <h4><xsl:value-of select="php:function('lang',
'Organization')" /></h4>
- </label>
- <div class="autocomplete"
style="display:inline-block;">
- <xsl:value-of
select="allocation/organization_name"/>
- </div>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_to" style="vertical-align:top;">
+ <h4><xsl:value-of select="php:function('lang',
'To')" /></h4>
+ </label>
+ <div style="display:inline-block;">
+ <xsl:value-of select="allocation/to_"/>
</div>
- <div class="pure-control-group">
- <label for="field_from"
style="vertical-align:top;">
- <h4><xsl:value-of select="php:function('lang',
'From')" /></h4>
- </label>
- <div style="display:inline-block;">
- <xsl:value-of select="allocation/from_"/>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_repeat_until"
style="vertical-align:top;">
+ <h4><xsl:value-of select="php:function('lang',
'Recurring allocation deletion')" /></h4>
+ </label>
+ <div style="display:inline-block;">
+ <div>
+ <label style="display: block
!important;text-align: left !important;">
+ <input type="checkbox" name="outseason"
id="outseason">
+ <xsl:if test="outseason='on'">
+ <xsl:attribute
name="checked">checked</xsl:attribute>
+ </xsl:if>
+ </input>
+ <xsl:value-of select="php:function('lang',
'Out season')" />
+ </label>
+ <label style="display: block
!important;text-align: left !important;">
+ <input type="checkbox" name="recurring"
id="recurring">
+ <xsl:if test="recurring='on'">
+ <xsl:attribute
name="checked">checked</xsl:attribute>
+ </xsl:if>
+ </input>
+ <xsl:value-of select="php:function('lang',
'Delete until')" />
+ </label>
</div>
- </div>
- <div class="pure-control-group">
- <label for="field_to" style="vertical-align:top;">
- <h4><xsl:value-of select="php:function('lang',
'To')" /></h4>
- </label>
- <div style="display:inline-block;">
- <xsl:value-of select="allocation/to_"/>
+ <div>
+ <input class="datetime"
id="field_repeat_until" name="repeat_until" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="repeat_until"/></xsl:attribute>
+ </input>
</div>
</div>
- <div class="pure-control-group">
- <label for="field_repeat_until"
style="vertical-align:top;">
- <h4><xsl:value-of select="php:function('lang',
'Recurring allocation deletion')" /></h4>
- </label>
- <div style="display:inline-block;">
- <div>
- <label style="display: block
!important;text-align: left !important;">
- <input type="checkbox"
name="outseason" id="outseason">
- <xsl:if test="outseason='on'">
- <xsl:attribute
name="checked">checked</xsl:attribute>
- </xsl:if>
- </input>
- <xsl:value-of
select="php:function('lang', 'Out season')" />
- </label>
- <label style="display: block
!important;text-align: left !important;">
- <input type="checkbox"
name="recurring" id="recurring">
- <xsl:if test="recurring='on'">
- <xsl:attribute
name="checked">checked</xsl:attribute>
- </xsl:if>
- </input>
- <xsl:value-of
select="php:function('lang', 'Delete until')" />
- </label>
- </div>
- <div>
- <input class="datetime"
id="field_repeat_until" name="repeat_until" type="text">
- <xsl:attribute
name="value"><xsl:value-of select="repeat_until"/></xsl:attribute>
- </input>
- </div>
- </div>
- </div>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of select="php:function('lang',
'Interval')" /></h4>
- </label>
- <xsl:value-of select="../field_interval" />
- <select id="field_interval" name="field_interval">
- <option value="1">
- <xsl:if test="interval=1">
- <xsl:attribute
name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:value-of select="php:function('lang',
'1 week')" />
- </option>
- <option value="2">
- <xsl:if test="interval=2">
- <xsl:attribute
name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:value-of select="php:function('lang',
'2 weeks')" />
- </option>
- <option value="3">
- <xsl:if test="interval=3">
- <xsl:attribute
name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:value-of select="php:function('lang',
'3 weeks')" />
- </option>
- <option value="4">
- <xsl:if test="interval=4">
- <xsl:attribute
name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:value-of select="php:function('lang',
'4 weeks')" />
- </option>
- </select>
- </div>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of select="php:function('lang',
'Interval')" /></h4>
+ </label>
+ <xsl:value-of select="../field_interval" />
+ <select id="field_interval" name="field_interval">
+ <option value="1">
+ <xsl:if test="interval=1">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang', '1
week')" />
+ </option>
+ <option value="2">
+ <xsl:if test="interval=2">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang', '2
weeks')" />
+ </option>
+ <option value="3">
+ <xsl:if test="interval=3">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang', '3
weeks')" />
+ </option>
+ <option value="4">
+ <xsl:if test="interval=4">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang', '4
weeks')" />
+ </option>
+ </select>
+ </div>
</div>
</div>
@@ -131,8 +131,8 @@
</div>
</form>
<script type="text/javascript">
- YAHOO.booking.season_id = '<xsl:value-of
select="allocation/season_id"/>';
- YAHOO.booking.initialSelection = <xsl:value-of
select="allocation/resources_json"/>;
+ var season_id = '<xsl:value-of select="allocation/season_id"/>';
+ var initialSelection = <xsl:value-of
select="allocation/resources_json"/>;
var lang = <xsl:value-of select="php:function('js_lang', 'Resource
Type')"/>;
</script>
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/application_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/application_edit.xsl
2015-09-18 19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/templates/base/application_edit.xsl
2015-09-19 00:17:02 UTC (rev 13968)
@@ -98,7 +98,7 @@
<label>
<h4><xsl:value-of
select="php:function('lang', 'Resources')" /></h4>
</label>
- <div id="resources_container"
style="display:inline-block;"><xsl:value-of select="php:function('lang',
'Select a building first')" /></div>
+ <div id="resources_container"
style="display:inline-block;"><xsl:value-of select="php:function('lang',
'Select a building first')" /></div>
</div>
</div>
<div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
@@ -265,6 +265,7 @@
var initialDocumentSelection = <xsl:value-of
select="application/accepted_documents_json"/>;
var initialAcceptAllTerms = true;
var initialSelection = <xsl:value-of
select="application/resources_json"/>;
+ console.log(initialDocumentSelection);
</script>
<!--/div-->
<!--script type="text/javascript">
Modified: branches/dev-syncromind/booking/templates/base/application_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/application_new.xsl
2015-09-18 19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/templates/base/application_new.xsl
2015-09-19 00:17:02 UTC (rev 13968)
@@ -124,7 +124,7 @@
</div>
<div class="pure-control-group">
<label><h4><xsl:value-of
select="php:function('lang', 'Resources')" /></h4></label>
- <xsl:value-of select="php:function('lang',
'Select a building first')" />
+ <div id="resources_container"
style="display:inline-block;"><xsl:value-of select="php:function('lang',
'Select a building first')" /></div>
</div>
</fieldset>
</div>
@@ -307,10 +307,10 @@
</form>
<!--/div-->
<script type="text/javascript">
- YAHOO.booking.initialDocumentSelection = <xsl:value-of
select="application/accepted_documents_json"/>;
- YAHOO.booking.initialAcceptAllTerms = false;
- YAHOO.booking.initialSelection = <xsl:value-of
select="application/resources_json"/>;
- YAHOO.booking.initialAudience = <xsl:value-of
select="application/audience_json"/>;
+ var initialDocumentSelection = <xsl:value-of
select="application/accepted_documents_json"/>;
+ var initialAcceptAllTerms = false;
+ var initialSelection = <xsl:value-of
select="application/resources_json"/>;
+ var initialAudience = <xsl:value-of
select="application/audience_json"/>;
var lang = <xsl:value-of select="php:function('js_lang', 'From', 'To',
'Resource Type', 'Name', 'Accepted', 'Document', 'You must accept to follow all
terms and conditions of lease first.')"/>;
</script>
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/booking_delete.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/booking_delete.xsl
2015-09-18 19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/templates/base/booking_delete.xsl
2015-09-19 00:17:02 UTC (rev 13968)
@@ -1,139 +1,165 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
-
- <dl class="form">
- <dt class="heading"><xsl:value-of select="php:function('lang', 'Delete
Booking')"/></dt>
- </dl>
<xsl:call-template name="msgbox"/>
- <xsl:call-template name="yui_booking_i18n"/>
- <dl class="form">
- <dd>
- <xsl:value-of select="php:function('lang', 'Booking Delete
Information')"/>
- <xsl:value-of select="php:function('lang', 'Booking Delete
Information3')"/>
- </dd>
- <dd><xsl:value-of select="php:function('lang', 'Booking Delete
Information2')"/></dd>
- </dl>
-
- <form action="" method="POST">
- <input type="hidden" name="application_id"
value="{booking/application_id}"/>
- <input type="hidden" name="group_id" value="{booking/group_id}" />
- <input type="hidden" name="building_id" value="{booking/building_id}"
/>
- <input type="hidden" name="season_id" value="{booking/season_id}" />
- <input type="hidden" name="from_" value="{booking/from_}" />
- <input type="hidden" name="to_" value="{booking/to_}" />
-
- <dl class="form-col">
- <dt><label for="field_building"><xsl:value-of
select="php:function('lang', 'Building')" /></label></dt>
- <dd>
- <div>
- <xsl:value-of select="booking/building_name"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
+ <form action="" method="POST" id='form' class="pure-form
pure-form-aligned" name="form">
+ <fieldset>
+ <input type="hidden" name="tab" value=""/>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="booking/tabs"/>
+ <div id="booking_delete">
+ <div class="heading">
+ <legend><h3><xsl:value-of select="php:function('lang',
'Delete Booking')"/></h3></legend>
+ </div>
+ <div class="pure-control-group">
+ <h4><xsl:value-of select="php:function('lang',
'Booking Delete Information')"/></h4>
+ <h4><xsl:value-of select="php:function('lang',
'Booking Delete Information2')"/></h4>
+ <h4><xsl:value-of select="php:function('lang',
'Booking Delete Information3')"/></h4>
+ </div>
+ <div class="pure-control-group">
+ <input type="hidden" name="application_id"
value="{booking/application_id}"/>
+ <input type="hidden" name="group_id"
value="{booking/group_id}" />
+ <input type="hidden" name="building_id"
value="{booking/building_id}" />
+ <input type="hidden" name="season_id"
value="{booking/season_id}" />
+ <input type="hidden" name="from_"
value="{booking/from_}" />
+ <input type="hidden" name="to_" value="{booking/to_}"
/>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_building">
+ <h4><xsl:value-of select="php:function('lang',
'Building')" /></h4>
+ </label>
+ <div style="display:inline-block;">
+ <xsl:value-of select="booking/building_name"/>
+ </div>
+ </div>
+
+ <div class="pure-control-group">
+ <label for="field_group">
+ <h4><xsl:value-of select="php:function('lang',
'Group')"/></h4>
+ </label>
+ <div style="display:inline-block;">
+ <xsl:value-of select="booking/group_name"/>
+ </div>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_season">
+ <h4><xsl:value-of select="php:function('lang',
'Season')"/></h4>
+ </label>
+ <div style="display:inline-block;">
+ <xsl:value-of select="booking/season_name"/>
+ </div>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_repeat_until">
+ <h4><xsl:value-of select="php:function('lang',
'Delete allocation also')" /></h4>
+ </label>
+ <div style="display:inline-block;">
+ <label>
+ <input type="checkbox"
name="delete_allocation" id="delete_allocation">
+ <xsl:if test="delete_allocation='on'">
+ <xsl:attribute
name="checked">checked</xsl:attribute>
+ </xsl:if>
+ </input>
+ <xsl:value-of select="php:function('lang',
'Delete allocations')" />
+ </label>
+ </div>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_from">
+ <h4><xsl:value-of select="php:function('lang',
'From')" /></h4>
+ </label>
+ <div style="display:inline-block;">
+ <xsl:value-of select="booking/from_"/>
+ </div>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_to">
+ <h4><xsl:value-of select="php:function('lang',
'To')"/></h4>
+ </label>
+ <div style="display:inline-block;">
+ <xsl:value-of select="booking/to_"/>
+ </div>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_repeat_until"
style="vertical-align:top;">
+ <h4><xsl:value-of select="php:function('lang',
'Recurring allocation deletion')" /></h4>
+ </label>
+ <div style="display:inline-block;">
+ <div style="display:inline-block;">
+ <label style="display: block
!important;text-align: left !important;">
+ <input type="checkbox" name="outseason"
id="outseason">
+ <xsl:if test="outseason='on'">
+ <xsl:attribute
name="checked">checked</xsl:attribute>
+ </xsl:if>
+ </input>
+ <xsl:value-of select="php:function('lang',
'Out season')" />
+ </label>
+ <label style="display: block
!important;text-align: left !important;">
+ <input type="checkbox" name="recurring"
id="recurring">
+ <xsl:if test="recurring='on'">
+ <xsl:attribute
name="checked">checked</xsl:attribute>
+ </xsl:if>
+ </input>
+ <xsl:value-of select="php:function('lang',
'Delete until')" />
+ </label>
+ </div>
+ <div>
+ <input class="datetime"
id="field_repeat_until" name="repeat_until" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="repeat_until"/></xsl:attribute>
+ </input>
+ </div>
+ </div>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_interval">
+ <h4><xsl:value-of select="php:function('lang',
'Interval')" /></h4>
+ </label>
+ <div style="display: inline-block;">
+ <xsl:value-of select="../field_interval" />
+ <select id="field_interval" name="field_interval">
+ <option value="1">
+ <xsl:if test="interval=1">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'1 week')" />
+ </option>
+ <option value="2">
+ <xsl:if test="interval=2">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'2 weeks')" />
+ </option>
+ <option value="3">
+ <xsl:if test="interval=3">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'3 weeks')" />
+ </option>
+ <option value="4">
+ <xsl:if test="interval=4">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'4 weeks')" />
+ </option>
+ </select>
+ </div>
+ </div>
</div>
- </dd>
- <dt><label for="field_from"><xsl:value-of
select="php:function('lang', 'From')" /></label></dt>
- <dd>
- <div>
- <xsl:value-of select="booking/from_"/>
- </div>
- </dd>
- <dt><label for="field_to"><xsl:value-of
select="php:function('lang', 'To')"/></label></dt>
- <dd>
- <div>
- <xsl:value-of select="booking/to_"/>
- </div>
- </dd>
- <dt><label for="field_repeat_until"><xsl:value-of
select="php:function('lang', 'Recurring allocation deletion')" /></label></dt>
- <dd>
- <label>
- <input type="checkbox" name="outseason"
id="outseason">
- <xsl:if test="outseason='on'">
- <xsl:attribute
name="checked">checked</xsl:attribute>
- </xsl:if>
- </input>
- <xsl:value-of
select="php:function('lang', 'Out season')" />
- </label>
- </dd>
- <dd>
- <label>
- <input type="checkbox" name="recurring"
id="recurring">
- <xsl:if test="recurring='on'">
- <xsl:attribute
name="checked">checked</xsl:attribute>
- </xsl:if>
- </input>
- <xsl:value-of
select="php:function('lang', 'Delete until')" />
- </label>
- </dd>
- <dd class="date-picker">
- <input id="field_repeat_until"
name="repeat_until" type="text">
- <xsl:attribute
name="value"><xsl:value-of select="repeat_until"/></xsl:attribute>
- </input>
- </dd>
- <dt><xsl:value-of select="php:function('lang',
'Interval')" /></dt>
- <dd>
- <xsl:value-of select="../field_interval" />
- <select id="field_interval"
name="field_interval">
- <option value="1">
- <xsl:if test="interval=1">
- <xsl:attribute
name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', '1 week')" />
- </option>
- <option value="2">
- <xsl:if test="interval=2">
- <xsl:attribute
name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', '2 weeks')" />
- </option>
- <option value="3">
- <xsl:if test="interval=3">
- <xsl:attribute
name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', '3 weeks')" />
- </option>
- <option value="4">
- <xsl:if test="interval=4">
- <xsl:attribute
name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', '4 weeks')" />
- </option>
- </select>
- </dd>
- </dl>
- <dl class="form-col">
- <dt><label for="field_group"><xsl:value-of
select="php:function('lang', 'Group')"/></label></dt>
- <dd>
- <xsl:value-of select="booking/group_name"/>
- </dd>
- <dt><label for="field_season"><xsl:value-of
select="php:function('lang', 'Season')"/></label></dt>
- <dd>
- <xsl:value-of select="booking/season_name"/>
- </dd>
- <dt><label for="field_repeat_until"><xsl:value-of
select="php:function('lang', 'Delete allocation also')" /></label></dt>
- <dd>
- <label>
- <input type="checkbox"
name="delete_allocation" id="delete_allocation">
- <xsl:if
test="delete_allocation='on'">
- <xsl:attribute
name="checked">checked</xsl:attribute>
- </xsl:if>
- </input>
- <xsl:value-of
select="php:function('lang', 'Delete allocations')" />
- </label>
- </dd>
- </dl>
+ </div>
+ </fieldset>
<div class="form-buttons">
- <input type="submit">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Delete')"/></xsl:attribute>
- </input>
+ <input class="pure-button pure-button-primary" type="submit">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Delete')"/></xsl:attribute>
+ </input>
<a class="cancel">
<xsl:attribute name="href"><xsl:value-of
select="booking/cancel_link"/></xsl:attribute>
<xsl:value-of select="php:function('lang', 'Cancel')"/>
</a>
</div>
</form>
- </div>
<script type="text/javascript">
- YAHOO.booking.season_id = '<xsl:value-of select="booking/season_id"/>';
- YAHOO.booking.group_id = '<xsl:value-of select="booking/group_id"/>';
- YAHOO.booking.initialSelection = <xsl:value-of
select="booking/resources_json"/>;
- var lang = <xsl:value-of select="php:function('js_lang',
'Resource Type')"/>;
+ var season_id = '<xsl:value-of select="booking/season_id"/>';
+ var group_id = '<xsl:value-of select="booking/group_id"/>';
+ var initialSelection = <xsl:value-of select="booking/resources_json"/>;
+ var lang = <xsl:value-of select="php:function('js_lang', 'Resource
Type')"/>;
</script>
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/booking_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/booking_edit.xsl
2015-09-18 19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/templates/base/booking_edit.xsl
2015-09-19 00:17:02 UTC (rev 13968)
@@ -90,13 +90,13 @@
<label>
<h4><xsl:value-of
select="php:function('lang', 'Season')"/></h4>
</label>
- <xsl:value-of select="php:function('lang',
'Select a building first')"/>
+ <div id="season_container"><xsl:value-of
select="php:function('lang', 'Select a building first')"/></div>
</div>
<div class="pure-control-group">
<label>
<h4><xsl:value-of
select="php:function('lang', 'Resources')"/></h4>
</label>
- <xsl:value-of select="php:function('lang',
'Select a building first')"/>
+ <div id="resources_container"><xsl:value-of
select="php:function('lang', 'Select a building first')"/></div>
</div>
</div>
@@ -122,7 +122,7 @@
<label>
<h4><xsl:value-of
select="php:function('lang', 'Group')"/></h4>
</label>
- <!--div
id="group_container"--><xsl:value-of select="php:function('lang',
'Loading...')"/><!--/div-->
+ <div id="group_container"><xsl:value-of
select="php:function('lang', 'Select a building first')"/></div>
</div>
<div class="pure-control-group">
<label for="field_from">
@@ -316,9 +316,13 @@
</a>
</div>
</form>
-
<!--/div-->
-
+ <script>
+ var season_id = '<xsl:value-of select="booking/season_id"/>';
+ var group_id = '<xsl:value-of select="booking/group_id"/>';
+ var initialSelection = <xsl:value-of select="booking/resources_json"/>;
+ var lang = <xsl:value-of select="php:function('js_lang', 'Resource
Type')"/>;
+ </script>
<!--script type="text/javascript">
YAHOO.booking.season_id = '<xsl:value-of select="booking/season_id"/>';
YAHOO.booking.group_id = '<xsl:value-of select="booking/group_id"/>';
Modified: branches/dev-syncromind/booking/templates/base/booking_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/booking_new.xsl
2015-09-18 19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/templates/base/booking_new.xsl
2015-09-19 00:17:02 UTC (rev 13968)
@@ -57,13 +57,13 @@
<label>
<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"><xsl:value-of
select="php:function('lang', 'Select a building first')"/></div>
</div>
<div class="pure-control-group">
<label>
<h4><xsl:value-of
select="php:function('lang', 'Resources')"/></h4>
</label>
- <!--div
id="resources_container"--><xsl:value-of select="php:function('lang', 'Select a
building first')"/><!--/div-->
+ <div id="resources_container"><xsl:value-of
select="php:function('lang', 'Select a building first')"/></div>
</div>
</div>
<div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
@@ -79,14 +79,14 @@
<input id="field_org_name"
name="organization_name" type="text" class="pure-u-1 pure-u-sm-1-2 pure-u-md-1">
<xsl:attribute name="value"><xsl:value-of
select="booking/organization_name"/></xsl:attribute>
</input>
- <!--div id="org_container"/>
- </div-->
+ <div id="org_container"></div>
+ <!--/div-->
</div>
<div class="pure-control-group">
<label>
<h4><xsl:value-of
select="php:function('lang', 'Group')"/></h4>
</label>
- <!--div id="group_container"--><xsl:value-of
select="php:function('lang', 'Select an organization first')"/><!--/div-->
+ <div id="group_container"><xsl:value-of
select="php:function('lang', 'Select an organization first')"/></div>
</div>
<div class="pure-control-group">
<label>
@@ -276,10 +276,16 @@
</div>
</form>
<!--/div-->
+ <script type="text/javascript">
+ season_id = '<xsl:value-of select="booking/season_id"/>';
+ group_id = '<xsl:value-of select="booking/group_id"/>';
+ initialSelection = <xsl:value-of select="booking/resources_json"/>;
+ var lang = <xsl:value-of select="php:function('js_lang', 'Resource
Type')"/>;
+ </script>
<!--script type="text/javascript">
YAHOO.booking.season_id = '<xsl:value-of select="booking/season_id"/>';
YAHOO.booking.group_id = '<xsl:value-of select="booking/group_id"/>';
YAHOO.booking.initialSelection = <xsl:value-of
select="booking/resources_json"/>;
- var lang = <xsl:value-of select="php:function('js_lang',
'Resource Type')"/>;
+ var lang = <xsl:value-of select="php:function('js_lang', 'Resource
Type')"/>;
</script-->
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/document_form.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/document_form.xsl
2015-09-18 19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/templates/base/document_form.xsl
2015-09-19 00:17:02 UTC (rev 13968)
@@ -1,8 +1,8 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <!--script type="text/javascript">
- YAHOO.booking.documentOwnerType = "<xsl:value-of
select="document/owner_type"/>";
- YAHOO.booking.documentOwnerAutocomplete = <xsl:value-of
select="document/inline"/> == 0;
- </script-->
+ <script type="text/javascript">
+ var documentOwnerType = "<xsl:value-of
select="document/owner_type"/>";
+ var documentOwnerAutocomplete = <xsl:value-of
select="document/inline"/> == 0;
+ </script>
<!--div id="content"-->
@@ -28,7 +28,6 @@
<fieldset>
<div class="pure-g">
<div class="pure-u-1">
-
<xsl:if test="document/id">
<div class="heading">
<legend><h3><xsl:value-of
select="php:function('lang', 'Edit document')" /></h3></legend>
Modified: branches/dev-syncromind/booking/templates/base/event_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/event_edit.xsl
2015-09-18 19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/templates/base/event_edit.xsl
2015-09-19 00:17:02 UTC (rev 13968)
@@ -142,7 +142,7 @@
<label>
<h4><xsl:value-of
select="php:function('lang', 'Resources')" /></h4>
</label>
- <xsl:value-of select="php:function('lang',
'Select a building first')" />
+ <div id="resources_container"><xsl:value-of
select="php:function('lang', 'Select a building first')" /></div>
</div>
</div>
@@ -196,13 +196,15 @@
<ul style="list-style:none;padding: 0 0 0
10px;">
<xsl:for-each select="audience">
<li>
- <input type="checkbox"
name="audience[]">
- <xsl:attribute
name="value"><xsl:value-of select="id"/></xsl:attribute>
- <xsl:if
test="../event/audience=id">
- <xsl:attribute
name="checked">checked</xsl:attribute>
- </xsl:if>
- </input>
- <span><xsl:value-of
select="name"/></span>
+ <label
style="display:inline-block">
+ <input type="checkbox"
name="audience[]">
+ <xsl:attribute
name="value"><xsl:value-of select="id"/></xsl:attribute>
+ <xsl:if
test="../event/audience=id">
+ <xsl:attribute
name="checked">checked</xsl:attribute>
+ </xsl:if>
+ </input>
+ <span><xsl:value-of
select="name"/></span>
+ </label>
</li>
</xsl:for-each>
</ul>
@@ -426,6 +428,8 @@
</form>
<script type="text/javascript">
$('#field_customer_identifier_type,#field_customer_ssn,#field_customer_organization_number').removeClass('pure-input-1').addClass('pure-u-1
pure-u-sm-1-2 pure-u-md-1');
+ var initialSelection = <xsl:value-of select="event/resources_json"/>;
+ var lang = <xsl:value-of select="php:function('js_lang', 'Name',
'Resource Type')"/>;
</script>
<!--/div-->
<!--script type="text/javascript">
Modified: branches/dev-syncromind/booking/templates/base/event_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/event_new.xsl
2015-09-18 19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/templates/base/event_new.xsl
2015-09-19 00:17:02 UTC (rev 13968)
@@ -1,8 +1,6 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<style type="text/css">
-
- #agegroup td {padding: 0 0.3em;}
-
+ #agegroup td {padding: 0 0.3em;}
</style>
<!--div id="content">
@@ -93,7 +91,7 @@
<label>
<h4><xsl:value-of
select="php:function('lang', 'Resources')" /></h4>
</label>
- <!--div
id="resources_container"--><xsl:value-of select="php:function('lang', 'Select a
building first')" /><!--/div-->
+ <div
id="resources_container"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></div>
</div>
</div>
@@ -136,10 +134,10 @@
<label>
<h4><xsl:value-of
select="php:function('lang', 'Target audience')" /></h4>
</label>
- <ul>
+ <ul style="list-style:none;">
<xsl:for-each select="audience">
<li>
- <label>
+ <label
style="display:inline-block;">
<input type="checkbox"
name="audience[]">
<xsl:attribute
name="value"><xsl:value-of select="id"/></xsl:attribute>
<xsl:if
test="../event/audience=id">
@@ -317,6 +315,8 @@
</form>
<script type="text/javascript">
$('#field_customer_identifier_type,#field_customer_ssn,#field_customer_organization_number').removeClass('pure-input-1').addClass('pure-u-1
pure-u-sm-1-2 pure-u-md-1');
+ var initialSelection = <xsl:value-of select="event/resources_json"/>;
+ var lang = <xsl:value-of select="php:function('js_lang', 'Name',
'From', 'To', 'Resource Type')"/>;
</script>
<!--/div>
<script type="text/javascript">
Modified: branches/dev-syncromind/booking/templates/base/group_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/group_edit.xsl
2015-09-18 19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/templates/base/group_edit.xsl
2015-09-19 00:17:02 UTC (rev 13968)
@@ -178,6 +178,7 @@
<script type="text/javascript">
var endpoint = '<xsl:value-of select="module" />';
+/*
<![CDATA[
var descEdit = new YAHOO.widget.SimpleEditor('field-description', {
height: '300px',
@@ -199,12 +200,14 @@
}
});
descEdit.render();
+]]>
+*/
-YAHOO.booking.autocompleteHelper('index.php?menuaction=' + endpoint +
'.uiorganization.index&phpgw_return_as=json&',
- 'field_organization_name',
- 'field_organization_id',
- 'organization_container'
-);
+<![CDATA[
+$(document).ready(function() {
+ JqueryPortico.autocompleteHelper('index.php?menuaction=' + endpoint +
'.uiorganization.index&phpgw_return_as=json&',
+ 'field_organization_name',
'field_organization_id', 'organization_container');
+});
]]>
</script>
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/permission_form.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/permission_form.xsl
2015-09-18 19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/templates/base/permission_form.xsl
2015-09-19 00:17:02 UTC (rev 13968)
@@ -7,10 +7,10 @@
</xsl:template>
<xsl:template match="data/permission" xmlns:php="http://php.net/xsl";>
- <!--script type="text/javascript">
- YAHOO.booking.objectType = "<xsl:value-of
select="object_type"/>";
- YAHOO.booking.objectAutocomplete = <xsl:value-of
select="inline"/> == 0;
- </script-->
+ <script type="text/javascript">
+ objectType = "<xsl:value-of select="object_type"/>";
+ objectAutocomplete = <xsl:value-of select="inline"/> == 0;
+ </script>
<!-- Add pathway later -->
<!--ul class="pathway">
Modified: branches/dev-syncromind/booking/templates/base/resource.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/resource.xsl 2015-09-18
19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/templates/base/resource.xsl 2015-09-19
00:17:02 UTC (rev 13968)
@@ -74,7 +74,7 @@
<div class="form-buttons">
<xsl:if test="resource/permission/write">
<button>
- <xsl:attribute
name="onclick">window.location.href="<xsl:value-of
select="resource/edit_link"/>"</xsl:attribute>
+ <xsl:attribute
name="onclick">window.location.href='<xsl:value-of
select="resource/edit_link"/>'</xsl:attribute>
<xsl:value-of select="php:function('lang',
'Edit')" />
</button>
</xsl:if>
Modified: branches/dev-syncromind/booking/templates/base/resource_form.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/resource_form.xsl
2015-09-18 19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/templates/base/resource_form.xsl
2015-09-19 00:17:02 UTC (rev 13968)
@@ -62,8 +62,8 @@
<xsl:attribute
name="disabled">disabled</xsl:attribute>
</xsl:if>
</input>
- <!--div id="building_container"/>
- </div-->
+ <div id="building_container"></div>
+ <!--/div-->
</div>
<div class="pure-control-group">
<label for="field_type">
@@ -141,10 +141,12 @@
</form>
<!--/div-->
<script type="text/javascript">
+ /*
<![CDATA[
YAHOO.util.Event.addListener(window, "load", function() {
YAHOO.booking.rtfEditorHelper('field_description');
});
]]>
+ */
</script>
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/season_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/season_edit.xsl
2015-09-18 19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/templates/base/season_edit.xsl
2015-09-19 00:17:02 UTC (rev 13968)
@@ -155,7 +155,7 @@
</form>
<!--/div-->
<script type="text/javascript">
- YAHOO.booking.initialSelection = <xsl:value-of
select="season/resources_json"/>;
- var lang = <xsl:value-of select="php:function('js_lang', 'Resource
Type')"/>;
+ var initialSelection = <xsl:value-of select="season/resources_json"/>;
+ var lang = <xsl:value-of select="php:function('js_lang', 'Name', 'Resource
Type')"/>;
</script>
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/season_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/season_new.xsl
2015-09-18 19:13:22 UTC (rev 13967)
+++ branches/dev-syncromind/booking/templates/base/season_new.xsl
2015-09-19 00:17:02 UTC (rev 13968)
@@ -112,7 +112,7 @@
</form>
<!--/div-->
<script type="text/javascript">
- YAHOO.booking.initialSelection = <xsl:value-of
select="season/resources_json"/>;
- var lang = <xsl:value-of select="php:function('js_lang', 'Resource
Type')"/>;
+ initialSelection = <xsl:value-of select="season/resources_json"/>;
+ var lang = <xsl:value-of select="php:function('js_lang', 'Name', 'Resource
Type')"/>;
</script>
</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13968] fixing forms,
Saul <=