[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11205] bkbooking: stavanger update
|
From: |
Kjell Arne Espedal |
|
Subject: |
[Fmsystem-commits] [11205] bkbooking: stavanger update |
|
Date: |
Tue, 25 Jun 2013 12:58:21 +0000 |
Revision: 11205
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11205
Author: kjell
Date: 2013-06-25 12:55:54 +0000 (Tue, 25 Jun 2013)
Log Message:
-----------
bkbooking: stavanger update
Modified Paths:
--------------
branches/stavangerkommune/booking/inc/class.uiapplication.inc.php
branches/stavangerkommune/booking/inc/class.uibuilding.inc.php
branches/stavangerkommune/booking/inc/class.uigroup.inc.php
branches/stavangerkommune/booking/inc/class.uiorganization.inc.php
branches/stavangerkommune/booking/inc/class.uiresource.inc.php
branches/stavangerkommune/booking/setup/phpgw_no.lang
branches/stavangerkommune/booking/templates/base/application.xsl
Modified: branches/stavangerkommune/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uiapplication.inc.php
2013-06-25 12:22:14 UTC (rev 11204)
+++ branches/stavangerkommune/booking/inc/class.uiapplication.inc.php
2013-06-25 12:55:54 UTC (rev 11205)
@@ -791,10 +791,16 @@
$application['status'] = $application['status'];
// Check if any bookings, allocations or events are
associated with this application
$associations =
$this->assoc_bo->so->read(array('filters'=>array('application_id'=>$application['id']),'sort'=>'from_',
'dir' => 'asc'));
+ $from = array();
+ foreach($associations['results'] as $assoc)
+ {
+ $from[] =
$assoc['from_'];
+ }
+ $from = array("data" => implode(',',$from));
$num_associations = $associations['total_records'];
self::check_date_availability($application);
self::render_template('application',
array('application' => $application,
'audience' =>
$audience, 'agegroups' => $agegroups,
-
'num_associations'=>$num_associations,'comments' => $comments,'config' =>
$application_text));
+
'num_associations'=>$num_associations, 'assoc' =>$from, 'comments' =>
$comments,'config' => $application_text));
}
}
Modified: branches/stavangerkommune/booking/inc/class.uibuilding.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uibuilding.inc.php
2013-06-25 12:22:14 UTC (rev 11204)
+++ branches/stavangerkommune/booking/inc/class.uibuilding.inc.php
2013-06-25 12:55:54 UTC (rev 11205)
@@ -114,6 +114,10 @@
'label' =>
lang('District'),
),
array(
+ 'key' => 'active',
+ 'label' =>
lang('Active'),
+ ),
+ array(
'key' => 'link',
'hidden' => true
)
@@ -139,7 +143,7 @@
foreach($buildings['results'] as &$building)
{
$building['link'] =
$this->link(array('menuaction' => 'booking.uibuilding.show', 'id' =>
$building['id']));
- $building['active'] = $building['active'] ?
lang('Active') : lang('Inactive');
+# $building['active'] = $building['active'] ?
lang('Active') : lang('Inactive');
}
return $this->yui_results($buildings);
}
Modified: branches/stavangerkommune/booking/inc/class.uigroup.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uigroup.inc.php 2013-06-25
12:22:14 UTC (rev 11204)
+++ branches/stavangerkommune/booking/inc/class.uigroup.inc.php 2013-06-25
12:55:54 UTC (rev 11205)
@@ -160,6 +160,10 @@
'label' =>
lang('Email'),
),
array(
+ 'key' => 'active',
+ 'label' =>
lang('Active'),
+ ),
+ array(
'key' => 'link',
'hidden' => true
)
Modified: branches/stavangerkommune/booking/inc/class.uiorganization.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uiorganization.inc.php
2013-06-25 12:22:14 UTC (rev 11204)
+++ branches/stavangerkommune/booking/inc/class.uiorganization.inc.php
2013-06-25 12:55:54 UTC (rev 11205)
@@ -117,6 +117,10 @@
'label' => lang('Email')
),
array(
+ 'key' => 'active',
+ 'label' =>
lang('Active')
+ ),
+ array(
'key' => 'link',
'hidden' => true
)
Modified: branches/stavangerkommune/booking/inc/class.uiresource.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uiresource.inc.php
2013-06-25 12:22:14 UTC (rev 11204)
+++ branches/stavangerkommune/booking/inc/class.uiresource.inc.php
2013-06-25 12:55:54 UTC (rev 11205)
@@ -95,6 +95,10 @@
'key' =>
'building_district',
'label' =>
lang('District')
),
+ array(
+ 'key' => 'active',
+ 'label' =>
lang('Active'),
+ ),
)
)
);
Modified: branches/stavangerkommune/booking/setup/phpgw_no.lang
===================================================================
--- branches/stavangerkommune/booking/setup/phpgw_no.lang 2013-06-25
12:22:14 UTC (rev 11204)
+++ branches/stavangerkommune/booking/setup/phpgw_no.lang 2013-06-25
12:55:54 UTC (rev 11205)
@@ -281,6 +281,7 @@
Account Codes booking no Konteringsstreng
New Account Codes booking no Ny konteringsstreng
- Actions - booking no - Valg -
+- Created - booking no - Opprettet -
Create allocation booking no Lag tildeling
Create booking booking no Lag booking
Create event booking no Lag arrangement
Modified: branches/stavangerkommune/booking/templates/base/application.xsl
===================================================================
--- branches/stavangerkommune/booking/templates/base/application.xsl
2013-06-25 12:22:14 UTC (rev 11204)
+++ branches/stavangerkommune/booking/templates/base/application.xsl
2013-06-25 12:55:54 UTC (rev 11205)
@@ -3,6 +3,7 @@
<xsl:param name="true"/>
<xsl:param name="false"/>
+
<func:result>
<xsl:choose>
<xsl:when test="$test">
@@ -133,9 +134,17 @@
var bookingParams = {};
var eventParams = {};
</script>
+
+ <xsl:variable name='assocdata'>
+ <xsl:value-of select="assoc/data" />
+ </xsl:variable>
+ <dd></dd>
+
<xsl:for-each select="application/dates">
<dd><xsl:value-of select="php:function('lang',
'From')" />: <xsl:value-of select="php:function('pretty_timestamp',
from_)"/></dd>
<dd><xsl:value-of select="php:function('lang',
'To')" />: <xsl:value-of select="php:function('pretty_timestamp', to_)"/></dd>
+
+
<xsl:if test="../edit_link">
<script type="text/javascript">
allocationParams[<xsl:value-of
select="id"/>] = <xsl:value-of select="allocation_params"/>;
@@ -143,14 +152,20 @@
eventParams[<xsl:value-of
select="id"/>] = <xsl:value-of select="event_params"/>;
</script>
<select name="create"
onchange="if(this.selectedIndex==1)
YAHOO.booking.postToUrl('index.php?menuaction=booking.uiallocation.add',
allocationParams[{id}]); if(this.selectedIndex==2)
YAHOO.booking.postToUrl('index.php?menuaction=booking.uibooking.add',
eventParams[{id}]); if(this.selectedIndex==3)
YAHOO.booking.postToUrl('index.php?menuaction=booking.uievent.add',
eventParams[{id}]);">
+
<xsl:if
test="not(../case_officer/is_current_user)">
<xsl:attribute
name="disabled">disabled</xsl:attribute>
</xsl:if>
-
- <option><xsl:value-of
select="php:function('lang', '- Actions -')" /></option>
- <option><xsl:value-of
select="php:function('lang', 'Create allocation')" /></option>
- <option><xsl:value-of
select="php:function('lang', 'Create booking')" /></option>
- <option><xsl:value-of
select="php:function('lang', 'Create event')" /></option>
+
+ <xsl:if
test="not(contains($assocdata, from_))">
+ <option><xsl:value-of
select="php:function('lang', '- Actions -')" /></option>
+ <option><xsl:value-of
select="php:function('lang', 'Create allocation')" /></option>
+ <option><xsl:value-of
select="php:function('lang', 'Create booking')" /></option>
+ <option><xsl:value-of
select="php:function('lang', 'Create event')" /></option>
+ </xsl:if>
+ <xsl:if
test="contains($assocdata, from_)">
+ <option><xsl:value-of
select="php:function('lang', '- Created -')" /></option>
+ </xsl:if>
</select>
</xsl:if>
</xsl:for-each>
@@ -335,7 +350,7 @@
{key: 'type', label: lang['Type']},
{key: 'from_', label: lang['From']},
{key: 'to_', label: lang['To']},
- {key: 'active', label: lang['Active']}];
+ {key: 'active', label: lang['active']}];
YAHOO.booking.inlineTableHelper('associated_container', url2,
colDefs);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11205] bkbooking: stavanger update,
Kjell Arne Espedal <=