[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11019] property: request / condition survey
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11019] property: request / condition survey |
|
Date: |
Mon, 01 Apr 2013 14:16:51 +0000 |
Revision: 11019
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11019
Author: sigurdne
Date: 2013-04-01 14:16:50 +0000 (Mon, 01 Apr 2013)
Log Message:
-----------
property: request / condition survey
Modified Paths:
--------------
trunk/property/inc/class.soproject.inc.php
trunk/property/inc/class.sorequest.inc.php
trunk/property/inc/class.sotts.inc.php
trunk/property/inc/class.uicondition_survey.inc.php
trunk/property/inc/class.uirequest.inc.php
trunk/property/setup/phpgw_no.lang
trunk/property/templates/base/config.tpl
trunk/property/templates/base/request.xsl
Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php 2013-03-31 17:20:18 UTC (rev
11018)
+++ trunk/property/inc/class.soproject.inc.php 2013-04-01 14:16:50 UTC (rev
11019)
@@ -891,7 +891,7 @@
if($project)
{
- $this->db->query("SELECT sum(budget) AS
sum_budget FROM fm_project_budget WHERE project_id =
$project_id",__LINE__,__FILE__);
+ $this->db->query("SELECT sum(budget) AS
sum_budget FROM fm_project_budget WHERE project_id = $project_id AND active =
1",__LINE__,__FILE__);
$this->db->next_record();
$project['budget']
=(int)$this->db->f('sum_budget');
}
Modified: trunk/property/inc/class.sorequest.inc.php
===================================================================
--- trunk/property/inc/class.sorequest.inc.php 2013-03-31 17:20:18 UTC (rev
11018)
+++ trunk/property/inc/class.sorequest.inc.php 2013-04-01 14:16:50 UTC (rev
11019)
@@ -330,6 +330,8 @@
$entity_table = 'fm_request';
+ $GLOBALS['phpgw']->config->read();
+
$uicols = array();
$cols .= "{$entity_table}.location_code";
$cols_return[] =
'location_code';
@@ -566,7 +568,7 @@
$cols_group[] = 'coordinator';
$uicols['input_type'][] = 'text';
$uicols['name'][] = 'coordinator';
- $uicols['descr'][] =
lang('Coordinator');
+ $uicols['descr'][] =
isset($GLOBALS['phpgw']->config->config_data['lang_request_coordinator']) &&
$GLOBALS['phpgw']->config->config_data['lang_request_coordinator'] ?
$GLOBALS['phpgw']->config->config_data['lang_request_coordinator'] :
lang('Coordinator');
$uicols['statustext'][] = lang('Project
coordinator');
$uicols['exchange'][] = '';
$uicols['align'][] = '';
@@ -575,7 +577,6 @@
$uicols['classname'][] = '';
$uicols['sortable'][] = false;
-
$paranthesis = '(';
$joinmethod = "{$this->_left_join} fm_request_status ON
{$entity_table}.status = fm_request_status.id)";
@@ -587,7 +588,6 @@
$paranthesis .= '(';
$joinmethod .= "{$this->_left_join}
fm_request_condition ON {$entity_table}.id = fm_request_condition.request_id)";
- $GLOBALS['phpgw']->config->read();
$_location_level =
isset($GLOBALS['phpgw']->config->config_data['request_location_level']) &&
$GLOBALS['phpgw']->config->config_data['request_location_level'] ?
$GLOBALS['phpgw']->config->config_data['request_location_level'] : 0;
$sql =
$this->bocommon->generate_sql(array('entity_table'=>$entity_table,'cols'=>$cols,'cols_return'=>$cols_return,
'uicols'=>array(),'joinmethod'=>$joinmethod,'paranthesis'=>$paranthesis,
@@ -1387,4 +1387,10 @@
return $values;
}
+
+ public function update_status_from_related($data = array())
+ {
+
+ }
+
}
Modified: trunk/property/inc/class.sotts.inc.php
===================================================================
--- trunk/property/inc/class.sotts.inc.php 2013-03-31 17:20:18 UTC (rev
11018)
+++ trunk/property/inc/class.sotts.inc.php 2013-04-01 14:16:50 UTC (rev
11019)
@@ -920,20 +920,28 @@
}
$this->check_pending_action($ticket, $id);
- //Close cases at controller
-
if(isset($GLOBALS['phpgw_info']['user']['apps']['controller']))
+ //Close cases
+ $check_new_custom = (int)
trim($ticket['status'],'C');
+ $this->db->query("SELECT closed from
fm_tts_status WHERE id = {$check_new_custom}",__LINE__,__FILE__);
+ $this->db->next_record();
+
+ if(($this->db->f('closed') || $ticket['status']
== 'X') && ($old_status!='X' && !$old_closed))
{
- $check_new_custom = (int)
trim($ticket['status'],'C');
- $this->db->query("SELECT closed from
fm_tts_status WHERE id = {$check_new_custom}",__LINE__,__FILE__);
- $this->db->next_record();
-
- if(($this->db->f('closed') ||
$ticket['status'] == 'X') && ($old_status!='X' && !$old_closed))
+ $location_id =
$GLOBALS['phpgw']->locations->get_id('property', '.ticket');
+ // at controller
+
if(isset($GLOBALS['phpgw_info']['user']['apps']['controller']))
{
- $location_id =
$GLOBALS['phpgw']->locations->get_id('property', '.ticket');
- $controller =
CreateObject('controller.uicase');
-
$controller->updateStatusForCases($location_id, $id, 1);
+ $controller =
CreateObject('controller.uicase');
+
$controller->updateStatusForCases($location_id, $id, 1);
}
+ // at request
+
execMethod('property.sorequest.update_status_from_related', array(
+ 'location_id' => $location_id,
+ 'id' => $id,
+ 'status' =>
'closed')
+ );
}
+
}
if ($this->fields_updated)
@@ -1109,19 +1117,26 @@
}
$this->check_pending_action($ticket, $id);
- //Close cases at controller
-
if(isset($GLOBALS['phpgw_info']['user']['apps']['controller']))
+ //Close cases at related
+ $check_new_custom = (int)
trim($ticket['status'],'C');
+ $this->db->query("SELECT closed from
fm_tts_status WHERE id = {$check_new_custom}",__LINE__,__FILE__);
+ $this->db->next_record();
+
+ if(($this->db->f('closed') || $ticket['status']
== 'X') && ($old_status!='X' && !$old_closed))
{
- $check_new_custom = (int)
trim($ticket['status'],'C');
- $this->db->query("SELECT closed from
fm_tts_status WHERE id = {$check_new_custom}",__LINE__,__FILE__);
- $this->db->next_record();
-
- if(($this->db->f('closed') ||
$ticket['status'] == 'X') && ($old_status!='X' && !$old_closed))
+ $location_id =
$GLOBALS['phpgw']->locations->get_id('property', '.ticket');
+ // at controller
+
if(isset($GLOBALS['phpgw_info']['user']['apps']['controller']))
{
- $location_id =
$GLOBALS['phpgw']->locations->get_id('property', '.ticket');
- $controller =
CreateObject('controller.uicase');
-
$controller->updateStatusForCases($location_id, $id, 1);
+ $controller =
CreateObject('controller.uicase');
+
$controller->updateStatusForCases($location_id, $id, 1);
}
+ // at request
+
execMethod('property.sorequest.update_status_from_related', array(
+ 'location_id' => $location_id,
+ 'id' => $id,
+ 'status' =>
'closed')
+ );
}
}
Modified: trunk/property/inc/class.uicondition_survey.inc.php
===================================================================
--- trunk/property/inc/class.uicondition_survey.inc.php 2013-03-31 17:20:18 UTC
(rev 11018)
+++ trunk/property/inc/class.uicondition_survey.inc.php 2013-04-01 14:16:50 UTC
(rev 11019)
@@ -393,7 +393,7 @@
array('key' =>
'url','label'=>lang('id'),'sortable'=>true,'resizeable'=>true),
array('key' =>
'title','label'=>lang('title'),'sortable'=>false,'resizeable'=>true,'width' =>
'100'),//width not working...
array('key' =>
'status','label'=>lang('status'),'sortable'=>true,'resizeable'=>true),
- array('key' =>
'category','label'=>lang('category'),'sortable'=>false,'resizeable'=>true),
+// array('key' =>
'category','label'=>lang('category'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'condition_degree','label'=>lang('condition
degree'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'score','label'=>lang('score'),'sortable'=>true,'resizeable'=>true),
array('key' =>
'amount_investment','label'=>lang('investment'),'sortable'=>true,'resizeable'=>true,'formatter'=>'YAHOO.portico.FormatterAmount0'),
Modified: trunk/property/inc/class.uirequest.inc.php
===================================================================
--- trunk/property/inc/class.uirequest.inc.php 2013-03-31 17:20:18 UTC (rev
11018)
+++ trunk/property/inc/class.uirequest.inc.php 2013-04-01 14:16:50 UTC (rev
11019)
@@ -57,7 +57,8 @@
'priority_key' => true,
'view_file' => true,
'download' => true,
- 'columns' => true
+ 'columns' => true,
+ 'get_related' => true
);
function property_uirequest()
@@ -1548,11 +1549,13 @@
$msgbox_data = $this->bocommon->msgbox_data($receipt);
+ $related = $this->get_related($id);
+
$datavalues[2] = array
(
'name'
=> "2",
- 'values'
=> json_encode($values['planning']),
- 'total_records' =>
count($values['planning']),
+ 'values'
=> json_encode($related),
+ 'total_records' =>
count($related),
'edit_action' => "''",
'is_paginator' => 0,
'footer'
=> 0
@@ -1563,32 +1566,15 @@
$myColumnDefs[2] = array
(
'name' => "2",
- 'values' =>
json_encode(array( array('key' =>
'amount','label'=>lang('amount'),'sortable'=>true,'resizeable'=>true,
'formatter' => FormatterRight),
-
array('key' =>
'date','label'=>lang('date'),'sortable'=>true,'resizeable'=>true),
-
array('key' =>
'delete','label'=>lang('delete'),'sortable'=>false,'resizeable'=>false)))
+ 'values' =>
json_encode(array( array('key' =>
'id','label'=>lang('id'),'sortable'=>true,'resizeable'=>false),
+
array('key' =>
'type','label'=>lang('type'),'sortable'=>true,'resizeable'=>true),
+
array('key' =>
'status','label'=>lang('status'),'sortable'=>false,'resizeable'=>true),
+
array('key' =>
'title','label'=>lang('title'),'sortable'=>false,'resizeable'=>true),
+
array('key' =>
'start_date','label'=>lang('start date'),'sortable'=>true,'resizeable'=>true),
+
array('key' => 'end_date','label'=>lang('end
date'),'sortable'=>true,'resizeable'=>true),
+
array('key' =>
'budget','label'=>lang('budget'),'sortable'=>true,'resizeable'=>false)))
);
- $datavalues[3] = array
- (
- 'name'
=> "3",
- 'values'
=> json_encode($values['consume']),
- 'total_records' =>
count($values['consume']),
- 'edit_action' => "''",
- 'is_paginator' => 0,
- 'footer'
=> 0
- );
-
-
-
- $myColumnDefs[3] = array
- (
- 'name' => "3",
- 'values' =>
json_encode(array( array('key' =>
'amount','label'=>lang('amount'),'sortable'=>true,'resizeable'=>true,
'formatter' => FormatterRight),
-
array('key' =>
'date','label'=>lang('date'),'sortable'=>true,'resizeable'=>true),
-
array('key' =>
'delete','label'=>lang('delete'),'sortable'=>false,'resizeable'=>false)))
- );
-
-
if (isset($values['attributes']) &&
is_array($values['attributes']))
{
foreach ($values['attributes'] as & $attribute)
@@ -1739,7 +1725,8 @@
'cat_select'
=> $this->cats->formatted_xslt_list(array('select_name' =>
'values[cat_id]','selected' => $values['cat_id'])),
- 'lang_coordinator'
=> lang('Coordinator'),
+ 'lang_coordinator'
=>
isset($this->config->config_data['lang_request_coordinator']) &&
$this->config->config_data['lang_request_coordinator'] ?
$this->config->config_data['lang_request_coordinator'] : lang('coordinator'),
+
'lang_user_statustext'
=> lang('Select the coordinator the request belongs to. To do not use a
category select NO USER'),
'select_user_name'
=> 'values[coordinator]',
'lang_no_user'
=> lang('Select coordinator'),
@@ -1858,6 +1845,100 @@
$this->edit($mode = 'view');
}
+
+ function get_related($id)
+ {
+ if( !$this->acl_read)
+ {
+ return array();
+ }
+
+ $interlink = CreateObject('property.interlink');
+ $target = $interlink->get_relation('property',
$this->acl_location, $id, 'target');
+
+ $values = array();
+ if($target)
+ {
+ foreach($target as $_target_section)
+ {
+
+ foreach ($_target_section['data'] as
$_target_entry)
+ {
+
switch($_target_section['location'])
+ {
+ case '.ticket':
+ $ticket
= execMethod('property.sotts.read_single',(int)$_target_entry['id']);
+ $budget
= $ticket['budget'];
+ $start_date =
$GLOBALS['phpgw']->common->show_date($ticket['entry_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ break;
+ case '.project':
+ $project
= execMethod('property.soproject.read_single',(int)$_target_entry['id']);
+ $budget
= $project['budget'];
+ $start_date =
$GLOBALS['phpgw']->common->show_date($project['start_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $end_date =
$GLOBALS['phpgw']->common->show_date($project['end_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ break;
+ case
'.project.workorder':
+ $workorder
= execMethod('property.soworkorder.read_single',(int)$_target_entry['id']);
+ $budget
= $workorder['budget'];
+ $start_date =
$GLOBALS['phpgw']->common->show_date($workorder['start_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $end_date =
$GLOBALS['phpgw']->common->show_date($workorder['end_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ break;
+ default:
+ // nothing
+ }
+
+ $values[] = array
+ (
+ 'id'
=> "<a href=\"{$_target_entry['link']}\" > {$_target_entry['id']}</a>",
+ 'type'
=> ucfirst($_target_section['descr']),
+ 'title'
=> $_target_entry['title'],
+ 'status'
=> $_target_entry['statustext'],
+ 'budget'
=> $budget,
+ 'start_date' =>
$start_date,
+ 'end_date'
=> $end_date,
+ );
+ }
+ }
+ }
+
+//_debug_Array($values);die();
+
+/*
+ 'values' =>
json_encode(array( array('key' =>
'id','label'=>lang('id'),'sortable'=>true,'resizeable'=>false, 'formatter' =>
FormatterRight),
+
array('key' =>
'type','label'=>lang('type'),'sortable'=>true,'resizeable'=>true),
+
array('key' =>
'title','label'=>lang('title'),'sortable'=>false,'resizeable'=>true),
+
array('key' =>
'start_date','label'=>lang('start date'),'sortable'=>true,'resizeable'=>true),
+
array('key' => 'end_date','label'=>lang('end
date'),'sortable'=>true,'resizeable'=>true),
+
array('key' =>
'budget','label'=>lang('budget'),'sortable'=>true,'resizeable'=>false)))
+
+*/
+
+//------ Start pagination
+
+ $start = phpgw::get_var('startIndex', 'int', 'REQUEST',
0);
+
+ $total_records = count($values);
+
+ $num_rows =
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] ? (int)
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] : 15;
+
+ if($allrows)
+ {
+ $out = $values;
+ }
+ else
+ {
+ $page = ceil( ( $start / $total_records ) *
($total_records/ $num_rows) );
+ $values_part = array_chunk($values, $num_rows);
+ $out = $values_part[$page];
+ }
+
+//------ End pagination
+
+ return $out;
+ }
+
+
+
protected function _generate_tabs()
{
$tabs = array
Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang 2013-03-31 17:20:18 UTC (rev 11018)
+++ trunk/property/setup/phpgw_no.lang 2013-04-01 14:16:50 UTC (rev 11019)
@@ -79,7 +79,7 @@
add a project property no leg til prosjekt
add a property property no legg til eiendom
add a rental agreement property no Legg til en utleieavtale
-add a request property no legg til anmodning
+add a request property no legg til behov
add a service agreement property no Legg til en service
avtale
add a standard property no legg til standard
add a template property no legg til mal
@@ -309,7 +309,7 @@
choose columns common no Velg kolonner
choose copy hour to copy this hour to a new hour property no
Kryss av for å kopiere denne posten til en ny post
choose copy project to copy this project to a new project property
no Kryss av for å kopiere dette prosjektet til et nytt prosjekt
-choose copy request to copy this request to a new request property
no Kryss av for å kopiere denne anmodningen til en ny anmodning
+choose copy request to copy this request to a new request property
no Kryss av for å kopiere dette behovet til et nytt behov
choose copy workorder to copy this workorder to a new workorder
property no Kryss av for å kopiere denne bestillingen til en ny
bestilling
choose generate id to automaticly assign new id based on type-prefix
property no Kryss av for generere ny ID basert på type-prefiks
choose the end date for the next period property no Velg
slutt-dato for neste periode
@@ -337,7 +337,7 @@
click this link to select vendor property no klikk her for å
velge leverandør
click this link to view the remark property no klikk her for å
vise merknad
click this to add an order to an existing project property no
klikk her for å legge til en ny bestilling til et eksisterende prosjekt
-click this to generate a request with this information property no
klikk her for å generere en anmodning med basis denne informasjonen
+click this to generate a request with this information property no
klikk her for å generere et behov med basis i denne informasjonen
click this to generate a project with this information property no
klikk her for å lage ett nytt prosjekt med informasjon fra denne saken
click to view file property no Klikk for vise fil
close property no Avslutt
@@ -404,7 +404,7 @@
coordinator changed property no endret koordinator
copy hour ? property no kopier post ?
copy project ? property no kopier prosjekt ?
-copy request ? property no kopier anmodning ?
+copy request ? property no kopier behov ?
copy workorder ? property no Kopier bestilling ?
correct error property no Rett opp feil
cost property no kostnad
@@ -474,7 +474,7 @@
delete prize-index property no slett pris-indeks
delete project property no slett prosjekt
delete property property no slett eiendom
-delete request property no slett anmodning
+delete request property no slett behov
delete template property no slett mal
delete the actor property no Slett aktør
delete the agreement property no Slett avtale
@@ -515,7 +515,7 @@
delete this hour property no slett post
delete this item property no Slett denne posten
delete this project property no slett prosjekt
-delete this request property no slett anmodning
+delete this request property no slett behov
delete this value from the list of multiple choice property no
Slett denne verdien fra listen over fler-valg
delete this vendor from this activity property no slett denne
leverandøren fra denne aktiviteten
delete this workorder property no slett bestilling
@@ -611,10 +611,10 @@
edit period property no rette periode
edit pricing property no rette prising
edit priority key property no rette prioriterings nøkkel
-edit project property no rette prosjekt
-edit property property no rette eiendom
-edit request property no rette anmodning
-edit standard property no rette standard
+edit project property no editer prosjekt
+edit property property no editer eiendom
+edit request property no editer behov
+edit standard property no editer standard
edit status property no Endre status
edit template property no rette mal
edit the account property no Endre kontoen
@@ -643,7 +643,7 @@
edit the project property no rette prosjekt
edit the property property no rette eiendom
edit the r_agreement property no Rette utleieavtalen
-edit the request property no rette anmodning
+edit the request property no endre behov
edit the s_agreement property no Rette serviceavtalen
edit the standard property no rette standard
edit the template property no rette mal
@@ -652,8 +652,8 @@
edit this entity property no Endre entiteten
edit this entry property no rette post
edit this entry equipment property no rett utstyr
-edit this entry project property no rette prosjekt
-edit this entry request property no rett anmodning
+edit this entry project property no endre prosjekt
+edit this entry request property no endre behov
edit this entry workorder property no rett bestilling
edit this meter property no rett måler
edit workorder property no Endre bestilling
@@ -848,7 +848,7 @@
generic property no Generelt
general address property no Generell adresse
general info property no generell informasjon
-generate a project from this request property no generer et
prosjekt basert på denne anmodningen
+generate a project from this request property no generer et
prosjekt basert på dette behovet
generate id ? property no generer ID
generate order property no Lag bestilling
generate project property no Lag nytt prosjekt
@@ -1016,7 +1016,7 @@
list pricebook per vendor property no List prisbok pr
leverandør
list project property no List Prosjekt
list property property no List eiendom
-list request property no List Anmodning
+list request property no List Behov
list standard description property no List standard
beskrivelse
list status property no List status
list street property no List gate
@@ -1251,7 +1251,7 @@
Please - enter a invoice number property no Angi FakturaNr
please enter a project name ! property no Angi prosjekt navn
please enter a property id ! property no Angi eiendoms ID
-please enter a request title ! property no Angi tittel for
anmodning
+please enter a request title ! property no Angi tittel for Behov
please enter a sql query ! property no Angi en sql-spørring
please enter a value for either material cost, labour cost or both !
property no angi enten material kostnader, arbeidskostnader eller
begge
please enter a workorder title ! property no Angi en
bestillings tittel
@@ -1302,7 +1302,7 @@
popup calendar property no Kalender
post property no post
power meter property no Strømmåler
-potential grants property no Potensiell offentlig støtte
+potential grants property no Pos.Off.St
precision property no Presisjon
prefix property no prefiks
preview html property no Forhåndsvis som HTML
@@ -1371,21 +1371,22 @@
repeat type property no type serie
repeat day property no gjenta dag
request property no Behov
+set the status of the request property no Sett status for Behovet
reset approval property no Nullstill
project.request property no Behov
request attributes property no Behov::attributter
request an email receipt property no Be om kvittering
request a confirmation email when your email is opened by the recipient
property no Be om epost som kvittering når mottaker åpner eposten.
-request %1 has been edited property no anmodning %1 er oppdater
-request %1 has been saved property no anmodning %1 er lagret
+request %1 has been edited property no Behov %1 er oppdatert
+request %1 has been saved property no Behov %1 er lagret
request budget property no Budsjett for tiltak
request condition type property no Behov::konsekvenstype
request descr property no Beskrivelse av tiltak
-request end date property no anmodning frist
+request end date property no Behov frist
request entry date property no Registreringsdato for tiltak
-request id property no Anmodnings ID
-request start date property no anmodning startdato
-request status property no Behov::status
+request id property no Behov ID
+request start date property no Behov startdato
+request status property no Status Behov
request title property no Tiltak tittel
request description property no Tilstandbeskrivelse
requirement property no Behov/pålegg
@@ -1440,7 +1441,7 @@
save the project property no lagre prosjekt
save the property property no lagre eiendom
save the rental agreement and return back to the list property no
Lagre utleieavtale og returner til oversikten
-save the request property no lagre anmodning
+save the request property no lagre Behov
save the service agreement and return back to the list property no
Lagre serviceavtale og returner til oversikten
save the standard property no lagre standard
save the status property no Lagre status
@@ -1524,7 +1525,7 @@
select the appropriate propability for worsening of the condition
property no velg sannsynlighet for forverring
select the appropriate tax code property no velg mva-kode
select the branches for this project property no velg fag for
dette prosjektet
-select the branches for this request property no velg fag for
denne anmodningen
+select the branches for this request property no velg fag for
dette behovet
select the branch for this activity. property no velg fag for
denne aktiviteten
select the branch for this document property no velg fag for
dette dokumentet
select the budget responsible property no Velg anviser
@@ -1548,7 +1549,7 @@
select the category the project belongs to. to do not use a category select no
category property no velg kategori prosjekt tilhører. For
ikke å bruke kategori velg KATEGORI IKKE VALGT
select the category the property belongs to. to do not use a category select
no category property no velg kategori eiendom tilhører. For
ikke å bruke kategori velg KATEGORI IKKE VALGT
select the category the r_agreement belongs to. to do not use a category
select no category property no Velg kategorien denne
utleieavtalen tilhører
-select the category the request belongs to. to do not use a category select no
category property no velg kategori anmodning tilhører. For
ikke å bruke kategori velg KATEGORI IKKE VALGT
+select the category the request belongs to. to do not use a category select no
category property no velg kategori behovet tilhører. For
ikke å bruke kategori velg KATEGORI IKKE VALGT
select the category the s_agreement belongs to. to do not use a category
select no category property no Velg kategorien denne
serviceavtalen tilhører
select the category the ticket belongs to. to do not use a category select no
category property no velg kategori melding tilhører. For ikke å
bruke kategori velg KATEGORI IKKE VALGT
select the category the workorder belongs to. to do not use a category select
no category property no velg kategori bestillingen tilhører.
For ikke å bruke kategori velg KATEGORI IKKE VALGT
@@ -1556,7 +1557,7 @@
select the chapter (for tender) for this activity. property no
velg tilbudskapittel for denne posten
select the coordinator the document belongs to. to do not use a category
select no user property no velg koordinator dokument
tilhører. For ikke å bruke koordinator velg BRUKER IKKE VALG
select the coordinator the project belongs to. to do not use a category select
no user property no velg koordinator prosjekt tilhører. For ikke å
bruke koordinator velg BRUKER IKKE VALG
-select the coordinator the request belongs to. to do not use a category select
no user property no velg koordinator anmodning tilhører. For ikke å
bruke koordinator velg BRUKER IKKE VALG
+select the coordinator the request belongs to. to do not use a category select
no user property no velg koordinator behovet tilhører. For ikke å
bruke koordinator velg BRUKER IKKE VALG
select the customer by clicking this link property no Velg
kunde
select the date for the first value property no angi dato for
første verdi
select the date for the update property no angi dato for
oppdatering
@@ -1569,7 +1570,7 @@
select the estimated date for closing the task property no Velg
beregnet dato for lukking av oppgave
select the estimated end date for the agreement property no
Angi estimert slutt-dato for avtalen
select the estimated end date for the project property no Angi
estimert sluttdato for prosjektet
-select the estimated end date for the request property no Angi
estimert sluttdato for anmodningen
+select the estimated end date for the request property no Angi
estimert sluttdato for behovet
select the estimated termination date property no Angi estimert
terminerings-dato
select the file to import from property no velg fil å importere
select the filter. to show all entries select show all property no
Velg filter. For å vise alle - velg VIS ALLE
@@ -1605,7 +1606,7 @@
select the user the alarm belongs to. property no Velg bruker
select the user the document belongs to. to do not use a category select no
user property no velg bruker dokument tilhører. For ikke å
bruke bruker velg BRUKER IKKE VALG
select the user the project belongs to. to do not use a category select no
user property no velg bruker prosjekt tilhører. For ikke å
bruke bruker velg BRUKER IKKE VALG
-select the user the request belongs to. to do not use a category select no
user property no velg bruker anmodning tilhører. For ikke å
bruke bruker velg BRUKER IKKE VALG
+select the user the request belongs to. to do not use a category select no
user property no velg bruker behovet tilhører. For ikke å
bruke bruker velg BRUKER IKKE VALG
select the user the selection belongs to. to do not use a user select no user
property no velg bruker utvalg tilhører. For ikke å bruke bruker
velg BRUKER IKKE VALG
select the user the template belongs to. to do not use a category select no
user property no velg bruker mal tilhører. For ikke å bruke
bruker velg BRUKER IKKE VALG
select the user the workorder belongs to. to do not use a category select no
user property no velg bruker bestillingen tilhører. For ikke å
bruke bruker velg BRUKER IKKE VALG
@@ -1875,7 +1876,7 @@
view or edit prizing history of this element property no vis
eller oppdater pris-historikk for dette elementet
view project property no vis prosjekt
view property property no vis eiendom
-view request property no vis anmodning
+view request property no vis behov
view template detail property no vis mal-detaljer
view tender property no Vis beskrivelse
view the apartment property no vis leilighet
@@ -1897,7 +1898,7 @@
view the part of town property no Vis bydelen
view the project property no vis prosjekt
view the property property no vis eiendom
-view the request property no vis anmodning
+view the request property no vis behov
view the standard property no vis standard
view the template property no vis mal
view the ticket property no vis melding
@@ -1923,7 +1924,7 @@
what is the current status of this document ? property no hva er
status for dette dokumentet ?
what is the current status of this equipment ? property no hva er
status for dette utstyret ?
what is the current status of this project ? property no hva er
status for dette prosjektet ?
-what is the current status of this request ? property no hva er
status for denne anmodningen ?
+what is the current status of this request ? property no hva er
status for dette behovet ?
what is the current status of this workorder ? property no hva er
status for denne bestillingen ?
where property no Hvor
where to deliver the key property no Nøkler leveres
Modified: trunk/property/templates/base/config.tpl
===================================================================
--- trunk/property/templates/base/config.tpl 2013-03-31 17:20:18 UTC (rev
11018)
+++ trunk/property/templates/base/config.tpl 2013-04-01 14:16:50 UTC (rev
11019)
@@ -410,6 +410,11 @@
<tr class="row_on">
+ <td>{lang_lang_request_coordinator}:</td>
+ <td><input name="newsettings[lang_request_coordinator]"
value="{value_lang_request_coordinator}"></td>
+ </tr>
+
+ <tr class="row_on">
<td>{lang_meter_table}:</td>
<td><input name="newsettings[meter_table]"
value="{value_meter_table}"></td>
</tr>
Modified: trunk/property/templates/base/request.xsl
===================================================================
--- trunk/property/templates/base/request.xsl 2013-03-31 17:20:18 UTC (rev
11018)
+++ trunk/property/templates/base/request.xsl 2013-04-01 14:16:50 UTC (rev
11019)
@@ -214,10 +214,50 @@
<dd>
<xsl:value-of select="value_request_id"/>
</dd>
+
+ </xsl:when>
+ </xsl:choose>
- </xsl:when>
- </xsl:choose>
+
+ <dt><label>
+
<xsl:value-of select="php:function('lang', 'responsible unit')"/>
+ </label></dt>
+ <dd>
+ <select
name="values[responsible_unit]" class="forms">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'Set responsible unit')"/>
+
</xsl:attribute>
+
<option value="0">
+
<xsl:value-of select="php:function('lang', 'select')"/>
+
</option>
+
<xsl:apply-templates select="responsible_unit_list/options"/>
+
</select>
+ </dd>
+ <dt><label>
+
<xsl:value-of select="lang_coordinator"/>
+ </label></dt>
+ <dd>
+
<xsl:call-template name="user_id_select"/>
+ </dd>
+
+ <dt><label>
+
<xsl:value-of select="php:function('lang', 'request status')"/>
+ </label></dt>
+ <dd>
+ <select
name="values[status]" class="forms">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'Set the status of the
request')"/>
+
</xsl:attribute>
+
<option value="0">
+
<xsl:value-of select="php:function('lang', 'no status')"/>
+
</option>
+
<xsl:apply-templates select="status_list/options"/>
+
</select>
+ </dd>
+
+
+
<fieldset>
<legend>
<xsl:value-of select="php:function('lang',
'location')"/>
@@ -318,20 +358,6 @@
</xsl:otherwise>
</xsl:choose>
- <dt><label>
-
<xsl:value-of select="php:function('lang', 'building part')"/>
- </label></dt>
- <dd>
- <select
name="values[building_part]">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'select building part')"/>
-
</xsl:attribute>
-
<option value="0">
-
<xsl:value-of select="php:function('lang', 'select building part')"/>
-
</option>
-
<xsl:apply-templates select="building_part_list/options"/>
-
</select>
- </dd>
<xsl:choose>
<xsl:when
test="suppressmeter =''">
@@ -360,6 +386,21 @@
<dl class="proplist-col">
<dt><label>
+ <xsl:value-of
select="php:function('lang', 'building part')"/>
+ </label></dt>
+ <dd>
+ <select
name="values[building_part]">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'select building part')"/>
+
</xsl:attribute>
+ <option
value="0">
+
<xsl:value-of select="php:function('lang', 'select building part')"/>
+
</option>
+
<xsl:apply-templates select="building_part_list/options"/>
+ </select>
+ </dd>
+
+ <dt><label>
<xsl:value-of
select="php:function('lang', 'category')"/>
</label></dt>
<dd>
@@ -518,45 +559,8 @@
<dl class="proplist-col">
- <dt><label>
-
<xsl:value-of select="php:function('lang', 'status')"/>
- </label></dt>
- <dd>
- <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>
- </dd>
-
- <dt><label>
-
<xsl:value-of select="php:function('lang', 'responsible unit')"/>
- </label></dt>
- <dd>
- <select
name="values[responsible_unit]" class="forms">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'Set responsible unit')"/>
-
</xsl:attribute>
-
<option value="0">
-
<xsl:value-of select="php:function('lang', 'select')"/>
-
</option>
-
<xsl:apply-templates select="responsible_unit_list/options"/>
-
</select>
- </dd>
<dt><label>
-
<xsl:value-of select="lang_coordinator"/>
- </label></dt>
- <dd>
-
<xsl:call-template name="user_id_select"/>
- </dd>
-
-
- <dt><label>
<xsl:value-of select="php:function('lang', 'recommended year')"/>
</label></dt>
<dd>
@@ -755,6 +759,14 @@
</dl>
</fieldset>
+ <fieldset>
+ <legend>
+ <xsl:value-of select="php:function('lang', 'related')"/>
+ </legend>
+
+ <div id="datatable-container_2"/>
+
+ </fieldset>
</div>
<div id="documents">
<table>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11019] property: request / condition survey,
Sigurd Nes <=