[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6784] property: confugurable types of 'authorities d
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6784] property: confugurable types of 'authorities demand' in request module |
|
Date: |
Sun, 16 Jan 2011 18:46:35 +0000 |
Revision: 6784
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6784
Author: sigurdne
Date: 2011-01-16 18:46:34 +0000 (Sun, 16 Jan 2011)
Log Message:
-----------
property: confugurable types of 'authorities demand' in request module
Modified Paths:
--------------
trunk/property/inc/class.borequest.inc.php
trunk/property/inc/class.menu.inc.php
trunk/property/inc/class.sogeneric.inc.php
trunk/property/inc/class.uirequest.inc.php
trunk/property/setup/phpgw_no.lang
trunk/property/setup/setup.inc.php
trunk/property/setup/tables_current.inc.php
trunk/property/setup/tables_update.inc.php
trunk/property/templates/base/request.xsl
Modified: trunk/property/inc/class.borequest.inc.php
===================================================================
--- trunk/property/inc/class.borequest.inc.php 2011-01-16 15:20:24 UTC (rev
6783)
+++ trunk/property/inc/class.borequest.inc.php 2011-01-16 18:46:34 UTC (rev
6784)
@@ -192,6 +192,7 @@
function select_conditions($request_id='')
{
+ $conditions = array();
$condition_type_list =
$this->so->select_condition_type_list();
if($request_id)
@@ -201,9 +202,9 @@
for ($i=0;$i<count($condition_type_list);$i++)
{
- $conditions[$i]['degree']
= $this->select_degree_list($conditions[$i]['degree']);
- $conditions[$i]['probability']
= $this->select_probability_list($conditions[$i]['probability']);
- $conditions[$i]['consequence']
= $this->select_consequence_list($conditions[$i]['consequence']);
+ $conditions[$i]['degree']
= array('options' =>
$this->select_degree_list($conditions[$i]['degree']));
+ $conditions[$i]['probability']
= array('options' =>
$this->select_probability_list($conditions[$i]['probability']));
+ $conditions[$i]['consequence']
= array('options' =>
$this->select_consequence_list($conditions[$i]['consequence']));
$conditions[$i]['condition_type']
= $condition_type_list[$i]['id'];
$conditions[$i]['condition_type_name'] =
$condition_type_list[$i]['name'];
}
Modified: trunk/property/inc/class.menu.inc.php
===================================================================
--- trunk/property/inc/class.menu.inc.php 2011-01-16 15:20:24 UTC (rev
6783)
+++ trunk/property/inc/class.menu.inc.php 2011-01-16 18:46:34 UTC (rev
6784)
@@ -400,6 +400,11 @@
'text' =>
lang('Request condition_type'),
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uigeneric.index', 'type' => 'r_condition_type') )
),
+ 'authorities_demands' => array
+ (
+ 'text' =>
lang('authorities demands'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uigeneric.index', 'type' => 'authorities_demands') )
+ ),
'request_attribs' => array
(
'text' =>
lang('request Attributes'),
@@ -642,7 +647,7 @@
$menus['navigation']['helpdesk']['children']['response_template'] = array
(
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uigeneric.index', 'type' => 'response_template') ),
- 'text' => lang('order template'),
+ 'text' => lang('response template'),
'image' => array('property',
'helpdesk')
);
Modified: trunk/property/inc/class.sogeneric.inc.php
===================================================================
--- trunk/property/inc/class.sogeneric.inc.php 2011-01-16 15:20:24 UTC (rev
6783)
+++ trunk/property/inc/class.sogeneric.inc.php 2011-01-16 18:46:34 UTC (rev
6784)
@@ -894,11 +894,39 @@
),
'edit_msg' => lang('edit'),
'add_msg' => lang('add'),
- 'name' => '',
+ 'name' => 'condition
type',
'acl_location' => '.admin',
'menu_selection' =>
'admin::property::request_condition'
);
break;
+ case 'authorities_demands':
+ $info = array
+ (
+ 'table' =>
'fm_authorities_demands',
+ 'id'
=> array('name' => 'id', 'type' => 'int'),
+ 'fields'
=> array
+ (
+ array
+ (
+ 'name' =>
'name',
+ 'descr' =>
lang('name'),
+ 'type' =>
'varchar'
+ )
+ ),
+ 'edit_msg' => lang('edit'),
+ 'add_msg' => lang('add'),
+ 'name' =>
lang('authorities demands'),
+ 'acl_location' => '.admin',
+ 'menu_selection' =>
'admin::property::authorities_demands',
+ 'default'
=> array
+ (
+ 'user_id'
=> array('add' => '$this->account'),
+ 'entry_date' =>
array('add' => 'time()'),
+ 'modified_date' =>
array('edit' => 'time()'),
+ ),
+ 'check_grant' => false
+ );
+ break;
case 'b_account':
$info = array
(
Modified: trunk/property/inc/class.uirequest.inc.php
===================================================================
--- trunk/property/inc/class.uirequest.inc.php 2011-01-16 15:20:24 UTC (rev
6783)
+++ trunk/property/inc/class.uirequest.inc.php 2011-01-16 18:46:34 UTC (rev
6784)
@@ -1300,13 +1300,12 @@
'lang_no_user'
=> lang('Select coordinator'),
'user_list'
=>
$this->bocommon->get_user_list_right2('select',4,$values['coordinator'],$this->acl_location),
- 'status_list'
=> $this->bo->select_status_list('select',$values['status']),
- 'status_name'
=> 'values[status]',
+ 'status_list'
=> array('options' =>
$this->bo->select_status_list('select',$values['status'])),
'lang_no_status'
=> lang('Select status'),
'lang_status'
=> lang('Status'),
'lang_status_statustext'
=> lang('What is the current status of this request ?'),
- 'branch_list'
=> $this->boproject->select_branch_list($values['branch_id']),
+ 'branch_list'
=> array('options' =>
$this->boproject->select_branch_list($values['branch_id'])),
'lang_branch'
=> lang('branch'),
'lang_no_branch'
=> lang('Select branch'),
'lang_branch_statustext'
=> lang('Select the branches for this request'),
@@ -1318,12 +1317,10 @@
'currency'
=>
$GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],
- 'lang_authorities_demands'
=> lang('Authorities Demands'),
- 'lang_authorities_demands_statustext'
=> lang('Is there a demand from the authorities to correct this condition?'),
- 'authorities_demands'
=> $values['authorities_demands'],
+ 'authorities_demands'
=> array('options' =>
execMethod('property.bogeneric.get_list',array('type' => 'authorities_demands',
'selected' => $values['authorities_demands']))),
'condition_list'
=> $this->bo->select_conditions($id),
- 'building_part_list'
=> array('status_list' =>
$this->bocommon->select_category_list(array('type'=> 'building_part','selected'
=>$values['building_part'], 'order' => 'id', 'id_in_name' => 'num' ))),
+ 'building_part_list'
=> array('options' =>
$this->bocommon->select_category_list(array('type'=> 'building_part','selected'
=>$values['building_part'], 'order' => 'id', 'id_in_name' => 'num' ))),
);
phpgwapi_yui::load_widget('dragdrop');
Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang 2011-01-16 15:20:24 UTC (rev 6783)
+++ trunk/property/setup/phpgw_no.lang 2011-01-16 18:46:34 UTC (rev 6784)
@@ -199,7 +199,7 @@
attributes for the location type property no Attributter for
lokaliserings type
attributes for the standard property no verdier for standard
a unique code for this activity property no En unik kode fo
denne aktiviteten
-authorities demands property no Offentlige pålegg
+authorities demands property no Myndighetskrav
auto tax property no Auto MVA
b_account property no Budsjett konto
back to admin property no Tilbake til Admin
@@ -494,6 +494,7 @@
dim b property no Kostnadssted
dimb property no Kostnadssted
dimb roles property no Roller kostnadssted
+no authorities demands property no Ingen myndighetskrav
no dimb property no K Ikke valgt
dim d property no Dim D
directory created property no katalog er opprettet
@@ -870,7 +871,7 @@
invoice tranferred property no bilag er overført
is id property no Er ID
is registered property no er registert
-is there a demand from the authorities to correct this condition?
property no Finnes det offentlige pålegg fo å rette opp tilstanden?
+is there a demand from the authorities to correct this condition?
property no Finnes det myndighetskrav for å rette opp tilstanden?
items property no Detaljer
janitor property no Bestiller
jasper reports property no JasperReports
Modified: trunk/property/setup/setup.inc.php
===================================================================
--- trunk/property/setup/setup.inc.php 2011-01-16 15:20:24 UTC (rev 6783)
+++ trunk/property/setup/setup.inc.php 2011-01-16 18:46:34 UTC (rev 6784)
@@ -12,7 +12,7 @@
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.605';
+ $setup_info['property']['version'] = '0.9.17.606';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
@@ -110,6 +110,7 @@
'fm_wo_hours_category',
'fm_wo_h_deviation',
'fm_key_loc',
+ 'fm_authorities_demands',
'fm_request',
'fm_request_condition_type',
'fm_request_condition',
Modified: trunk/property/setup/tables_current.inc.php
===================================================================
--- trunk/property/setup/tables_current.inc.php 2011-01-16 15:20:24 UTC (rev
6783)
+++ trunk/property/setup/tables_current.inc.php 2011-01-16 18:46:34 UTC (rev
6784)
@@ -748,6 +748,19 @@
'ix' => array(),
'uc' => array()
),
+ 'fm_authorities_demands' => array(
+ 'fd' => array(
+ 'id' => array('type' => 'int','precision' =>
'4','nullable' => False),
+ 'name' => array('type' => 'varchar',
'precision' => 200,'nullable' => False),
+ 'user_id' => array('type' => 'int', 'precision'
=> 4,'nullable' => True),
+ 'entry_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'modified_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ ),
+ 'pk' => array('id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ ),
'fm_request' => array(
'fd' => array(
'id' => array('type' => 'int','precision' =>
'4','nullable' => False),
Modified: trunk/property/setup/tables_update.inc.php
===================================================================
--- trunk/property/setup/tables_update.inc.php 2011-01-16 15:20:24 UTC (rev
6783)
+++ trunk/property/setup/tables_update.inc.php 2011-01-16 18:46:34 UTC (rev
6784)
@@ -4941,4 +4941,37 @@
return $GLOBALS['setup_info']['property']['currentver'];
}
}
-
+
+ /**
+ * Update property version from 0.9.17.605 to 0.9.17.606
+ * Add authorities demands type to request
+ *
+ */
+
+ $test[] = '0.9.17.605';
+ function property_upgrade0_9_17_605()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $GLOBALS['phpgw_setup']->oProc->CreateTable(
+ 'fm_authorities_demands', array(
+ 'fd' => array(
+ 'id' => array('type' => 'int',
'precision' => 4,'nullable' => False),
+ 'name' => array('type' => 'varchar',
'precision' => 200,'nullable' => False),
+ 'user_id' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'entry_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'modified_date' => array('type' =>
'int', 'precision' => 4,'nullable' => True),
+ ),
+ 'pk' => array('id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ )
+ );
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.606';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
Modified: trunk/property/templates/base/request.xsl
===================================================================
--- trunk/property/templates/base/request.xsl 2011-01-16 15:20:24 UTC (rev
6783)
+++ trunk/property/templates/base/request.xsl 2011-01-16 18:46:34 UTC (rev
6784)
@@ -325,7 +325,7 @@
<option value="0">
<xsl:value-of select="php:function('lang', 'select building part')" />
</option>
-
<xsl:apply-templates select="building_part_list/status_list"/>
+
<xsl:apply-templates select="building_part_list/options"/>
</select>
</td>
</tr>
@@ -338,11 +338,17 @@
</td>
</tr>
<tr>
- <td>
-
<xsl:value-of select="lang_status"/>
+ <td
valign="top">
+
<xsl:value-of select="php:function('lang', 'status')" />
</td>
<td>
-
<xsl:call-template name="status_select"/>
+ <select
name="values[status]" class="forms">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'Set the status of the
ticket')" />
+
</xsl:attribute>
+
<option value="0"><xsl:value-of select="php:function('lang', 'no status')"
/></option>
+
<xsl:apply-templates select="status_list/options"/>
+
</select>
</td>
</tr>
<tr>
@@ -351,10 +357,8 @@
</td>
<td>
<input
type="text" id="values_start_date" name="values[start_date]" size="10"
value="{value_start_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+
<xsl:attribute name="title">
<xsl:value-of select="lang_start_date_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
<img
id="values_start_date-trigger" src="{img_cal}" alt="{lang_datetitle}"
title="{lang_datetitle}" style="cursor:pointer; cursor:hand;" />
@@ -366,10 +370,8 @@
</td>
<td>
<input
type="text" id="values_end_date" name="values[end_date]" size="10"
value="{value_end_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+
<xsl:attribute name="title">
<xsl:value-of select="lang_end_date_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
<img
id="values_end_date-trigger" src="{img_cal}" alt="{lang_datetitle}"
title="{lang_datetitle}" style="cursor:pointer; cursor:hand;" />
@@ -381,9 +383,9 @@
</td>
<td>
<xsl:variable name="lang_branch_statustext"><xsl:value-of
select="lang_branch_statustext"/></xsl:variable>
- <select
name="values[branch_id]" class="forms"
onMouseover="window.status='{$lang_branch_statustext}'; return true;"
onMouseout="window.status='';return true;">
+ <select
name="values[branch_id]" class="forms" title="{$lang_branch_statustext}">
<option value=""><xsl:value-of select="lang_no_branch"/></option>
-
<xsl:apply-templates select="branch_list"/>
+
<xsl:apply-templates select="branch_list/options"/>
</select>
</td>
</tr>
@@ -426,25 +428,17 @@
<xsl:apply-templates select="condition_list"/>
<tr>
<td align="left">
-
<xsl:value-of select="lang_authorities_demands"/>
+
<xsl:value-of select="php:function('lang', 'Authorities
Demands')" />
</td>
+
<td>
-
<xsl:choose>
-
<xsl:when test="authorities_demands='1'">
-
<input type="checkbox"
name="values[authorities_demands]" value="1" checked="checked">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="lang_authorities_demands_statustext"/>
-
</xsl:attribute>
-
</input>
-
</xsl:when>
-
<xsl:otherwise>
-
<input type="checkbox"
name="values[authorities_demands]" value="1">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="lang_authorities_demands_statustext"/>
-
</xsl:attribute>
-
</input>
-
</xsl:otherwise>
-
</xsl:choose>
+
<select name="values[authorities_demands]" class="forms">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'Is
there a demand from the authorities to correct this condition?')" />
+
</xsl:attribute>
+
<option value="0"><xsl:value-of
select="php:function('lang', 'no demands')" /></option>
+
<xsl:apply-templates
select="authorities_demands/options"/>
+
</select>
</td>
</tr>
<xsl:call-template name="attributes"/>
@@ -584,20 +578,20 @@
</td>
<td class="small_text" align="center">
<xsl:variable
name="lang_degree_statustext"><xsl:value-of
select="//lang_degree_statustext"/></xsl:variable>
- <select
name="values[condition][{condition_type}][degree]" class="forms"
onMouseover="window.status='{$lang_degree_statustext}'; return true;"
onMouseout="window.status='';return true;">
- <xsl:apply-templates select="degree"/>
+ <select
name="values[condition][{condition_type}][degree]" class="forms"
title="{$lang_degree_statustext}">
+ <xsl:apply-templates
select="degree/options"/>
</select>
</td>
<td class="small_text" align="center">
<xsl:variable
name="lang_probability_statustext"><xsl:value-of
select="//lang_probability_statustext"/></xsl:variable>
- <select
name="values[condition][{condition_type}][probability]" class="forms"
onMouseover="window.status='{$lang_probability_statustext}'; return true;"
onMouseout="window.status='';return true;">
- <xsl:apply-templates
select="probability"/>
+ <select
name="values[condition][{condition_type}][probability]" class="forms"
title="{$lang_probability_statustext}">
+ <xsl:apply-templates
select="probability/options"/>
</select>
</td>
<td class="small_text" align="center">
<xsl:variable
name="lang_consequence_statustext"><xsl:value-of
select="//lang_consequence_statustext"/></xsl:variable>
- <select
name="values[condition][{condition_type}][consequence]" class="forms"
onMouseover="window.status='{$lang_consequence_statustext}'; return true;"
onMouseout="window.status='';return true;">
- <xsl:apply-templates
select="consequence"/>
+ <select
name="values[condition][{condition_type}][consequence]" class="forms"
title="{$lang_consequence_statustext}">
+ <xsl:apply-templates
select="consequence/options"/>
</select>
</td>
</tr>
@@ -639,275 +633,15 @@
</tr>
</xsl:template>
-
- <xsl:template match="degree">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="selected">
- <option value="{$id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:template match="options">
+ <option value="{id}">
+ <xsl:if test="selected != 0">
+ <xsl:attribute name="selected" value="selected"
/>
+ </xsl:if>
+ <xsl:value-of disable-output-escaping="yes"
select="name"/>
+ </option>
</xsl:template>
- <xsl:template match="probability">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="selected">
- <option value="{$id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="consequence">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="selected">
- <option value="{$id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
-
-
- <xsl:template match="branch_list">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="selected">
- <option value="{$id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="degree_list_safety">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="selected">
- <option value="{$id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="degree_list_aesthetics">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="selected">
- <option value="{$id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="degree_list_indoor_climate">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="selected">
- <option value="{$id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="degree_list_consequential_damage">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="selected">
- <option value="{$id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="degree_list_user_gratification">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="selected">
- <option value="{$id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="degree_list_residential_environment">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="selected">
- <option value="{$id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="probability_list_safety">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="selected">
- <option value="{$id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="probability_list_aesthetics">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="selected">
- <option value="{$id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
-
- <xsl:template match="probability_list_indoor_climate">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="selected">
- <option value="{$id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="probability_list_consequential_damage">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="selected">
- <option value="{$id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="probability_list_user_gratification">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="selected">
- <option value="{$id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="probability_list_residential_environment">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="selected">
- <option value="{$id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="consequence_list_safety">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="selected">
- <option value="{$id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="consequence_list_aesthetics">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="selected">
- <option value="{$id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="consequence_list_indoor_climate">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="selected">
- <option value="{$id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="consequence_list_consequential_damage">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="selected">
- <option value="{$id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="consequence_list_user_gratification">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="selected">
- <option value="{$id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="consequence_list_residential_environment">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="selected">
- <option value="{$id}"
selected="selected"><xsl:value-of disable-output-escaping="yes"
select="name"/></option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="name"/></option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
-
<xsl:template match="table_header_history">
<tr class="th">
<td class="th_text" width="20%" align="left">
@@ -1124,7 +858,7 @@
<td>
<xsl:value-of
select="lang_status"/>
</td>
- <xsl:for-each select="status_list" >
+ <xsl:for-each
select="status_list/options" >
<xsl:choose>
<xsl:when
test="selected">
<td>
@@ -1154,7 +888,7 @@
<td valign="top">
<xsl:value-of
select="lang_branch"/>
</td>
- <xsl:for-each select="branch_list" >
+ <xsl:for-each
select="branch_list/options" >
<xsl:choose>
<xsl:when
test="selected">
<td>
@@ -1252,5 +986,3 @@
</div>
<hr noshade="noshade" width="100%" align="center" size="1"/>
</xsl:template>
-
-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6784] property: confugurable types of 'authorities demand' in request module,
Sigurd Nes <=