[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14341] fixing forms
|
From: |
Saul |
|
Subject: |
[Fmsystem-commits] [14341] fixing forms |
|
Date: |
Thu, 12 Nov 2015 23:56:52 +0000 |
Revision: 14341
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14341
Author: psaul
Date: 2015-11-12 23:56:52 +0000 (Thu, 12 Nov 2015)
Log Message:
-----------
fixing forms
Modified Paths:
--------------
branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking.js
branches/dev-syncromind/bookingfrontend/templates/base/booking_cancel.xsl
branches/dev-syncromind/bookingfrontend/templates/base/booking_edit.xsl
branches/dev-syncromind/bookingfrontend/templates/base/booking_new.xsl
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
2015-11-12 23:54:54 UTC (rev 14340)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
2015-11-12 23:56:52 UTC (rev 14341)
@@ -118,18 +118,14 @@
$booking['building_id'] = $building['id'];
$booking['building_name'] = $building['name'];
array_set_default($booking, 'resources',
array(get_var('resource', int, 'GET')));
- $booking['organization_id'] = $allocation['organization_id'];
- $booking['organization_name'] =
$allocation['organization_name'];
} else {
$season =
$this->season_bo->read_single($_POST['season_id']);
- $booking['organization_id'] = $_POST['organization_id'];
- $booking['organization_name'] =
$_POST['organization_name'];
}
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
$_POST['from_'] = ($_POST['from_']) ? date("Y-m-d H:i:s",
phpgwapi_datetime::date_to_timestamp($_POST['from_'])) : "";
$_POST['to_'] = ($_POST['to_']) ? date("Y-m-d H:i:s",
phpgwapi_datetime::date_to_timestamp($_POST['to_'])) : "";
- $_POST['repeat_until'] = ($_POST['repeat_until']) ?
date("Y-m-d H:i:s",
phpgwapi_datetime::date_to_timestamp($_POST['repeat_until'])) : "";
+ $_POST['repeat_until'] = ($_POST['repeat_until']) ?
date("Y-m-d", phpgwapi_datetime::date_to_timestamp($_POST['repeat_until'])) :
"";
$today = getdate();
$booking = extract_values($_POST,
$this->fields);
@@ -142,8 +138,8 @@
$booking['to_'] = join(" ",$date_to);
$_POST['to_'] = join(" ",$date_to);
}
-// $booking['building_name'] = $building['name'];
-// $booking['building_id'] = $building['id'];
+ $booking['building_name'] = $building['name'];
+ $booking['building_id'] = $building['id'];
$booking['active'] = '1';
$booking['cost'] = 0;
$booking['completed'] = '0';
@@ -205,6 +201,9 @@
$todate = date('Y-m-d H:i',
strtotime($_POST['to_']) + ($interval*$i));
$booking['from_'] = $fromdate;
$booking['to_'] = $todate;
+ $fromdate = pretty_timestamp($fromdate);
+ $todate = pretty_timestamp($todate);
+
$err =
$this->bo->validate($booking);
if ($err)
{
@@ -236,14 +235,6 @@
$booking['from_'] = pretty_timestamp($booking['from_']);
$booking['to_'] = pretty_timestamp($booking['to_']);
- $booking['repeat_until'] =
pretty_timestamp($booking['repeat_until']);
-
- foreach($bookings['results'] as &$b)
- {
- $b['from_'] = pretty_timestamp($b['from_']);
- $b['to_'] = pretty_timestamp($b['to_']);
- $b['repeat_until'] = pretty_timestamp($b['repeat_until']);
- }
if(!$activity_id)
{
@@ -263,7 +254,7 @@
$activities = $activities['results'];
$groups =
$this->group_bo->so->read(array('filters'=>array('organization_id'=>$allocation['organization_id'],
'active'=>1)));
$groups = $groups['results'];
-// $booking['organization_name'] = $allocation['organization_name'];
+ $booking['organization_name'] = $allocation['organization_name'];
$resources_full =
$this->resource_bo->so->read(array('filters'=>array('id'=>$booking['resources']),
'sort'=>'name'));
$res_names = array();
foreach($resources_full['results'] as $res)
@@ -284,7 +275,7 @@
'groups' => $groups,
'step' => $step,
'interval' => $_POST['field_interval'],
- 'repeat_until' =>
$_POST['repeat_until'],
+ 'repeat_until' =>
pretty_timestamp($_POST['repeat_until']),
'recurring' => $_POST['recurring'],
'outseason' => $_POST['outseason'],
'date_from' => $time_from[0],
@@ -324,7 +315,7 @@
$agegroups =
$this->agegroup_bo->fetch_age_groups($top_level_activity);
$agegroups = $agegroups['results'];
$building =
$this->building_bo->read_single($booking['building_id']);
-
+
if ($booking['secret'] != phpgw::get_var('secret',
'GET'))
{
$step = -1; // indicates that an error message
should be displayed in the template
@@ -404,11 +395,6 @@
$errors['booking'] = lang('You
cant update bookings that is older than 2 weeks');
}
- if (!$booking['allocation_id'] &&
$_POST['outseason'] == 'on')
- {
- $errors['booking'] = lang('This
booking is not connected to a season');
- }
-
if (!$errors)
{
@@ -495,13 +481,11 @@
$booking['from_'] = pretty_timestamp($booking['from_']);
$booking['to_'] = pretty_timestamp($booking['to_']);
- $booking['repeat_until'] =
pretty_timestamp($booking['repeat_until']);
foreach($bookings['results'] as &$b)
{
$b['from_'] = pretty_timestamp($b['from_']);
$b['to_'] = pretty_timestamp($b['to_']);
- $b['repeat_until'] = pretty_timestamp($b['repeat_until']);
}
$activity_path =
$this->activity_bo->get_path($booking['activity_id']);
@@ -624,6 +608,11 @@
unset($_SESSION['male']);
unset($_SESSION['audience']);
}
+ foreach($booking['results'] as &$b)
+ {
+ $b['from_'] = pretty_timestamp($b['from_']);
+ $b['to_'] = pretty_timestamp($b['to_']);
+ }
}
$this->flash_form_errors($errors);
@@ -643,13 +632,7 @@
$activities = $this->activity_bo->fetch_activities();
$activities = $activities['results'];
-
- foreach($booking['results'] as &$b)
- {
- $b['from_'] = pretty_timestamp($b['from_']);
- $b['to_'] = pretty_timestamp($b['to_']);
- }
-
+
self::add_javascript('bookingfrontend', 'bookingfrontend',
'booking_massupdate.js');
self::render_template('booking_massupdate',
@@ -809,7 +792,6 @@
$booking['to_'] = pretty_timestamp($booking['to_']);
$GLOBALS['phpgw']->jqcal->add_listener('field_repeat_until',
'date');
- $booking['resources_json'] = json_encode(array_map('intval',
$booking['resources']));
$this->flash_form_errors($errors);
$allocation['cancel_link'] =
self::link(array('menuaction' => 'bookingfrontend.uibuilding.schedule', 'id' =>
$allocation['building_id']));
@@ -921,7 +903,7 @@
$this->redirect(array('menuaction' =>
'bookingfrontend.uibuilding.schedule', 'id'=>$booking['building_id']));
}
else
- {
+ {
$step++;
if ($_POST['recurring'] ==
'on') {
$repeat_until =
strtotime($_POST['repeat_until'])+60*60*24;
Modified: branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking.js
===================================================================
--- branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking.js
2015-11-12 23:54:54 UTC (rev 14340)
+++ branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking.js
2015-11-12 23:56:52 UTC (rev 14341)
@@ -1,10 +1,4 @@
-var building_id_selection;
-var organization_id_selection = "";
$(document).ready(function(){
- JqueryPortico.autocompleteHelper(phpGWLink('bookingfrontend/',
{menuaction: 'bookingfrontend.uibuilding.index'}, true), 'field_building_name',
'field_building_id', 'building_container');
- JqueryPortico.autocompleteHelper(phpGWLink('bookingfrontend/',
{menuaction: 'bookingfrontend.uigroup.index'}, true), 'field_group_name',
'field_group_id', 'group_container');
- JqueryPortico.autocompleteHelper(phpGWLink('bookingfrontend/',
{menuaction: 'booking.uiorganization.index'}, true), 'field_org_name',
'field_org_id', 'org_container');
-
$("#field_activity").change(function(){
var oArgs =
{menuaction:'bookingfrontend.uiapplication.get_activity_data',
activity_id:$(this).val()};
var requestUrl = phpGWLink('bookingfrontend/', oArgs, true);
@@ -62,32 +56,21 @@
});
$(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);
+ var building_id = $('#field_building_id').val();
+ var organization_id = $('#field_org_id').val();
+ var building_id_selection;
+ var organization_id_selection;
+ if (!group_id) {
+ var group_id = "";
+ }
+ if (building_id) {
populateTableChkResources(building_id, initialSelection);
building_id_selection = building_id
- }
- if (organization_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 populateTableChk (url, container, colDefs) {
@@ -107,42 +90,3 @@
var attr = [{name: 'name',value: 'group_id'},{name: 'data-validation',
value: 'required'}];
populateSelect(url, selection, container, attr);
};
-
-function populateSelectSeason (building_id, selection) {
- var url = phpGWLink('bookingfrontend/', {menuaction:
'booking.uiseason.index', sort: 'name', filter_building_id: building_id}, true);
- var container = $('#season_container');
- var attr = [{name: 'name',value: 'season_id'},{name: 'data-validation',
value: 'required'}];
- populateSelect(url, selection, container, attr);
-}
-//populateResourceTable = function(building_id, selection) {
-// YAHOO.booking.checkboxTableHelper('resources_container',
'index.php?menuaction=bookingfrontend.uiresource.index_json&sort=name&filter_building_id='
+ building_id + '&phpgw_return_as=json&',
-// 'resources[]', selection);
-//}
-//
-//YAHOO.util.Event.addListener(window, "load", function() {
-// var building_id = YAHOO.util.Dom.get('field_building_id').value;
-// if(building_id) {
-// populateResourceTable(building_id, YAHOO.booking.initialSelection);
-// }
-//
-// var ac =
YAHOO.booking.autocompleteHelper('index.php?menuaction=bookingfrontend.uibuilding.index&phpgw_return_as=json&',
-// 'field_building_name',
'field_building_id', 'building_container');
-// // Update the resource table as soon a new building is selected
-// ac.itemSelectEvent.subscribe(function(sType, aArgs) {
-// populateResourceTable(aArgs[2].id, []);
-// });
-//
-//
YAHOO.booking.autocompleteHelper('index.php?menuaction=bookingfrontend.uigroup.index&phpgw_return_as=json&',
-// 'field_group_name', 'field_group_id',
'group_container');
-//});
-//
-//YAHOO.booking.newApplicationForm = function(date, _from, _to) {
-// date = date ? date : YAHOO.booking.date;
-// _from = _from ? '%20' + _from: '';
-// _to = _to ? '%20' + _to: '';
-// var url = YAHOO.booking.newApplicationUrl;
-// var state = date.getFullYear() + '-' + (date.getMonth()+1) + '-' +
date.getDate();
-// url += '&from_[]=' + state + _from + '&to_[]=' + state + _to;
-// window.location.href = url;
-//}
-
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/booking_cancel.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/booking_cancel.xsl
2015-11-12 23:54:54 UTC (rev 14340)
+++ branches/dev-syncromind/bookingfrontend/templates/base/booking_cancel.xsl
2015-11-12 23:56:52 UTC (rev 14341)
@@ -182,32 +182,11 @@
<xsl:value-of select="php:function('lang', 'Cancel')"/>
</a>
</div>
-
-
- <!--dl class="form-col">
-
-
-
-
-
- </dl>
- <dl class="form-col">
-
-
- </dl>
- <div style='clear:left; padding:0; margin:0'/>
-
- <dl class="form-col">
-
- </dl-->
-
-
</form>
</div>
<script type="text/javascript">
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/resource_json"
/>';
</script>
<!--script type="text/javascript">
YAHOO.booking.season_id = '<xsl:value-of select="booking/season_id"/>';
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/booking_edit.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/booking_edit.xsl
2015-11-12 23:54:54 UTC (rev 14340)
+++ branches/dev-syncromind/bookingfrontend/templates/base/booking_edit.xsl
2015-11-12 23:56:52 UTC (rev 14341)
@@ -216,7 +216,6 @@
</form>
</div>
<script type="text/javascript">
- var group_id = '<xsl:value-of select="booking/group_id"/>';
var initialSelection = <xsl:value-of select="booking/resources_json"/>;
var initialAudience = <xsl:value-of select="booking/audience_json"/>;
var lang = <xsl:value-of select="php:function('js_lang','Name',
'Resource Type')"/>;
Modified: branches/dev-syncromind/bookingfrontend/templates/base/booking_new.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/booking_new.xsl
2015-11-12 23:54:54 UTC (rev 14340)
+++ branches/dev-syncromind/bookingfrontend/templates/base/booking_new.xsl
2015-11-12 23:56:52 UTC (rev 14341)
@@ -39,16 +39,10 @@
<dt><label for="field_building"><xsl:value-of
select="php:function('lang', 'Building')"/></label></dt>
<dd>
<input id="field_building_id" name="building_id"
type="hidden" value="{booking/building_id}"/>
- <input id="field_building_name" name="building_name"
type="text" value="{booking/building_name}" />
+ <xsl:value-of select="booking/building_name" />
</dd>
</dl>
<dl class="form-col">
- <dt><label for="field_season"><xsl:value-of
select="php:function('lang', 'Season')"/></label></dt>
- <dd>
- <div id="season_container"><span
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></span></div>
- </dd>
- </dl>
- <dl class="form-col">
<dt><label for="field_resources"><xsl:value-of
select="php:function('lang', 'Resources')"/></label></dt>
<dd>
<div id="resources_container"><span
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select a
building first')" /></span></div>
@@ -59,8 +53,7 @@
<dl class="form-col">
<dt><label for="field_org"><xsl:value-of
select="php:function('lang', 'Organization')"/></label></dt>
<dd>
- <input id="field_org_id" name="organization_id"
type="hidden" value="{booking/organization_id}" />
- <input id="field_org_name" name="organization_name"
type="text" value="{booking/organization_name}" />
+ <xsl:value-of select="booking/organization_name" />
</dd>
</dl>
<dl class="form-col">
@@ -244,8 +237,6 @@
</form>
</div>
<script type="text/javascript">
- 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 initialAudience = <xsl:value-of select="booking/audience_json" />;
var lang = <xsl:value-of select="php:function('js_lang', 'Name',
'Resource Type')"/>;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14341] fixing forms,
Saul <=