[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property inc/class.bor_agreement.inc.php inc/cl...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property inc/class.bor_agreement.inc.php inc/cl... |
|
Date: |
Tue, 21 Feb 2006 14:48:22 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Branch:
Changes by: Sigurd Nes <address@hidden> 06/02/21 14:48:22
Modified files:
inc : class.bor_agreement.inc.php
class.sor_agreement.inc.php
class.uir_agreement.inc.php
setup : setup.inc.php tables_current.inc.php
tables_update.inc.php
templates/base : r_agreement.xsl
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.bor_agreement.inc.php.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.sor_agreement.inc.php.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.uir_agreement.inc.php.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/setup.inc.php.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/tables_current.inc.php.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/tables_update.inc.php.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/templates/base/r_agreement.xsl.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
Patches:
Index: property/inc/class.bor_agreement.inc.php
diff -u property/inc/class.bor_agreement.inc.php:1.7
property/inc/class.bor_agreement.inc.php:1.8
--- property/inc/class.bor_agreement.inc.php:1.7 Mon Feb 20 14:02:45 2006
+++ property/inc/class.bor_agreement.inc.php Tue Feb 21 14:48:22 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage agreement
- * @version $Id: class.bor_agreement.inc.php,v 1.7 2006/02/20 14:02:45
sigurdne Exp $
+ * @version $Id: class.bor_agreement.inc.php,v 1.8 2006/02/21 14:48:22
sigurdne Exp $
*/
/**
@@ -274,6 +274,12 @@
for ($i=0; $i<count($list); $i++)
{
$list[$i]['index_date'] =
$GLOBALS['phpgw']->common->show_date($list[$i]['index_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $list[$i]['from_date'] =
$GLOBALS['phpgw']->common->show_date($list[$i]['from_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $list[$i]['to_date'] =
$GLOBALS['phpgw']->common->show_date($list[$i]['to_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ if($list[$i]['tenant_id'])
+ {
+ $list[$i]['tenant'] =
$this->so->get_tenant_name($list[$i]['tenant_id']);
+ }
}
return $list;
@@ -587,11 +593,21 @@
}
- function update($values)
+ function update_item_history($values)
{
+ if($values['start_date'])
+ {
+ $values['start_date'] =
$this->bocommon->date_to_timestamp($values['start_date']);
+ }
+
+ if($values['start_date'])
+ {
+ $values['end_date'] =
$this->bocommon->date_to_timestamp($values['end_date']);
+ }
+
$values['date'] =
$this->bocommon->date_to_timestamp($values['date']);
- return $this->so->update($values);
+ return $this->so->update_item_history($values);
}
function delete_last_index($r_agreement_id,$id)
Index: property/inc/class.sor_agreement.inc.php
diff -u property/inc/class.sor_agreement.inc.php:1.11
property/inc/class.sor_agreement.inc.php:1.12
--- property/inc/class.sor_agreement.inc.php:1.11 Mon Feb 20 14:24:08 2006
+++ property/inc/class.sor_agreement.inc.php Tue Feb 21 14:48:22 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage agreement
- * @version $Id: class.sor_agreement.inc.php,v 1.11 2006/02/20 14:24:08
sigurdne Exp $
+ * @version $Id: class.sor_agreement.inc.php,v 1.12 2006/02/21 14:48:22
sigurdne Exp $
*/
/**
@@ -100,7 +100,7 @@
/* if($loc1)
{
$paranthesis .='(';
- $joinmethod .= " $this->join
fm_r_agreement_detail ON ( $entity_table.id
=fm_r_agreement_detail.agreement_id))";
+ $joinmethod .= " $this->join
fm_r_agreement_item ON ( $entity_table.id =fm_r_agreement_item.agreement_id))";
$cols .= ",location_code";
@@ -150,15 +150,15 @@
else
{
$allrows=True;
- $entity_table = 'fm_r_agreement_detail';
+ $entity_table = 'fm_r_agreement_item';
$attribute_filter = " AND attrib_detail = 2";
$paranthesis .='(';
- $joinmethod .= " $this->join
fm_r_agreement_pricing ON ( $entity_table.agreement_id
=fm_r_agreement_pricing.agreement_id AND $entity_table.id
=fm_r_agreement_pricing.item_id))";
+ $joinmethod .= " $this->join
fm_r_agreement_item_history ON ( $entity_table.agreement_id
=fm_r_agreement_item_history.agreement_id AND $entity_table.id
=fm_r_agreement_item_history.item_id))";
- $cols = "$entity_table.*,
fm_r_agreement_pricing.cost,fm_r_agreement_pricing.id as
index_count,fm_r_agreement_pricing.index_date,fm_r_agreement_pricing.item_id,fm_r_agreement_pricing.this_index,
rental_type_id";
+ $cols = "$entity_table.*,
fm_r_agreement_item_history.cost,fm_r_agreement_item_history.id as
index_count,fm_r_agreement_item_history.index_date,fm_r_agreement_item_history.item_id,fm_r_agreement_item_history.this_index,
rental_type_id";
$cols_return[] =
'agreement_id';
$uicols['input_type'][] = 'hidden';
@@ -344,7 +344,7 @@
if ($loc1)
{
- $this->db->query("SELECT agreement_id FROM
fm_r_agreement_detail WHERE location_code $this->like '$loc1%' group by
agreement_id");
+ $this->db->query("SELECT agreement_id FROM
fm_r_agreement_item WHERE location_code $this->like '$loc1%' group by
agreement_id");
while ($this->db->next_record())
{
$filter_id[] =
$this->db->f('agreement_id');
@@ -490,9 +490,11 @@
$item_id =
(isset($data['item_id'])?$data['item_id']:0);
}
- $entity_table = 'fm_r_agreement_pricing';
+ $entity_table = 'fm_r_agreement_item_history';
- $cols =
"fm_r_agreement_pricing.cost,fm_r_agreement_pricing.id as
index_count,fm_r_agreement_pricing.index_date,fm_r_agreement_pricing.item_id,fm_r_agreement_pricing.this_index";
+ $cols =
"fm_r_agreement_item_history.cost,fm_r_agreement_item_history.id as
index_count,"
+ . "
fm_r_agreement_item_history.index_date,fm_r_agreement_item_history.item_id,"
+ . "
fm_r_agreement_item_history.this_index,tenant_id,to_date,from_date";
$cols_return[] = 'item_id';
$uicols['input_type'][] = 'text';
@@ -530,6 +532,24 @@
$uicols['descr'][] = lang('date');
$uicols['statustext'][] = lang('date');
+ $cols_return[] = 'from_date';
+ $uicols['input_type'][] = 'text';
+ $uicols['name'][] = 'from_date';
+ $uicols['descr'][] = lang('from
date');
+ $uicols['statustext'][] = lang('from date');
+
+ $cols_return[] = 'to_date';
+ $uicols['input_type'][] = 'text';
+ $uicols['name'][] = 'to_date';
+ $uicols['descr'][] = lang('to
date');
+ $uicols['statustext'][] = lang('to date');
+
+ $cols_return[] = 'tenant_id';
+ $uicols['input_type'][] = 'text';
+ $uicols['name'][] = 'tenant';
+ $uicols['descr'][] =
lang('Tenant');
+ $uicols['statustext'][] = lang('Tenant');
+
$from .= " FROM $entity_table ";
$sql = "SELECT $cols $from $joinmethod";
@@ -579,7 +599,14 @@
return $r_agreement_list;
}
-
+ function get_tenant_name($id)
+ {
+ $this->db->query("SELECT first_name,last_name FROM
fm_tenant WHERE id = $id");
+ $this->db->next_record();
+ return stripslashes($this->db->f('first_name')) . ' ' .
stripslashes($this->db->f('last_name'));
+
+ }
+
function read_single($data)
{
$attribute_table = 'fm_r_agreement_attribute';
@@ -635,7 +662,7 @@
function read_single_item($data)
{
$attribute_table = 'fm_r_agreement_attribute';
- $table = 'fm_r_agreement_detail';
+ $table = 'fm_r_agreement_item';
$r_agreement_id =$data['r_agreement_id'];
$id =$data['id'];
@@ -748,7 +775,7 @@
$receipt['r_agreement_id']=
$id;//$this->db->get_last_insert_id($table,'id');
- $receipt['message'][] = array('msg'=>lang('r_agreement
%1 has been saved',$receipt['r_agreement_id']));
+ $receipt['message'][] = array('msg'=>lang('agreement %1
has been saved',$receipt['r_agreement_id']));
$this->db->transaction_commit();
return $receipt;
@@ -757,12 +784,10 @@
function add_item($values,$values_attribute='')
{
//_debug_array($values);
- $table = 'fm_r_agreement_detail';
+ $table = 'fm_r_agreement_item';
$cols[] = 'location_code';
$vals[] = $values['location_code'];
- $cols[] = 'tenant_id';
- $vals[] = $values['tenant_id'];
$cols[] = 'rental_type_id';
$vals[] = $values['rental_type_id'];
@@ -829,17 +854,35 @@
$this->db->query("SELECT start_date FROM fm_r_agreement
WHERE id=" . $values['r_agreement_id']);
$this->db->next_record();
- $start_date = $this->db->f('start_date');
+
+ if(!$values['start_date'])
+ {
+ $start_date = $this->db->f('start_date');
+ }
+ else
+ {
+ $start_date = $values['start_date'];
+
+ }
+
+ if ($values['end_date'])
+ {
+ $end_date = $values['end_date'];
+ }
+ else
+ {
+ $end_date = mktime(0, 0, 0, 12, 31,
date(Y,$start_date)); // last day of start year
+ }
- $this->db->query("INSERT INTO fm_r_agreement_pricing
(agreement_id,item_id,id,current_index,this_index,cost,index_date,entry_date,user_id)
"
+ $this->db->query("INSERT INTO
fm_r_agreement_item_history
(agreement_id,item_id,id,current_index,this_index,cost,index_date,entry_date,user_id,tenant_id,from_date,to_date)
"
. "VALUES (" . $values['r_agreement_id'] . ","
. $id .",1,1,1," . $this->floatval($values['cost']) . "," . (int)$start_date .
"," . time()
- . "," . $this->account . ")");
+ . "," . $this->account . "," .
(int)$values['tenant_id'] . "," . (int)$start_date . "," . (int)$end_date .
")");
$receipt['r_agreement_id']= $values['r_agreement_id'];
$receipt['id']= $id;
- $receipt['message'][] = array('msg'=>lang('r_agreement
%1 has been saved',$receipt['r_agreement_id']));
+ $receipt['message'][] = array('msg'=>lang('agreement %1
has been saved',$receipt['r_agreement_id']));
$this->db->transaction_commit();
return $receipt;
@@ -885,10 +928,10 @@
$this->db->query("UPDATE $table set entry_date='" .
time() . "', category='"
. $values['cat_id'] .
"', member_of='" . $values['member_of'] . "', start_date=" .
intval($values['start_date']) . ", end_date=" . intval($values['end_date']) .
", termination_date=" . intval($values['termination_date']) . ", account_id=" .
intval($values['b_account_id']) . " $value_set WHERE id=" .
intval($values['r_agreement_id']));
- $this->db->query("UPDATE fm_r_agreement_pricing set
index_date=" . intval($values['start_date']) . " WHERE id=1 AND agreement_id= "
. intval($values['r_agreement_id']));
+ $this->db->query("UPDATE fm_r_agreement_item_history
set index_date=" . intval($values['start_date']) . " WHERE id=1 AND
agreement_id= " . intval($values['r_agreement_id']));
$receipt['r_agreement_id']= $values['r_agreement_id'];
- $receipt['message'][] = array('msg'=>lang('r_agreement
%1 has been edited',$values['r_agreement_id']));
+ $receipt['message'][] = array('msg'=>lang('agreement %1
has been edited',$values['r_agreement_id']));
return $receipt;
}
@@ -896,7 +939,7 @@
{
//_debug_array($values);
//_debug_array($values_attribute);
- $table = 'fm_r_agreement_detail';
+ $table = 'fm_r_agreement_item';
while (is_array($values['extra']) &&
list($column,$value) = each($values['extra']))
{
@@ -929,7 +972,6 @@
$value_set['location_code'] =
$values['location_code'];
$value_set['cost'] = $values['cost'];
$value_set['address'] = $address;
- $value_set['tenant_id'] = $values['tenant_id'];
$value_set['rental_type_id'] =
$values['rental_type_id'];
@@ -940,15 +982,15 @@
$this->db->query("UPDATE $table set entry_date=" .
time() . "$value_set WHERE agreement_id=" . intval($values['r_agreement_id']) .
' AND id=' . intval($values['id']));
- $this->db->query("UPDATE fm_r_agreement_pricing set
cost = this_index *" . $this->floatval($values['cost']) . " WHERE
agreement_id=" . intval($values['r_agreement_id']) . ' AND item_id=' .
intval($values['id']));
+ $this->db->query("UPDATE fm_r_agreement_item_history
set cost = this_index *" . $this->floatval($values['cost']) . " WHERE
agreement_id=" . intval($values['r_agreement_id']) . ' AND item_id=' .
intval($values['id']));
$receipt['r_agreement_id']= $values['r_agreement_id'];
$receipt['id']= $values['id'];
- $receipt['message'][] = array('msg'=>lang('r_agreement
%1 has been edited',$values['r_agreement_id']));
+ $receipt['message'][] = array('msg'=>lang('agreement %1
has been edited',$values['r_agreement_id']));
return $receipt;
}
- function update($values)
+ function update_item_history($values)
{
//_debug_array($values);
$values['new_index']=$this->floatval($values['new_index']);
@@ -957,16 +999,48 @@
while (is_array($values['select']) &&
list($item_id,$value) = each($values['select']))
{
- $this->db->query("UPDATE fm_r_agreement_pricing
set current_index = NULL WHERE agreement_id=" . intval($values['agreement_id'])
. ' AND item_id=' . intval($item_id));
+ $this->db->query("UPDATE
fm_r_agreement_item_history set current_index = NULL WHERE agreement_id=" .
intval($values['agreement_id']) . ' AND item_id=' . intval($item_id));
- $this->db->query("INSERT INTO
fm_r_agreement_pricing
(agreement_id,item_id,id,current_index,this_index,cost,index_date,entry_date,user_id)"
- . "VALUES (" . $values['agreement_id']
. "," . $item_id ."," . ($values['id'][$item_id]+1) .",1,'" .
$values['new_index'] . "','" . ($value * $values['new_index']) . "'," .
(int)$values['date'] . "," . time()
- . "," . $this->account . ")");
+ $this->db->query("SELECT tenant_id,to_date from
fm_r_agreement_item_history WHERE agreement_id=" .
intval($values['agreement_id']) . ' AND item_id=' . intval($item_id) . ' AND
id=' . intval($values['id'][$item_id]));
+
+ $this->db->next_record();
+
+ if(!$values['tenant_id'])
+ {
+ $values['tenant_id'] =
$this->db->f('tenant_id');
+ }
+
+ if ($values['start_date'])
+ {
+ $start_date = $values['start_date'];
+ if($start_date <
$this->db->f('to_date'))
+ {
+ $start_date =
$this->db->f('to_date') + (3600 * 24);
+ }
+ }
+ else
+ {
+ $start_date =
$this->db->f('to_date') + (3600 * 24);
+ }
+
+ if ($values['end_date'])
+ {
+ $end_date = $values['end_date'];
+ }
+ else
+ {
+ $end_date = mktime(0, 0, 0, 12, 31,
date(Y,$start_date)); // last day of start year
+ }
+
+ $this->db->query("INSERT INTO
fm_r_agreement_item_history
(agreement_id,item_id,id,current_index,this_index,cost,index_date,entry_date,tenant_id,user_id,from_date,to_date)"
+ . "VALUES (" . $values['agreement_id']
. "," . $item_id ."," . ($values['id'][$item_id]+1) .",1,'" .
$values['new_index']
+ . "','" . ($value *
$values['new_index']) . "'," . (int)$values['date'] . "," . time() . "," .
(int)$values['tenant_id']
+ . "," . $this->account . "," .
(int)$start_date . "," . (int)$end_date . ")");
}
$this->db->transaction_commit();
- $receipt['message'][] = array('msg'=>lang('r_agreement
%1 has been updated for index',$values['agreement_id']));
+ $receipt['message'][] = array('msg'=>lang('agreement %1
has been updated for index',$values['agreement_id']));
return $receipt;
}
@@ -989,13 +1063,13 @@
function delete_last_index($r_agreement_id,$item_id)
{
$this->db->transaction_begin();
- $this->db->query("SELECT max(id) as index_count FROM
fm_r_agreement_pricing WHERE agreement_id=$r_agreement_id AND
item_id=$item_id");
+ $this->db->query("SELECT max(id) as index_count FROM
fm_r_agreement_item_history WHERE agreement_id=$r_agreement_id AND
item_id=$item_id");
$this->db->next_record();
$index_count = $this->db->f('index_count');
if($index_count>1)
{
- $this->db->query("DELETE FROM
fm_r_agreement_pricing WHERE agreement_id=$r_agreement_id AND item_id=$item_id
AND id=$index_count");
- $this->db->query("UPDATE fm_r_agreement_pricing
set current_index = 1 WHERE agreement_id=$r_agreement_id AND item_id=$item_id
AND id =" . ($index_count-1));
+ $this->db->query("DELETE FROM
fm_r_agreement_item_history WHERE agreement_id=$r_agreement_id AND
item_id=$item_id AND id=$index_count");
+ $this->db->query("UPDATE
fm_r_agreement_item_history set current_index = 1 WHERE
agreement_id=$r_agreement_id AND item_id=$item_id AND id =" . ($index_count-1));
}
$this->db->transaction_commit();
}
@@ -1003,8 +1077,8 @@
function delete_item($r_agreement_id,$item_id)
{
$this->db->transaction_begin();
- $this->db->query("DELETE FROM fm_r_agreement_detail
WHERE agreement_id=$r_agreement_id AND id=$item_id");
- $this->db->query("DELETE FROM fm_r_agreement_pricing
WHERE agreement_id=$r_agreement_id AND item_id=$item_id");
+ $this->db->query("DELETE FROM fm_r_agreement_item WHERE
agreement_id=$r_agreement_id AND id=$item_id");
+ $this->db->query("DELETE FROM
fm_r_agreement_item_history WHERE agreement_id=$r_agreement_id AND
item_id=$item_id");
$this->db->transaction_commit();
}
@@ -1014,8 +1088,8 @@
$table = 'fm_r_agreement';
$this->db->transaction_begin();
$this->db->query("DELETE FROM $table WHERE id=" .
intval($r_agreement_id));
- $this->db->query("DELETE FROM fm_r_agreement_detail
WHERE agreement_id=" . intval($r_agreement_id));
- $this->db->query("DELETE FROM fm_r_agreement_pricing
WHERE agreement_id=" . intval($r_agreement_id));
+ $this->db->query("DELETE FROM fm_r_agreement_item WHERE
agreement_id=" . intval($r_agreement_id));
+ $this->db->query("DELETE FROM
fm_r_agreement_item_history WHERE agreement_id=" . intval($r_agreement_id));
$this->db->query("DELETE FROM fm_orders WHERE id=" .
intval($r_agreement_id));
$this->db->transaction_commit();
}
@@ -1192,7 +1266,7 @@
if($this->role=='detail')
{
$filtermethod= 'WHERE attrib_detail=2';
- $table = 'fm_r_agreement_detail';
+ $table = 'fm_r_agreement_item';
}
else
{
@@ -1303,7 +1377,7 @@
'account_id' => array('type' =>
'varchar', 'precision' => 20,'nullable' => True)
);
break;
- case 'fm_r_agreement_detail':
+ case 'fm_r_agreement_item':
$fd=array(
'agreement_id' => array('type'
=> 'int', 'precision' => 4,'nullable' => False,'default' => '0'),
'id' => array('type' => 'int',
'precision' => 4,'nullable' => False,'default' => '0'),
@@ -1320,7 +1394,6 @@
'entry_date' => array('type' =>
'int', 'precision' => 4,'nullable' => True),
'test' => array('type' =>
'text','nullable' => True),
'cost' => array('type' =>
'decimal', 'precision' => 20, 'scale' => 2,'nullable' => True),
- 'tenant_id' => array('type' =>
'int', 'precision' => 4,'nullable' => True),
'rental_type_id' =>
array('type' => 'int', 'precision' => 4,'nullable' => True)
);
break;
@@ -1402,7 +1475,7 @@
if($this->role=='detail')
{
$filtermethod= ' AND attrib_detail=2';
- $table = 'fm_r_agreement_detail';
+ $table = 'fm_r_agreement_item';
}
else
{
@@ -1574,7 +1647,7 @@
{
$filtermethod= ' AND attrib_detail=2';
$filtermethod2= ' WHERE attrib_detail=2';
- $table = 'fm_r_agreement_detail';
+ $table = 'fm_r_agreement_item';
}
else
{
@@ -1672,11 +1745,7 @@
}
else
{
- $end_date = $this->db->f('end_date');
- if($end_date > mktime(0, 0, 0, 12, 32,
date(Y))) // next year
- {
- $end_date = mktime(0, 0, 0, 12, 31,
date(Y)); // last day of this year
- }
+ $end_date = mktime(0, 0, 0, 12, 31,
date(Y,$start_date)); // last day of start year
}
@@ -1687,7 +1756,7 @@
$receipt['r_agreement_id']= $values['r_agreement_id'];
$receipt['c_id']= $c_id;
- $receipt['message'][] = array('msg'=>lang('r_agreement
%1 has been saved',$receipt['r_agreement_id']));
+ $receipt['message'][] = array('msg'=>lang('agreement %1
has been saved',$receipt['r_agreement_id']));
$this->db->transaction_commit();
return $receipt;
@@ -1721,12 +1790,7 @@
}
else
{
- $end_date = $this->db->f('to_date');
-
- if($end_date > mktime(0, 0, 0, 12, 32,
date(Y))) // next year
- {
- $end_date = mktime(0, 0, 0, 12, 31,
date(Y)); // last day of this year
- }
+ $end_date = mktime(0, 0, 0, 12, 31,
date(Y,$start_date)); // last day of start year
}
@@ -1739,7 +1803,7 @@
$receipt['r_agreement_id']= $values['r_agreement_id'];
$receipt['c_id']= $values['c_id'];
- $receipt['message'][] = array('msg'=>lang('r_agreement
%1 has been saved',$receipt['r_agreement_id']));
+ $receipt['message'][] = array('msg'=>lang('agreement %1
has been saved',$receipt['r_agreement_id']));
$this->db->transaction_commit();
return $receipt;
@@ -1849,6 +1913,5 @@
$this->db->transaction_commit();
}
-
}
?>
Index: property/inc/class.uir_agreement.inc.php
diff -u property/inc/class.uir_agreement.inc.php:1.11
property/inc/class.uir_agreement.inc.php:1.12
--- property/inc/class.uir_agreement.inc.php:1.11 Mon Feb 20 14:02:45 2006
+++ property/inc/class.uir_agreement.inc.php Tue Feb 21 14:48:22 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage agreement
- * @version $Id: class.uir_agreement.inc.php,v 1.11 2006/02/20 14:02:45
sigurdne Exp $
+ * @version $Id: class.uir_agreement.inc.php,v 1.12 2006/02/21 14:48:22
sigurdne Exp $
*/
/**
@@ -1068,6 +1068,10 @@
$values['street_number'] =
$_POST['street_number'];
$values['location_name'] = $_POST['loc'
. (count($values['location'])).'_name']; // if not address - get the parent
name as address
+ $values['tenant_id'] =
get_var('tenant_id',array('POST'));
+ $values['start_date'] =
get_var('start_date',array('POST'));
+ $values['end_date'] =
get_var('end_date',array('POST'));
+
//_debug_array($values);
if ($values['save'] || $values['apply']):
{
@@ -1121,7 +1125,7 @@
if(!$receipt['error'])
{
- $receipt =
$this->bo->update($values);
+ $receipt =
$this->bo->update_item_history($values);
}
}
@@ -1193,10 +1197,14 @@
{
$list =
$this->bo->read_prizing(array('r_agreement_id'=>$r_agreement_id,'item_id'=>$id));
$lookup_type='view';
+ $main_form_name = 'form2';
+ $update_form_name = 'form';
}
else
{
$lookup_type='form';
+ $main_form_name = 'form';
+ $update_form_name = 'form2';
}
$uicols = $this->bo->uicols;
@@ -1209,6 +1217,12 @@
$set_column[]=True;
}
//_debug_array($list);
+
$tenant_data=$this->bocommon->initiate_ui_tenant_lookup(array(
+ 'tenant_id' =>
$values['tenant_id'],
+ 'last_name' =>
$values['last_name'],
+ 'first_name' =>
$values['first_name'],
+ 'role' => 'tenant')
+ );
$table_update[] = array
(
@@ -1217,11 +1231,19 @@
'lang_datetitle' => lang('Select
date'),
'calendar_setup' =>
"Calendar.setup({inputField : 'date',ifFormat : '" . $jsDateFormat .
"',button : 'date-trigger'});",
+ 'lang_index_date' => lang('Index
date'),
'lang_new_index' => lang('New
index'),
'lang_new_index_statustext' => lang('Enter
a new index'),
'lang_date_statustext' => lang('Select
the date for the update'),
'lang_update' =>
lang('Update'),
- 'lang_update_statustext' => lang('update
selected investments')
+ 'lang_update_statustext' => lang('update
selected investments'),
+ 'tenant_data'
=> $tenant_data,
+ 'lang_start_date_statustext'
=> lang('Choose the start date for the next period'),
+ 'lang_end_date_statustext'
=> lang('Choose the end date for the next period'),
+ 'lang_start_date'
=> lang('start date'),
+ 'value_start_date'
=> $default_next_date,
+ 'lang_end_date' =>
lang('end date'),
+
);
@@ -1237,12 +1259,6 @@
'entity_data' =>
False,//$values['p']
));
-
$tenant_data=$this->bocommon->initiate_ui_tenant_lookup(array(
- 'tenant_id' =>
$values['tenant_id'],
- 'last_name' =>
$values['last_name'],
- 'first_name' =>
$values['first_name'],
- 'role' => 'tenant')
- );
$data = array
(
@@ -1283,7 +1299,7 @@
'values'
=> $content,
'table_header'
=> $table_header,
'acl_manage'
=> $this->acl_manage,
- 'table_update'
=> $table_update,
+ 'table_update_item'
=> $table_update,
'update_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.edit_item&r_agreement_id='
. $r_agreement_id . '&id=' . $id),
'lang_select_all'
=> lang('Select All'),
'img_check'
=>
$GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.gif',
@@ -1302,12 +1318,14 @@
'lang_rental_type_statustext' => lang('Select
rental type'),
'lang_select_rental_type' =>
lang('Select rental type'),
'lang_rental_type'
=> lang('Rental type'),
- 'lang_start_date_statustext'
=> lang('Choose the start date for the next period'),
- 'lang_end_date_statustext'
=> lang('Choose the end date for the next period'),
+ 'lang_start_date_statustext' => lang('Choose
the start date for the next period'),
+ 'lang_end_date_statustext' =>
lang('Choose the end date for the next period'),
'lang_start_date'
=> lang('start date'),
'value_start_date'
=> $default_next_date,
- 'lang_end_date' =>
lang('end date'),
+ 'lang_end_date'
=> lang('end date'),
// 'value_end_date'
=> $r_agreement['start_date'],
+ 'main_form_name'
=> $main_form_name,
+ 'update_form_name'
=> $update_form_name,
);
@@ -1981,7 +1999,7 @@
if(!$receipt['error'])
{
- $receipt =
$this->bo->update($values);
+ $receipt =
$this->bo->update_item_history($values);
}
}
Index: property/setup/setup.inc.php
diff -u property/setup/setup.inc.php:1.29 property/setup/setup.inc.php:1.30
--- property/setup/setup.inc.php:1.29 Thu Feb 16 14:48:45 2006
+++ property/setup/setup.inc.php Tue Feb 21 14:48:22 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage setup
- * @version $Id: setup.inc.php,v 1.29 2006/02/16 14:48:45 sigurdne Exp $
+ * @version $Id: setup.inc.php,v 1.30 2006/02/21 14:48:22 sigurdne Exp $
*/
$setup_info['property']['name'] = 'property';
@@ -192,8 +192,8 @@
'fm_r_agreement_attribute',
'fm_r_agreement_category',
'fm_r_agreement_choice',
- 'fm_r_agreement_detail',
- 'fm_r_agreement_pricing',
+ 'fm_r_agreement_item',
+ 'fm_r_agreement_item_history',
'fm_r_agreement_common',
'fm_r_agreement_c_history'
);
Index: property/setup/tables_current.inc.php
diff -u property/setup/tables_current.inc.php:1.46
property/setup/tables_current.inc.php:1.47
--- property/setup/tables_current.inc.php:1.46 Mon Feb 20 14:02:45 2006
+++ property/setup/tables_current.inc.php Tue Feb 21 14:48:22 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage setup
- * @version $Id: tables_current.inc.php,v 1.46 2006/02/20 14:02:45
sigurdne Exp $
+ * @version $Id: tables_current.inc.php,v 1.47 2006/02/21 14:48:22
sigurdne Exp $
*/
$phpgw_baseline = array(
@@ -2067,7 +2067,7 @@
'uc' => array()
),
- 'fm_r_agreement_detail' => array(
+ 'fm_r_agreement_item' => array(
'fd' => array(
'agreement_id' => array('type' => 'int',
'precision' => 4,'nullable' => False,'default' => '0'),
'id' => array('type' => 'int', 'precision' =>
4,'nullable' => False,'default' => '0'),
@@ -2084,7 +2084,6 @@
'entry_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
'test' => array('type' => 'text','nullable' =>
True),
'cost' => array('type' => 'decimal',
'precision' => 20, 'scale' => 2,'nullable' => True),
- 'tenant_id' => array('type' => 'int',
'precision' => 4,'nullable' => True),
'rental_type_id' => array('type' => 'int',
'precision' => 4,'nullable' => True)
),
'pk' => array('agreement_id','id'),
@@ -2093,7 +2092,7 @@
'uc' => array()
),
- 'fm_r_agreement_pricing' => array(
+ 'fm_r_agreement_item_history' => array(
'fd' => array(
'agreement_id' => array('type' => 'int',
'precision' => 4,'nullable' => False,'default' => '0'),
'item_id' => array('type' => 'int', 'precision'
=> 4,'nullable' => False,'default' => '0'),
@@ -2106,6 +2105,7 @@
'entry_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
'from_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
'to_date' => array('type' => 'int', 'precision'
=> 4,'nullable' => True),
+ 'tenant_id' => array('type' => 'int',
'precision' => 4,'nullable' => True),
),
'pk' => array('agreement_id','item_id','id'),
'fk' => array(),
Index: property/setup/tables_update.inc.php
diff -u property/setup/tables_update.inc.php:1.29
property/setup/tables_update.inc.php:1.30
--- property/setup/tables_update.inc.php:1.29 Mon Feb 20 14:02:45 2006
+++ property/setup/tables_update.inc.php Tue Feb 21 14:48:22 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage setup
- * @version $Id: tables_update.inc.php,v 1.29 2006/02/20 14:02:45
sigurdne Exp $
+ * @version $Id: tables_update.inc.php,v 1.30 2006/02/21 14:48:22
sigurdne Exp $
*/
/**
@@ -917,7 +917,7 @@
);
$GLOBALS['phpgw_setup']->oProc->CreateTable(
- 'fm_r_agreement_detail', array(
+ 'fm_r_agreement_item', array(
'fd' => array(
'agreement_id' => array('type' =>
'int', 'precision' => 4,'nullable' => False,'default' => '0'),
'id' => array('type' => 'int',
'precision' => 4,'nullable' => False,'default' => '0'),
@@ -934,7 +934,6 @@
'entry_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
'test' => array('type' =>
'text','nullable' => True),
'cost' => array('type' => 'decimal',
'precision' => 20, 'scale' => 2,'nullable' => True),
- 'tenant_id' => array('type' => 'int',
'precision' => 4,'nullable' => True),
'rental_type_id' => array('type' =>
'int', 'precision' => 4,'nullable' => True)
),
'pk' => array('agreement_id','id'),
@@ -945,7 +944,7 @@
);
$GLOBALS['phpgw_setup']->oProc->CreateTable(
- 'fm_r_agreement_pricing', array(
+ 'fm_r_agreement_item_history', array(
'fd' => array(
'agreement_id' => array('type' =>
'int', 'precision' => 4,'nullable' => False,'default' => '0'),
'item_id' => array('type' => 'int',
'precision' => 4,'nullable' => False,'default' => '0'),
@@ -958,6 +957,7 @@
'entry_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
'from_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
'to_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'tenant_id' => array('type' => 'int',
'precision' => 4,'nullable' => True),
),
'pk' => array('agreement_id','item_id','id'),
'fk' => array(),
Index: property/templates/base/r_agreement.xsl
diff -u property/templates/base/r_agreement.xsl:1.11
property/templates/base/r_agreement.xsl:1.12
--- property/templates/base/r_agreement.xsl:1.11 Mon Feb 20 14:02:45 2006
+++ property/templates/base/r_agreement.xsl Tue Feb 21 14:48:22 2006
@@ -366,10 +366,10 @@
</script>
<div align="left">
<xsl:variable name="edit_url"><xsl:value-of
select="edit_url"/></xsl:variable>
- <table cellpadding="2" cellspacing="2" align="center">
+ <table cellpadding="2" cellspacing="2" width="90%"
align="center">
<tr><td>
<form ENCTYPE="multipart/form-data" method="post" name="form"
action="{$edit_url}">
- <table cellpadding="2" cellspacing="2" width="79%" align="left">
+ <table cellpadding="2" cellspacing="2" width="90%" align="left">
<xsl:choose>
<xsl:when test="msgbox_data != ''">
<tr>
@@ -591,6 +591,9 @@
</xsl:when>
</xsl:choose>
<tr height="50">
+ <td colspan = '2'>
+ <table>
+ <tr>
<td valign="bottom">
<xsl:variable
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
<input type="submit"
name="values[save]" value="{$lang_save}" onMouseout="window.status='';return
true;">
@@ -621,11 +624,16 @@
</xsl:attribute>
</input>
</td>
+ </tr>
+ </table>
+ </td>
</tr>
</table>
</form>
- </td></tr>
- <tr><td>
+ </td>
+ </tr>
+ <tr>
+ <td>
<form method="post" name="alarm" action="{$edit_url}">
<input type="hidden" name="values[entity_id]"
value="{value_r_agreement_id}" ></input>
<table>
@@ -640,99 +648,103 @@
</td>
</tr>
</table>
-
- <table>
- <tr>
- <td class="th_text" align="left" colspan="5">
- <HR/>
- <xsl:value-of select="lang_space"/>
- </td>
- </tr>
- <tr>
- <td>
- <xsl:choose>
- <xsl:when test="table_update!=''">
- <xsl:variable name="update_action"><xsl:value-of
select="update_action"/></xsl:variable>
- <form method="post" name="form2"
action="{$update_action}">
- <input type="hidden"
name="values[agreement_id]" value="{value_r_agreement_id}" ></input>
- <table width="100%" cellpadding="2"
cellspacing="2" align="center">
- <tr>
- <xsl:for-each
select="set_column" >
- <td></td>
- </xsl:for-each>
- <td class="small_text"
valign="bottom" align="center">
- <xsl:variable
name="link_excel"><xsl:value-of select="link_excel"/></xsl:variable>
- <xsl:variable
name="lang_excel_help"><xsl:value-of select="lang_excel_help"/></xsl:variable>
- <xsl:variable
name="lang_excel"><xsl:value-of select="lang_excel"/></xsl:variable>
- <a
href="javascript:var w=window.open('{$link_excel}','','')"
-
onMouseOver="overlib('{$lang_excel_help}', CAPTION, '{$lang_excel}')"
-
onMouseOut="nd()">
- <xsl:value-of
select="lang_excel"/></a>
- </td></tr>
-
- <xsl:call-template
name="table_header"/>
- <xsl:call-template
name="values"/>
- <xsl:variable
name="check_source"><xsl:value-of select="check_source"/></xsl:variable>
- <SCRIPT LANGUAGE="JavaScript"
SRC="{$check_source}"></SCRIPT>
- <tr>
- <xsl:for-each
select="set_column" >
- <td></td>
- </xsl:for-each>
- <td align="center">
- <xsl:variable
name="img_check"><xsl:value-of select="img_check"/></xsl:variable>
- <a
href="javascript:check_all_checkbox2('values[select]')"><img src="{$img_check}"
border="0" height="16" width="21" alt="{lang_select_all}"/></a>
- </td>
- </tr>
- </table>
- <table width="70%" cellpadding="2"
cellspacing="2" align="center">
- <xsl:apply-templates
select="table_update"/>
- </table>
- </form>
- </xsl:when>
- </xsl:choose>
<xsl:choose>
<xsl:when test="value_r_agreement_id!=''">
- <table width="100%" cellpadding="2"
cellspacing="2" align="center">
- <xsl:apply-templates
select="table_add_space"/>
- </table>
+ <table>
+ <tr>
+ <xsl:attribute name="class">
+ <xsl:text>row_on</xsl:text>
+ </xsl:attribute>
+ <td class="th_text" align="left"
colspan="5">
+ <HR/>
+ <xsl:value-of select="lang_space"/>
+ </td>
+ </tr>
+ <tr>
+ <xsl:attribute name="class">
+ <xsl:text>row_off</xsl:text>
+ </xsl:attribute>
+
+ <td>
+ <table width="100%"
cellpadding="2" cellspacing="2" align="center">
+ <tr>
+ <xsl:for-each
select="set_column" >
+
<td></td>
+ </xsl:for-each>
+ <td
class="small_text" valign="bottom" align="center">
+
<xsl:variable name="link_excel"><xsl:value-of
select="link_excel"/></xsl:variable>
+
<xsl:variable name="lang_excel_help"><xsl:value-of
select="lang_excel_help"/></xsl:variable>
+
<xsl:variable name="lang_excel"><xsl:value-of
select="lang_excel"/></xsl:variable>
+ <a
href="javascript:var w=window.open('{$link_excel}','','')"
+
onMouseOver="overlib('{$lang_excel_help}', CAPTION, '{$lang_excel}')"
+
onMouseOut="nd()">
+
<xsl:value-of select="lang_excel"/></a>
+ </td></tr>
+
+ <xsl:call-template
name="table_header"/>
+ <xsl:call-template
name="values"/>
+ <xsl:variable
name="check_source"><xsl:value-of select="check_source"/></xsl:variable>
+ <SCRIPT
LANGUAGE="JavaScript" SRC="{$check_source}"></SCRIPT>
+ <tr>
+ <xsl:for-each
select="set_column" >
+
<td></td>
+ </xsl:for-each>
+ <td
align="center">
+
<xsl:variable name="img_check"><xsl:value-of select="img_check"/></xsl:variable>
+ <a
href="javascript:check_all_checkbox2('values[select]')"><img src="{$img_check}"
border="0" height="16" width="21" alt="{lang_select_all}"/></a>
+ </td>
+ </tr>
+ </table>
+ <xsl:choose>
+ <xsl:when
test="table_update!=''">
+ <xsl:variable
name="update_action"><xsl:value-of select="update_action"/></xsl:variable>
+ <form
method="post" name="form2" action="{$update_action}">
+ <input
type="hidden" name="values[agreement_id]" value="{value_r_agreement_id}"
></input>
+ <table
width="70%" cellpadding="2" cellspacing="2" align="center">
+
<xsl:apply-templates select="table_update"/>
+ </table>
+ </form>
+ </xsl:when>
+ </xsl:choose>
+ <table width="100%"
cellpadding="2" cellspacing="2" align="center">
+ <xsl:apply-templates
select="table_add_space"/>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <xsl:attribute name="class">
+ <xsl:text>row_on</xsl:text>
+ </xsl:attribute>
+
+ <td class="th_text" align="left" colspan="5">
+ <HR/>
+ <xsl:value-of select="lang_service"/>
+ </td>
+ </tr>
+ <xsl:apply-templates
select="table_add_service"/>
+
+ <tr>
+ <xsl:attribute name="class">
+ <xsl:text>row_on</xsl:text>
+ </xsl:attribute>
+
+ <td class="th_text" align="left" colspan="10">
+ <HR/>
+ <xsl:value-of
select="lang_common_costs"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <table>
+ <xsl:apply-templates
select="table_header_common"/>
+ <xsl:apply-templates select="values_common"/>
+ <xsl:apply-templates select="table_add_common"/>
+ </table>
+ </td>
+ </tr>
+ </table>
</xsl:when>
</xsl:choose>
- </td>
- </tr>
-
-
- <tr>
- <xsl:attribute name="class">
- <xsl:text>row_on</xsl:text>
- </xsl:attribute>
-
- <td class="th_text" align="left" colspan="5">
- <HR/>
- <xsl:value-of select="lang_service"/>
- </td>
- </tr>
- <xsl:apply-templates select="table_add_service"/>
-
- <tr>
- <xsl:attribute name="class">
- <xsl:text>row_on</xsl:text>
- </xsl:attribute>
-
- <td class="th_text" align="left" colspan="10">
- <HR/>
- <xsl:value-of select="lang_common_costs"/>
- </td>
- </tr>
- <tr>
- <td>
- <table>
- <xsl:apply-templates select="table_header_common"/>
- <xsl:apply-templates select="values_common"/>
- <xsl:apply-templates select="table_add_common"/>
- </table>
- </td>
- </tr>
- </table>
</div>
</xsl:template>
@@ -838,6 +850,9 @@
<xsl:template match="edit_item">
<xsl:variable name="dateformat_source"><xsl:value-of
select="dateformat_source"/></xsl:variable>
+ <xsl:variable name="main_form_name"><xsl:value-of
select="main_form_name"/></xsl:variable>
+ <xsl:variable name="update_form_name"><xsl:value-of
select="update_form_name"/></xsl:variable>
+
<SCRIPT LANGUAGE="JavaScript"
SRC="{$dateformat_source}"></SCRIPT>
<script language="JavaScript">
@@ -846,7 +861,7 @@
</script>
<xsl:variable name="edit_url"><xsl:value-of
select="edit_url"/></xsl:variable>
<div align="left">
- <form name="form" method="post" action="{$edit_url}">
+ <form name="{$main_form_name}" method="post"
action="{$edit_url}">
<table cellpadding="2" cellspacing="2" width="100%"
align="center">
<xsl:choose>
<xsl:when test="msgbox_data != ''">
@@ -883,26 +898,74 @@
</td>
</tr>
<xsl:call-template
name="location_view"/>
+ <tr>
+ <td valign="top">
+ <xsl:value-of
select="lang_rental_type"/>
+ </td>
+ <td>
+ <xsl:for-each
select="rental_type_list[selected='selected']" >
+ <xsl:value-of
select="name"/>
+ <xsl:if
test="position() != last()">, </xsl:if>
+ </xsl:for-each>
+ </td>
+ </tr>
+
</xsl:when>
<xsl:otherwise>
<xsl:call-template
name="location_form"/>
- </xsl:otherwise>
+ <xsl:call-template name="tenant_form"/>
+ <tr>
+ <td valign="top">
+ <xsl:value-of
select="lang_rental_type"/>
+ </td>
+ <td valign="top">
+ <xsl:variable
name="lang_rental_type_statustext"><xsl:value-of
select="lang_rental_type_statustext"/></xsl:variable>
+ <select
name="values[rental_type_id]" class="forms"
onMouseover="window.status='{$lang_rental_type_statustext}'; return true;"
onMouseout="window.status='';return true;">
+ <option
value=""><xsl:value-of select="lang_select_rental_type"/></option>
+
<xsl:apply-templates select="rental_type_list"/>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">
+ <xsl:value-of
select="lang_start_date"/>
+ </td>
+ <td>
+ <input type="text"
id="start_date" name="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:value-of select="lang_start_date_statustext"/>
+
<xsl:text>'; return true;</xsl:text>
+ </xsl:attribute>
+ </input>
+ <script
type="text/javascript">
+ document.writeln('<img
id="start_date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
+ <xsl:value-of
select="calendar_setup_start"/>
+ </script>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">
+ <xsl:value-of
select="lang_end_date"/>
+ </td>
+ <td>
+ <input type="text"
id="end_date" name="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:value-of select="lang_end_date_statustext"/>
+
<xsl:text>'; return true;</xsl:text>
+ </xsl:attribute>
+ </input>
+ <script
type="text/javascript">
+ document.writeln('<img
id="end_date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
+ <xsl:value-of
select="calendar_setup_end"/>
+ </script>
+ </td>
+ </tr>
+ </xsl:otherwise>
</xsl:choose>
- <xsl:call-template name="tenant_form"/>
- <tr>
- <td valign="top">
- <xsl:value-of
select="lang_rental_type"/>
- </td>
- <td valign="top">
- <xsl:variable
name="lang_rental_type_statustext"><xsl:value-of
select="lang_rental_type_statustext"/></xsl:variable>
- <select name="values[rental_type_id]"
class="forms" onMouseover="window.status='{$lang_rental_type_statustext}';
return true;" onMouseout="window.status='';return true;">
- <option value=""><xsl:value-of
select="lang_select_rental_type"/></option>
- <xsl:apply-templates
select="rental_type_list"/>
- </select>
- </td>
- </tr>
<tr>
<td valign="top">
<xsl:value-of select="lang_cost"/>
@@ -918,43 +981,6 @@
</td>
</tr>
- <tr>
- <td valign="top">
- <xsl:value-of select="lang_start_date"/>
- </td>
- <td>
- <input type="text" id="start_date"
name="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:value-of
select="lang_start_date_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
- </xsl:attribute>
- </input>
- <script type="text/javascript">
- document.writeln('<img
id="start_date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
- <xsl:value-of
select="calendar_setup_start"/>
- </script>
- </td>
- </tr>
- <tr>
- <td valign="top">
- <xsl:value-of select="lang_end_date"/>
- </td>
- <td>
- <input type="text" id="end_date"
name="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:value-of
select="lang_end_date_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
- </xsl:attribute>
- </input>
- <script type="text/javascript">
- document.writeln('<img
id="end_date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
- <xsl:value-of
select="calendar_setup_end"/>
- </script>
- </td>
- </tr>
-
<xsl:choose>
<xsl:when test="attributes_values != ''">
<tr>
@@ -1009,21 +1035,20 @@
<xsl:when test="values != ''">
<xsl:variable
name="update_action"><xsl:value-of select="update_action"/></xsl:variable>
- <form method="post" name="form2"
action="{$update_action}">
+ <form method="post" name="{$update_form_name}"
action="{$update_action}">
<input type="hidden"
name="values[agreement_id]" value="{value_r_agreement_id}" ></input>
<input type="hidden"
name="values[item_id]" value="{value_id}" ></input>
<table width="100%" cellpadding="2"
cellspacing="2" align="center">
<xsl:call-template
name="table_header"/>
<xsl:call-template
name="values2"/>
</table>
- <table width="70%" cellpadding="2"
cellspacing="2" align="center">
+ <table width="70%" cellpadding="2"
cellspacing="2" align="left">
<xsl:choose>
- <xsl:when
test="table_update!=''">
- <xsl:apply-templates
select="table_update"/>
+ <xsl:when
test="table_update_item!=''">
+ <xsl:apply-templates
select="table_update_item"/>
</xsl:when>
</xsl:choose>
<tr>
- <td></td><td></td>
<td class="small_text"
align="left">
<a
href="{delete_action}"
onMouseover="window.status='{lang_delete_last_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="lang_delete_last"/></a>
</td>
@@ -1037,6 +1062,95 @@
</xsl:template>
+ <xsl:template match="table_update_item">
+ <tr>
+ <td>
+ <xsl:value-of select="lang_new_index"/>
+ </td>
+ <td>
+ <input type="text"
name="values[new_index]" size="12" onMouseout="window.status='';return true;" >
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_new_index_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <xsl:value-of select="lang_index_date"/>
+ </td>
+ <td>
+ <input type="text" id="date"
name="date" size="10" value="{date}" readonly="readonly"
onMouseout="window.status='';return true;" >
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_date_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
+
+ <script type="text/javascript">
+ document.writeln('<img
id="date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
+ <xsl:value-of select="calendar_setup"/>
+ </script>
+ </td>
+ </tr>
+ <xsl:call-template name="tenant_form"/>
+
+ <tr>
+ <td valign="top">
+ <xsl:value-of select="lang_start_date"/>
+ </td>
+ <td>
+ <input type="text" id="start_date"
name="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:value-of
select="lang_start_date_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
+ <script type="text/javascript">
+ document.writeln('<img
id="start_date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
+ <xsl:value-of
select="calendar_setup_start"/>
+ </script>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">
+ <xsl:value-of select="lang_end_date"/>
+ </td>
+ <td>
+ <input type="text" id="end_date"
name="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:value-of
select="lang_end_date_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
+ <script type="text/javascript">
+ document.writeln('<img
id="end_date-trigger" src="{date_img}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;"/>');
+ <xsl:value-of
select="calendar_setup_end"/>
+ </script>
+ </td>
+ </tr>
+
+ <tr>
+ <td height="50" colspan = '2' align = 'left'>
+ <xsl:variable
name="lang_update"><xsl:value-of select="lang_update"/></xsl:variable>
+ <input type="submit"
name="values[update]" value="{$lang_update}"
onMouseout="window.status='';return true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+
<xsl:value-of select="lang_update_statustext"/>
+ <xsl:text>';
return true;</xsl:text>
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
+
+
+ </xsl:template>
+
<xsl:template match="table_update">
<tr>
<td>