[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17370] booking: find resources in activity tree, tra
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17370] booking: find resources in activity tree, translations |
|
Date: |
Mon, 27 Nov 2017 09:00:43 -0500 (EST) |
Revision: 17370
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17370
Author: sigurdne
Date: 2017-11-27 09:00:43 -0500 (Mon, 27 Nov 2017)
Log Message:
-----------
booking: find resources in activity tree, translations
Modified Paths:
--------------
trunk/booking/inc/class.boactivity.inc.php
trunk/booking/setup/phpgw_no.lang
trunk/booking/templates/base/building_form.xsl
trunk/booking/templates/base/building_schedule.xsl
trunk/booking/templates/base/massbooking_schedule.xsl
trunk/booking/templates/base/resource_schedule.xsl
trunk/booking/templates/base/season_wtemplate.xsl
trunk/bookingfrontend/inc/class.uiresource.inc.php
trunk/bookingfrontend/setup/phpgw_no.lang
trunk/bookingfrontend/templates/base/building_schedule.xsl
trunk/bookingfrontend/templates/base/resource_schedule.xsl
trunk/phpgwapi/js/jquery/common.js
Modified: trunk/booking/inc/class.boactivity.inc.php
===================================================================
--- trunk/booking/inc/class.boactivity.inc.php 2017-11-27 09:53:26 UTC (rev
17369)
+++ trunk/booking/inc/class.boactivity.inc.php 2017-11-27 14:00:43 UTC (rev
17370)
@@ -67,6 +67,11 @@
return $this->so->get_path($id);
}
+ public function get_children( $parent, $level = 0, $reset =
false )
+ {
+ return $this->so->get_children($parent, $level, $reset);
+ }
+
public function get_top_level( $selected = 0 )
{
$values = $this->so->get_top_level();
Modified: trunk/booking/setup/phpgw_no.lang
===================================================================
--- trunk/booking/setup/phpgw_no.lang 2017-11-27 09:53:26 UTC (rev 17369)
+++ trunk/booking/setup/phpgw_no.lang 2017-11-27 14:00:43 UTC (rev 17370)
@@ -717,4 +717,5 @@
ssn is invalid booking no Fødselsnummeret er ikke gyldig
edit delegate booking no Endre delegert til
duplicate ssn booking no Duplikat av f.nr for samme organisasjon
-building show booking no Vis bygning
\ No newline at end of file
+building show booking no Vis bygning
+free booking no Ledig
\ No newline at end of file
Modified: trunk/booking/templates/base/building_form.xsl
===================================================================
--- trunk/booking/templates/base/building_form.xsl 2017-11-27 09:53:26 UTC
(rev 17369)
+++ trunk/booking/templates/base/building_form.xsl 2017-11-27 14:00:43 UTC
(rev 17370)
@@ -66,7 +66,14 @@
<xsl:value-of
select="php:function('lang', 'Location Code')" />
</label>
<input id="field_location_code"
name="location_code" type="hidden" value="{building/location_code}"/>
- <input id="field_location_code_name"
name="location_code_name" type="text" value="{building/location_code}"/>
+ <input id="field_location_code_name"
name="location_code_name" type="text" value="{building/location_code}">
+ <xsl:attribute
name="data-validation">
+
<xsl:text>required</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute
name="data-validation-error-msg">
+ <xsl:value-of
select="php:function('lang', 'Location Code')" />
+ </xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
<label for="field_street">
Modified: trunk/booking/templates/base/building_schedule.xsl
===================================================================
--- trunk/booking/templates/base/building_schedule.xsl 2017-11-27 09:53:26 UTC
(rev 17369)
+++ trunk/booking/templates/base/building_schedule.xsl 2017-11-27 14:00:43 UTC
(rev 17370)
@@ -46,6 +46,7 @@
</div>
</form>
<script type="text/javascript">
+ var lang = <xsl:value-of select="php:function('js_lang',
'free')"/>;
$(window).on('load', function() {
schedule.setupWeekPicker('cal_container');
schedule.datasourceUrl = '<xsl:value-of
select="building/datasource_url"/>';
Modified: trunk/booking/templates/base/massbooking_schedule.xsl
===================================================================
--- trunk/booking/templates/base/massbooking_schedule.xsl 2017-11-27
09:53:26 UTC (rev 17369)
+++ trunk/booking/templates/base/massbooking_schedule.xsl 2017-11-27
14:00:43 UTC (rev 17370)
@@ -52,7 +52,7 @@
</form>
<div id="dialog_schedule"></div>
<script type="text/javascript">
-
+ var lang = <xsl:value-of select="php:function('js_lang',
'free')"/>;
schedule.createDialogSchedule(300);
$(window).on('load', function() {
Modified: trunk/booking/templates/base/resource_schedule.xsl
===================================================================
--- trunk/booking/templates/base/resource_schedule.xsl 2017-11-27 09:53:26 UTC
(rev 17369)
+++ trunk/booking/templates/base/resource_schedule.xsl 2017-11-27 14:00:43 UTC
(rev 17370)
@@ -46,6 +46,7 @@
</div>
</form>
<script type="text/javascript">
+ var lang = <xsl:value-of select="php:function('js_lang',
'free')"/>;
$(window).on('load', function() {
schedule.setupWeekPicker('cal_container');
schedule.datasourceUrl = '<xsl:value-of
select="resource/datasource_url"/>';
Modified: trunk/booking/templates/base/season_wtemplate.xsl
===================================================================
--- trunk/booking/templates/base/season_wtemplate.xsl 2017-11-27 09:53:26 UTC
(rev 17369)
+++ trunk/booking/templates/base/season_wtemplate.xsl 2017-11-27 14:00:43 UTC
(rev 17370)
@@ -87,6 +87,7 @@
</div>
<script type="text/javascript">
+ var lang = <xsl:value-of select="php:function('js_lang',
'free')"/>;
var season_id = <xsl:value-of select="season/id"/>;
var resource_ids = <xsl:value-of
select="season/resources_json"/>;
var r = [{n: 'ResultSet'},{n: 'Result'}];
Modified: trunk/bookingfrontend/inc/class.uiresource.inc.php
===================================================================
--- trunk/bookingfrontend/inc/class.uiresource.inc.php 2017-11-27 09:53:26 UTC
(rev 17369)
+++ trunk/bookingfrontend/inc/class.uiresource.inc.php 2017-11-27 14:00:43 UTC
(rev 17370)
@@ -28,9 +28,16 @@
{
if ($sub_activity_id =
phpgw::get_var('sub_activity_id'))
{
- $activity_path =
ExecMethod('booking.boactivity.get_path', $sub_activity_id);
+
+ $boactivity =
createObject('booking.boactivity');
+ $activity_path =
$boactivity->get_path($sub_activity_id);
$top_level_activity = $activity_path ?
$activity_path[0]['id'] : -1;
- $_REQUEST['filter_activity_id'] =
$top_level_activity;
+
+ $filter_activity = array($top_level_activity);
+
+ $children =
$boactivity->get_children($top_level_activity);
+
+ $_REQUEST['filter_activity_id'] =
array_merge($filter_activity, $children);
}
return
$this->bo->populate_grid_data("bookingfrontend.uiresource.show");
}
Modified: trunk/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- trunk/bookingfrontend/setup/phpgw_no.lang 2017-11-27 09:53:26 UTC (rev
17369)
+++ trunk/bookingfrontend/setup/phpgw_no.lang 2017-11-27 14:00:43 UTC (rev
17370)
@@ -397,4 +397,5 @@
please enter a building name bookingfrontend no Angi et bygningsnavn
please select an activity bookingfrontend no Velg en aktivitet
select date bookingfrontend no Velg dato
-cancel event bookingfrontend no Avbestill
\ No newline at end of file
+cancel event bookingfrontend no Avbestill
+free bookingfrontend no Ledig
\ No newline at end of file
Modified: trunk/bookingfrontend/templates/base/building_schedule.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/building_schedule.xsl 2017-11-27
09:53:26 UTC (rev 17369)
+++ trunk/bookingfrontend/templates/base/building_schedule.xsl 2017-11-27
14:00:43 UTC (rev 17370)
@@ -59,6 +59,7 @@
<div id="dialog_schedule"></div>
<script type="text/javascript">
+ var lang = <xsl:value-of select="php:function('js_lang',
'free')"/>;
schedule.createDialogSchedule(300);
$(window).on('load', function() {
schedule.setupWeekPicker('cal_container');
Modified: trunk/bookingfrontend/templates/base/resource_schedule.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/resource_schedule.xsl 2017-11-27
09:53:26 UTC (rev 17369)
+++ trunk/bookingfrontend/templates/base/resource_schedule.xsl 2017-11-27
14:00:43 UTC (rev 17370)
@@ -60,6 +60,7 @@
<div id="dialog_schedule"></div>
<script type="text/javascript">
+ var lang = <xsl:value-of select="php:function('js_lang',
'free')"/>;
schedule.createDialogSchedule(300);
$(window).on('load', function(){
schedule.setupWeekPicker('cal_container');
Modified: trunk/phpgwapi/js/jquery/common.js
===================================================================
--- trunk/phpgwapi/js/jquery/common.js 2017-11-27 09:53:26 UTC (rev 17369)
+++ trunk/phpgwapi/js/jquery/common.js 2017-11-27 14:00:43 UTC (rev 17370)
@@ -1655,7 +1655,8 @@
}
else
{
- text = "free";
+ text = lang['free'] || "free";
+// text = "free";
classes = "free";
trFunction.push(
{
@@ -1737,7 +1738,8 @@
}
else
{
- text = "free";
+ text = lang['free'] || "free";
+// text = "free";
classes = "free";
trFunction.push(
{
@@ -1795,7 +1797,7 @@
}
else
{
- text = "free";
+ text = lang['free'] || "free";
classes = "free";
trFunction.push(
{
@@ -1839,7 +1841,8 @@
}
else
{
- text = "free";
+ text = lang['free'] || "free";
+// text = "free";
classes = "free";
}
@@ -1905,7 +1908,8 @@
}
else
{
- text = "free";
+ text = lang['free'] || "free";
+ // text = "free";
classes = "free";
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17370] booking: find resources in activity tree, translations,
sigurdne <=