[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10972] property: condition survey / request
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10972] property: condition survey / request |
|
Date: |
Thu, 07 Mar 2013 14:33:42 +0000 |
Revision: 10972
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10972
Author: sigurdne
Date: 2013-03-07 14:33:39 +0000 (Thu, 07 Mar 2013)
Log Message:
-----------
property: condition survey / request
Modified Paths:
--------------
trunk/property/inc/class.bocommon.inc.php
trunk/property/inc/class.borequest.inc.php
trunk/property/inc/class.soproject.inc.php
trunk/property/inc/class.sorequest.inc.php
trunk/property/inc/class.uiproject.inc.php
trunk/property/inc/class.uirequest.inc.php
trunk/property/inc/class.uiworkorder.inc.php
trunk/property/setup/phpgw_no.lang
trunk/property/setup/tables_current.inc.php
trunk/property/setup/tables_update.inc.php
trunk/property/templates/base/request.xsl
trunk/property/templates/base/tts.xsl
Modified: trunk/property/inc/class.bocommon.inc.php
===================================================================
--- trunk/property/inc/class.bocommon.inc.php 2013-03-06 14:36:04 UTC (rev
10971)
+++ trunk/property/inc/class.bocommon.inc.php 2013-03-07 14:33:39 UTC (rev
10972)
@@ -1139,6 +1139,9 @@
$cols_extra = array();
$cols_return_lookup = array();
+ $GLOBALS['phpgw']->config->read();
+ $list_location_level =
isset($GLOBALS['phpgw']->config->config_data['list_location_level']) &&
$GLOBALS['phpgw']->config->config_data['list_location_level'] ?
$GLOBALS['phpgw']->config->config_data['list_location_level'] : array();
+
$soadmin_location =
CreateObject('property.soadmin_location');
$location_types =
$soadmin_location->select_location_type();
$config = $soadmin_location->read_config('');
@@ -1168,16 +1171,13 @@
$no_address = true;
}
- $GLOBALS['phpgw']->config->read();
- $list_location_level =
isset($GLOBALS['phpgw']->config->config_data['list_location_level']) &&
$GLOBALS['phpgw']->config->config_data['list_location_level'] ?
$GLOBALS['phpgw']->config->config_data['list_location_level'] : array();
-
$this->type_id = $type_id;
$_level = 1;
for ($i=0; $i<$type_id; $i++)
{
- // if($_level > 1) // very expensive
- if($_level == 2 && in_array(2,
$list_location_level))
+ if($_level > 1) // very expensive
+ // if($_level == 2 && in_array(2,
$list_location_level))
{
$joinmethod .= " {$this->left_join}
fm_location{$_level}";
$paranthesis .='(';
Modified: trunk/property/inc/class.borequest.inc.php
===================================================================
--- trunk/property/inc/class.borequest.inc.php 2013-03-06 14:36:04 UTC (rev
10971)
+++ trunk/property/inc/class.borequest.inc.php 2013-03-07 14:33:39 UTC (rev
10972)
@@ -252,7 +252,8 @@
$degree_comment[1]=' - '.lang('minor symptoms');
$degree_comment[2]=' - '.lang('medium symptoms');
$degree_comment[3]=' - '.lang('serious symptoms');
- for ($i=0; $i<=3; $i++)
+ $degree_comment[4]=' - '.lang('condition not assessed');
+ for ($i=0; $i<=4; $i++)
{
$degree_list[$i]['id'] = $i;
$degree_list[$i]['name'] = $i .
$degree_comment[$i];
Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php 2013-03-06 14:36:04 UTC (rev
10971)
+++ trunk/property/inc/class.soproject.inc.php 2013-03-07 14:33:39 UTC (rev
10972)
@@ -2776,8 +2776,7 @@
function check_request($request_id)
{
- $target =
$this->interlink->get_specific_relation('property', '.project.request',
'.project', $request_id);
-
+ $target =
$this->interlink->get_specific_relation('property', '.project.request',
'.project', $request_id, 'target');
if ( $target)
{
return $target[0];
@@ -2788,7 +2787,7 @@
{
for ($i=0;$i<count($add_request['request_id']);$i++)
{
-
$project_id=$this->check_request($add_request['request_id'][$i]);
+ $project_id =
$this->check_request($add_request['request_id'][$i]);
if(!$project_id)
{
@@ -2803,7 +2802,7 @@
$this->interlink->add($interlink_data);
- $this->db->query("UPDATE fm_request SET
project_id='$id' where id='". $add_request['request_id'][$i] .
"'",__LINE__,__FILE__);
+ $this->db->query("UPDATE fm_request SET
project_id='$id' WHERE id='". $add_request['request_id'][$i] .
"'",__LINE__,__FILE__);
$receipt['message'][] =
array('msg'=>lang('request %1 has been added',$add_request['request_id'][$i]));
}
Modified: trunk/property/inc/class.sorequest.inc.php
===================================================================
--- trunk/property/inc/class.sorequest.inc.php 2013-03-06 14:36:04 UTC (rev
10971)
+++ trunk/property/inc/class.sorequest.inc.php 2013-03-07 14:33:39 UTC (rev
10972)
@@ -367,12 +367,12 @@
$cols_return[] =
"in_progress_date";
$cols_return[] =
"delivered_date";
- $cols_group[] =
"{$entity_table}.start_date";
+// $cols_group[] =
"{$entity_table}.start_date";
$cols_group[] =
"{$entity_table}.entry_date";
$cols_group[] =
"{$entity_table}.closed_date";
$cols_group[] =
"{$entity_table}.in_progress_date";
$cols_group[] =
"{$entity_table}.delivered_date";
-
+/*
$uicols['input_type'][] = 'text';
$uicols['name'][] = 'start_date';
$uicols['descr'][] = lang('start
date');
@@ -383,14 +383,14 @@
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
$uicols['sortable'][] = true;
+*/
-
$cols.= ",$entity_table.title as title";
$cols_return[] = 'title';
$cols_group[] = "title";
$uicols['input_type'][] = 'text';
$uicols['name'][] = 'title';
- $uicols['descr'][] = lang('request
description');
+ $uicols['descr'][] = lang('request
title');
$uicols['statustext'][] = lang('Request title');
$uicols['exchange'][] = '';
$uicols['align'][] = '';
@@ -502,9 +502,23 @@
$uicols['sortable'][] = true;
- $cols.= ",min(fm_request_planning.date) as
planned_year";
+ $cols.= ",recommended_year";
+ $cols_return[] =
'recommended_year';
+ $cols_group[] =
'recommended_year';
+ $uicols['input_type'][] = 'text';
+ $uicols['name'][] =
'recommended_year';
+ $uicols['descr'][] =
lang('recommended year');
+ $uicols['statustext'][] = lang('recommended
year');
+ $uicols['exchange'][] = '';
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
+ $uicols['sortable'][] = true;
+
+ $cols.= ",start_date AS planned_year";
$cols_return[] =
'planned_year';
-// $cols_group[] =
'planned_year';
+ $cols_group[] = 'start_date';
$uicols['input_type'][] = 'text';
$uicols['name'][] =
'planned_year';
$uicols['descr'][] = lang('planned
year');
@@ -835,6 +849,7 @@
$amount_operation =
$this->_db->f('amount_operation');
$amount_potential_grants =
$this->_db->f('amount_potential_grants');
$budget = $amount_investment +
$amount_operation;
+ $recommended_year =
$this->_db->f('recommended_year');
$request = array
(
@@ -852,7 +867,7 @@
'owner'
=> $this->_db->f('owner'),
'coordinator'
=> $this->_db->f('coordinator'),
'responsible_unit'
=> $this->_db->f('responsible_unit'),
- 'recommended_year'
=> $this->_db->f('recommended_year'),
+ 'recommended_year'
=> $recommended_year ? $recommended_year : '',//hide '0' - which is needed for
sorting
'access'
=> $this->_db->f('access'),
'start_date'
=> $this->_db->f('start_date'),
'end_date'
=> $this->_db->f('end_date'),
@@ -1001,7 +1016,7 @@
$value_set['regulations']
= $request['regulations'] ? ',' . implode(',',$request['regulations']) . ',' :
'';
$value_set['condition_survey_id'] =
$request['condition_survey_id'];
$value_set['responsible_unit'] =
$request['responsible_unit'];
- $value_set['recommended_year'] =
$request['recommended_year'];
+ $value_set['recommended_year'] = (int)
$request['recommended_year'];
$cols = implode(',', array_keys($value_set));
$values =
$this->_db->validate_insert(array_values($value_set));
@@ -1145,7 +1160,7 @@
'building_part' =>
$request['building_part'],
'regulations' =>
$request['regulations'] ? ',' . implode(',',$request['regulations']) . ',' : '',
'responsible_unit' =>
$request['responsible_unit'],
- 'recommended_year' =>
$request['recommended_year']
+ 'recommended_year' =>
(int) $request['recommended_year'],
);
while (is_array($request['location']) &&
list($input_name,$value) = each($request['location']))
Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php 2013-03-06 14:36:04 UTC (rev
10971)
+++ trunk/property/inc/class.uiproject.inc.php 2013-03-07 14:33:39 UTC (rev
10972)
@@ -1049,10 +1049,14 @@
}
}
+ $bypass = phpgw::get_var('bypass', 'bool');
+ if ( phpgw::get_var('origin') ==
'.project.request' && phpgw::get_var('origin_id', 'int') )
+ {
+ $id = phpgw::get_var('project_id',
'int');
+ $add_request = array('request_id'=>
array(phpgw::get_var('origin_id', 'int')));
+ }
- $bypass = phpgw::get_var('bypass', 'bool');
-
if($add_request)
{
$receipt =
$this->bo->add_request($add_request,$id);
@@ -1076,7 +1080,6 @@
$origin =
phpgw::get_var('origin');
$origin_id =
phpgw::get_var('origin_id', 'int');
- //23.jun 08: This will be handled by
the interlink code - just doing a quick hack for now...
if($origin == '.ticket' && $origin_id
&& !$values['descr'])
{
$boticket=
CreateObject('property.botts');
Modified: trunk/property/inc/class.uirequest.inc.php
===================================================================
--- trunk/property/inc/class.uirequest.inc.php 2013-03-06 14:36:04 UTC (rev
10971)
+++ trunk/property/inc/class.uirequest.inc.php 2013-03-07 14:33:39 UTC (rev
10972)
@@ -1715,6 +1715,7 @@
'value_amount_investment'
=> number_format($values['amount_investment'], 0, ',', ' '),
'value_amount_operation'
=> number_format($values['amount_operation'], 0, ',', ' '),
+ 'loc1'
=> $values['location_data']['loc1'],
'location_data2'
=> $location_data,
// 'location_type'
=> 'form2',
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
@@ -1750,6 +1751,7 @@
'lang_status_statustext'
=> lang('What is the current status of this request ?'),
'responsible_unit_list'
=> array('options' =>
$this->bocommon->select_category_list(array('type'=>
'request_responsible_unit','selected' =>$values['responsible_unit'], 'order' =>
'id', 'fields' => array('descr')))),
+ 'value_recommended_year'
=> $values['recommended_year'],
'branch_list'
=> array('options' =>
$this->boproject->select_branch_list($values['branch_id'])),
'lang_branch'
=> lang('branch'),
@@ -1861,7 +1863,6 @@
$tabs = array
(
'general' =>
array('label' => lang('general'), 'link' => '#general'),
- 'condition' =>
array('label' => lang('condition'), 'link' => '#condition'),
'budget' =>
array('label' => lang('documents'), 'link' => '#documents'),
'history' =>
array('label' => lang('history'), 'link' => '#history')
);
Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php 2013-03-06 14:36:04 UTC
(rev 10971)
+++ trunk/property/inc/class.uiworkorder.inc.php 2013-03-07 14:33:39 UTC
(rev 10972)
@@ -934,8 +934,7 @@
$values['location_data'] =
$ticket['location_data'];
}
-
- if ( preg_match("/(^.entity.|^.catch.)/i",
$origin) && $origin_id )
+ else if ( preg_match("/(^.entity.|^.catch.)/i",
$origin) && $origin_id )
{
$_origin = explode('.', $origin);
$_boentity=
CreateObject('property.boentity', false, $_origin[1], $_origin[2], $_origin[3]);
@@ -945,6 +944,17 @@
unset($_boentity);
unset($_entity);
}
+ else if ( $origin == '.project.request' &&
$origin_id )
+ {
+ $_borequest =
CreateObject('property.borequest', false);
+ $_request =
$_borequest->read_single($origin_id, array(),true);
+ $values['descr'] = $_request['descr'];
+ $values['title'] = $_request['title'];
+ $values['location_data'] =
$_request['location_data'];
+ unset($_origin);
+ unset($_borequest);
+ unset($_request);
+ }
if(isset($values['origin']) &&
$values['origin'])
{
Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang 2013-03-06 14:36:04 UTC (rev 10971)
+++ trunk/property/setup/phpgw_no.lang 2013-03-07 14:33:39 UTC (rev 10972)
@@ -381,6 +381,7 @@
periodization property no Periodisering
periodization start property no Startperiode
periodization outline property no Periodiseringsfordeling
+planned year property no Planlagt år
planning property no Planlagt
planning date property no Dato planlagt disponering
planning value property no Beløp planlagt disponering
@@ -1966,16 +1967,17 @@
closed date property no Avsluttet dato
cost categories property no Kostnadskategori
negative value for budget property no Negativ verdi for
kostnadsestimat
-no symptoms property no Ingen Symptomer
-minor symptoms property no Svake Symptomer
-medium symptoms property no Middels Symptomer
-serious symptoms property no Kraftige Symptomer
+no symptoms property no Ingen avvik
+minor symptoms property no Ikke vesentlig avvik
+medium symptoms property no Vesentlig avvik
+serious symptoms property no Stort eller vesentlig avvik
+condition not assessed property no Ikke udersøkt. Mulig risiko
low probability property no Liten sannsynlighet
medium probability property no Middels sannsynlighet
modified date property no Oppdatert dato
high probability property no Stor sannsynlighet
-weight property property no Vekt
-risk property property no Risiko
+weight property no Vekt
+risk property no Risiko
elements_pr_page property no Poster pr side
shows_from property no Viser
of_total property no av
Modified: trunk/property/setup/tables_current.inc.php
===================================================================
--- trunk/property/setup/tables_current.inc.php 2013-03-06 14:36:04 UTC (rev
10971)
+++ trunk/property/setup/tables_current.inc.php 2013-03-07 14:33:39 UTC (rev
10972)
@@ -886,7 +886,7 @@
'responsible_unit' => array('type' =>
'int','precision' => '4','nullable' => True),
'authorities_demands' => array('type' =>
'int','precision' => '2','default' => '0','nullable' => True),
'score' => array('type' => 'int','precision' =>
'4','default' => '0','nullable' => True),
- 'recommended_year' => array('type' =>
'int','precision' => '4','nullable' => True),
+ 'recommended_year' => array('type' =>
'int','precision' => '4','default' => '0','nullable' => True),
'start_date' => array('type' =>
'int','precision' => '8','default' => '0','nullable' => True),
'end_date' => array('type' => 'int','precision'
=> '8','default' => '0','nullable' => True),
'building_part'=> array('type' =>
'varchar','precision' => 4,'nullable' => True),
Modified: trunk/property/setup/tables_update.inc.php
===================================================================
--- trunk/property/setup/tables_update.inc.php 2013-03-06 14:36:04 UTC (rev
10971)
+++ trunk/property/setup/tables_update.inc.php 2013-03-07 14:33:39 UTC (rev
10972)
@@ -7436,6 +7436,7 @@
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_request','recommended_year',array(
'type' => 'int',
'precision' => 4,
+ 'default' => '0',
'nullable' => true
)
);
Modified: trunk/property/templates/base/request.xsl
===================================================================
--- trunk/property/templates/base/request.xsl 2013-03-06 14:36:04 UTC (rev
10971)
+++ trunk/property/templates/base/request.xsl 2013-03-07 14:33:39 UTC (rev
10972)
@@ -136,6 +136,38 @@
</input>
</form>
</td>
+ <td valign="top">
+ <xsl:variable
name="add_to_project_link">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:property.uiproject.index,from:workorder,lookup:true,origin:.project.request')"
/>
+ </xsl:variable>
+ <form method="post"
action="{$add_to_project_link}">
+ <xsl:variable
name="lang_add_to_project">
+
<xsl:value-of select="php:function('lang', 'add to project as order')"/>
+ </xsl:variable>
+ <input
type="hidden" name="origin_id" value="{value_request_id}"/>
+ <input
type="hidden" name="query" value="{loc1}"/>
+ <input
type="submit" name="location" value="{$lang_add_to_project}">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'click this to add an order to an
existing project')"/>
+
</xsl:attribute>
+ </input>
+ </form>
+ </td>
+ <td valign="top">
+ <xsl:variable
name="add_to_project_link2">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:property.uiproject.index,from:project,lookup:true,origin:.project.request')"
/>
+ </xsl:variable>
+ <form method="post"
action="{$add_to_project_link2}">
+ <input
type="hidden" name="origin_id" value="{value_request_id}"/>
+ <input
type="hidden" name="query" value="{loc1}"/>
+ <input
type="submit" name="location" value="{php:function('lang', 'add to project as
relation')}">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'click this to add an order to an
existing project')"/>
+
</xsl:attribute>
+ </input>
+ </form>
+ </td>
+
<td>
<form
method="post" action="{ticket_link}">
<xsl:variable name="lang_start_ticket">
@@ -331,6 +363,116 @@
</textarea>
</dd>
+ <table>
+ <xsl:apply-templates
select="custom_attributes/attributes"/>
+ <tr>
+ <td colspan="2">
+ <table
border="1" width="100%" cellpadding="2" cellspacing="2" align="center">
+
<xsl:call-template name="table_header_importance"/>
+
<xsl:apply-templates select="condition_list"/>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <br/>
+ </td>
+ </tr>
+ <xsl:choose>
+ <xsl:when
test="authorities_demands/options!=''">
+ <tr>
+
<td align="left">
+
<xsl:value-of select="php:function('lang', 'Authorities Demands')"/>
+
</td>
+
<td>
+
<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:text> + </xsl:text>
+
<xsl:value-of select="value_authorities_demands"/>
+
</xsl:attribute>
+
<option value="0">
+
<xsl:value-of select="php:function('lang', 'no
authorities demands')"/>
+
</option>
+
<xsl:apply-templates select="authorities_demands/options"/>
+
</select>
+
</td>
+ </tr>
+ <tr>
+
<td>
+
<br/>
+
</td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+ <!--
+<tr>
+<td valign='top' align="left">
+<xsl:value-of select="php:function('lang', 'regulations')" />
+</td>
+<td colspan='3'>
+<table cellpadding="2" cellspacing="2" width="50%" align="left">
+<xsl:for-each select="regulations" >
+<tr>
+<xsl:attribute name="class">
+<xsl:choose>
+<xsl:when test="@class">
+<xsl:value-of select="@class"/>
+</xsl:when>
+<xsl:when test="position() mod 2 = 0">
+<xsl:text>row_off</xsl:text>
+</xsl:when>
+<xsl:otherwise>
+<xsl:text>row_on</xsl:text>
+</xsl:otherwise>
+</xsl:choose>
+</xsl:attribute>
+<td align="left" title='{descr}'>
+<xsl:text> </xsl:text>
+<xsl:choose>
+<xsl:when test="external_ref!=''">
+<a href="{external_ref}" target="_blank"><xsl:value-of select="name"/></a>
+</xsl:when>
+<xsl:otherwise>
+<xsl:value-of select="name"/>
+</xsl:otherwise>
+</xsl:choose>
+</td>
+<td align="left">
+<input type="checkbox" name="values[regulations][]" value="{id}">
+<xsl:if test="selected = '1'">
+<xsl:attribute name="checked">
+<xsl:text>checked</xsl:text>
+</xsl:attribute>
+</xsl:if>
+<xsl:attribute name="title">
+<xsl:value-of select="descr"/>
+</xsl:attribute>
+</input>
+</td>
+</tr>
+</xsl:for-each>
+</table>
+</td>
+</tr>
+-->
+ <tr>
+ <td>
+ <br/>
+ </td>
+ </tr>
+ </table>
+
+<!--
+ <dt>
+ <label>
+
<xsl:value-of select="php:function('lang', 'score')"/>
+ </label>
+ </dt>
+ <dd>
+
<xsl:value-of select="value_score"/>
+ </dd>
+-->
<dt><label>
<xsl:value-of select="php:function('lang', 'cost categories')"/>
@@ -482,8 +624,8 @@
<dd>
<xsl:value-of select="value_budget"/><xsl:text> </xsl:text> [ <xsl:value-of
select="currency"/> ]
</dd>
+<!--
-
<dt><label>
<xsl:value-of select="php:function('lang', 'not allocated')"/>
</label></dt>
@@ -499,7 +641,7 @@
<xsl:value-of select="value_diff2"/><xsl:text> </xsl:text> [ <xsl:value-of
select="currency"/> ]
</dd>
-<!--
+
<dt><label>
<xsl:value-of select="php:function('lang', 'planning date')"/>
</label></dt>
@@ -578,115 +720,6 @@
</dl>
</div>
- <div id="condition">
- <table>
- <xsl:apply-templates
select="custom_attributes/attributes"/>
- <tr>
- <td colspan="2">
- <table
border="1" width="100%" cellpadding="2" cellspacing="2" align="center">
-
<xsl:call-template name="table_header_importance"/>
-
<xsl:apply-templates select="condition_list"/>
- </table>
- </td>
- </tr>
- <tr>
- <td>
- <br/>
- </td>
- </tr>
- <xsl:choose>
- <xsl:when
test="authorities_demands/options!=''">
- <tr>
-
<td align="left">
-
<xsl:value-of select="php:function('lang', 'Authorities Demands')"/>
-
</td>
-
<td>
-
<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:text> + </xsl:text>
-
<xsl:value-of select="value_authorities_demands"/>
-
</xsl:attribute>
-
<option value="0">
-
<xsl:value-of select="php:function('lang', 'no
authorities demands')"/>
-
</option>
-
<xsl:apply-templates select="authorities_demands/options"/>
-
</select>
-
</td>
- </tr>
- <tr>
-
<td>
-
<br/>
-
</td>
- </tr>
- </xsl:when>
- </xsl:choose>
- <!--
-<tr>
-<td valign='top' align="left">
-<xsl:value-of select="php:function('lang', 'regulations')" />
-</td>
-<td colspan='3'>
-<table cellpadding="2" cellspacing="2" width="50%" align="left">
-<xsl:for-each select="regulations" >
-<tr>
-<xsl:attribute name="class">
-<xsl:choose>
-<xsl:when test="@class">
-<xsl:value-of select="@class"/>
-</xsl:when>
-<xsl:when test="position() mod 2 = 0">
-<xsl:text>row_off</xsl:text>
-</xsl:when>
-<xsl:otherwise>
-<xsl:text>row_on</xsl:text>
-</xsl:otherwise>
-</xsl:choose>
-</xsl:attribute>
-<td align="left" title='{descr}'>
-<xsl:text> </xsl:text>
-<xsl:choose>
-<xsl:when test="external_ref!=''">
-<a href="{external_ref}" target="_blank"><xsl:value-of select="name"/></a>
-</xsl:when>
-<xsl:otherwise>
-<xsl:value-of select="name"/>
-</xsl:otherwise>
-</xsl:choose>
-</td>
-<td align="left">
-<input type="checkbox" name="values[regulations][]" value="{id}">
-<xsl:if test="selected = '1'">
-<xsl:attribute name="checked">
-<xsl:text>checked</xsl:text>
-</xsl:attribute>
-</xsl:if>
-<xsl:attribute name="title">
-<xsl:value-of select="descr"/>
-</xsl:attribute>
-</input>
-</td>
-</tr>
-</xsl:for-each>
-</table>
-</td>
-</tr>
--->
- <tr>
- <td>
- <br/>
- </td>
- </tr>
- <tr>
- <td
align="left">
-
<xsl:value-of select="lang_score"/>
- </td>
- <td>
-
<xsl:value-of select="value_score"/>
- </td>
- </tr>
- </table>
- </div>
<div id="documents">
<table>
<xsl:choose>
Modified: trunk/property/templates/base/tts.xsl
===================================================================
--- trunk/property/templates/base/tts.xsl 2013-03-06 14:36:04 UTC (rev
10971)
+++ trunk/property/templates/base/tts.xsl 2013-03-07 14:33:39 UTC (rev
10972)
@@ -1087,7 +1087,7 @@
<xsl:value-of
select="php:function('lang', 'done')"/>
</xsl:variable>
<form method="post"
action="{$done_action}">
- <input type="submit"
name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
+ <input type="submit"
name="done" value="{$lang_done}">
<xsl:attribute
name="title">
<xsl:value-of
select="php:function('lang', 'Back to the ticket list')"/>
</xsl:attribute>
@@ -1109,7 +1109,7 @@
<xsl:variable
name="lang_generate_request">
<xsl:value-of select="php:function('lang', 'Generate Request')"/>
</xsl:variable>
- <input
type="submit" name="location" value="{$lang_generate_request}"
onMouseout="window.status='';return true;">
+ <input
type="submit" name="location" value="{$lang_generate_request}">
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'click this to generate a request
with this information')"/>
</xsl:attribute>
@@ -1128,7 +1128,7 @@
<xsl:variable
name="lang_generate_project">
<xsl:value-of select="php:function('lang', 'generate new project')"/>
</xsl:variable>
- <input
type="submit" name="location" value="{$lang_generate_project}"
onMouseout="window.status='';return true;">
+ <input
type="submit" name="location" value="{$lang_generate_project}">
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'click this to generate a project
with this information')"/>
</xsl:attribute>
@@ -1143,7 +1143,7 @@
<xsl:variable
name="lang_add_to_project">
<xsl:value-of select="php:function('lang', 'add to project')"/>
</xsl:variable>
- <input
type="submit" name="location" value="{$lang_add_to_project}"
onMouseout="window.status='';return true;">
+ <input
type="submit" name="location" value="{$lang_add_to_project}">
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'click this to add an order to an
existing project')"/>
</xsl:attribute>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10972] property: condition survey / request,
Sigurd Nes <=