[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.uigab.inc.php class.sogab.in...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc class.uigab.inc.php class.sogab.in... |
|
Date: |
Fri, 31 Mar 2006 11:24:22 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Branch:
Changes by: Sigurd Nes <address@hidden> 06/03/31 11:24:22
Modified files:
inc : class.uigab.inc.php class.sogab.inc.php
class.bogab.inc.php
Log message:
payment-history
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.uigab.inc.php.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.sogab.inc.php.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.bogab.inc.php.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
Patches:
Index: property/inc/class.bogab.inc.php
diff -u property/inc/class.bogab.inc.php:1.8
property/inc/class.bogab.inc.php:1.9
--- property/inc/class.bogab.inc.php:1.8 Fri Feb 3 12:05:49 2006
+++ property/inc/class.bogab.inc.php Fri Mar 31 11:24:22 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage location
- * @version $Id: class.bogab.inc.php,v 1.8 2006/02/03 12:05:49 sigurdne
Exp $
+ * @version $Id: class.bogab.inc.php,v 1.9 2006/03/31 11:24:22 sigurdne
Exp $
*/
/**
@@ -126,13 +126,14 @@
}
- function
read($loc1='',$gaards_nr='',$bruksnr='',$feste_nr='',$seksjons_nr='',$address='')
+ function
read($loc1='',$gaards_nr='',$bruksnr='',$feste_nr='',$seksjons_nr='',$address='',$check_payments
= '')
{
$gab = $this->so->read(array('start' =>
$this->start,'sort' => $this->sort,'order' =>
$this->order,'allrows'=>$this->allrows,
'cat_id' => $this->cat_id,'loc1' => $loc1,
'gaards_nr' => $gaards_nr,'bruksnr' => $bruksnr,'feste_nr' => $feste_nr,
-
'seksjons_nr' => $seksjons_nr,'address' => $address));
+
'seksjons_nr' => $seksjons_nr,'address' => $address,'check_payments' =>
$check_payments));
$this->total_records = $this->so->total_records;
+ $this->payment_date = $this->so->payment_date;
return $gab;
}
Index: property/inc/class.sogab.inc.php
diff -u property/inc/class.sogab.inc.php:1.15
property/inc/class.sogab.inc.php:1.16
--- property/inc/class.sogab.inc.php:1.15 Fri Mar 10 14:40:11 2006
+++ property/inc/class.sogab.inc.php Fri Mar 31 11:24:22 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage location
- * @version $Id: class.sogab.inc.php,v 1.15 2006/03/10 14:40:11 sigurdne
Exp $
+ * @version $Id: class.sogab.inc.php,v 1.16 2006/03/31 11:24:22 sigurdne
Exp $
*/
/**
@@ -55,6 +55,8 @@
$seksjons_nr =
(isset($data['seksjons_nr'])?$data['seksjons_nr']:'');
$allrows =
(isset($data['allrows'])?$data['allrows']:'');
$address =
(isset($data['address'])?$data['address']:'');
+ $check_payments =
(isset($data['check_payments'])?$data['check_payments']:'');
+
}
if ($order)
@@ -147,6 +149,41 @@
'owner' =>
$this->db->f('owner')
);
}
+
+ if($check_payments)
+ {
+
if($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'])
+ {
+ $dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+ }
+ else
+ {
+ $dateformat = 'd-m-Y';
+ }
+
+ for ($i=0;$i<count($gab_list);$i++)
+ {
+ $sql = "SELECT * FROM fm_ecobilagoverf
WHERE item_id = '" . $gab_list[$i]['gab_id'] . "'";
+
$this->db->query($sql,__LINE__,__FILE__);
+ while ($this->db->next_record())
+ {
+
$gab_list[$i]['payment'][date($dateformat,strtotime($this->db->f('forfallsdato')))]
= $this->db->f('belop');
+
$payment_date[strtotime($this->db->f('forfallsdato'))] =
date($dateformat,strtotime($this->db->f('forfallsdato')));
+ }
+
+ $sql = "SELECT * FROM fm_ecobilag WHERE
item_id = '" . $gab_list[$i]['gab_id'] . "'";
+
$this->db->query($sql,__LINE__,__FILE__);
+ while ($this->db->next_record())
+ {
+
$gab_list[$i]['payment'][date($dateformat,strtotime($this->db->f('forfallsdato')))]
= $this->db->f('belop');
+
$payment_date[strtotime($this->db->f('forfallsdato'))] =
date($dateformat,strtotime($this->db->f('forfallsdato')));
+ }
+
+ }
+
+ $this->payment_date=$payment_date;
+ }
+
return $gab_list;
}
Index: property/inc/class.uigab.inc.php
diff -u property/inc/class.uigab.inc.php:1.13
property/inc/class.uigab.inc.php:1.14
--- property/inc/class.uigab.inc.php:1.13 Fri Feb 3 12:05:49 2006
+++ property/inc/class.uigab.inc.php Fri Mar 31 11:24:22 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage location
- * @version $Id: class.uigab.inc.php,v 1.13 2006/02/03 12:05:49 sigurdne
Exp $
+ * @version $Id: class.uigab.inc.php,v 1.14 2006/03/31 11:24:22 sigurdne
Exp $
*/
/**
@@ -97,6 +97,7 @@
'nextmatchs'));
$address =
get_var('address',array('POST','GET'));
+ $check_payments =
get_var('check_payments',array('POST','GET'));
$location_code =
get_var('location_code',array('POST','GET'));
$gaards_nr =
get_var('gaards_nr',array('POST','GET'));
$bruksnr =
get_var('bruksnr',array('POST','GET'));
@@ -107,6 +108,7 @@
if($reset_query)
{
unset($address);
+ unset($check_payments);
unset($location_code);
unset($gaards_nr);
unset($bruksnr);
@@ -116,7 +118,7 @@
$links = $this->menu->links('gab');
- $gab_list =
$this->bo->read($location_code,$gaards_nr,$bruksnr,$feste_nr,$seksjons_nr,$address);
+ $gab_list =
$this->bo->read($location_code,$gaards_nr,$bruksnr,$feste_nr,$seksjons_nr,$address,$check_payments);
if($this->acl_read)
{
@@ -140,9 +142,13 @@
$lang_gab_statustext = lang('View gab-info');
}
+ $payment_date = $this->bo->payment_date;
+
+ $i=0;
+
while (is_array($gab_list) && list(,$gab) =
each($gab_list))
{
-
+ reset($payment_date);
$value_gaards_nr =
substr($gab['gab_id'],4,5);
$value_bruks_nr =
substr($gab['gab_id'],9,4);
$value_feste_nr =
substr($gab['gab_id'],13,4);
@@ -168,9 +174,14 @@
'lang_gab_statustext' =>
$lang_gab_statustext,
'text_gab' =>
$text_gab
);
+ while (is_array($payment_date) && list(,$date)
= each($payment_date))
+ {
+ $content[$i]['payment'][] =
array('amount' => $gab['payment'][$date]);
+ }
+
+ $i++;
}
-
$table_header[] = array
(
'sort_gab_id' =>
$this->nextmatchs->show_sort_order(array
@@ -189,7 +200,8 @@
'bruksnr' =>$bruksnr,
'feste_nr' =>$feste_nr,
'seksjons_nr' =>$seksjons_nr,
-
'address' =>$address)
+
'address' =>$address,
+
'check_payments' =>$check_payments)
)),
'lang_gab' => lang('gab'),
'sort_hits' =>
$this->nextmatchs->show_sort_order(array
@@ -208,7 +220,8 @@
'bruksnr' =>$bruksnr,
'feste_nr' =>$feste_nr,
'seksjons_nr' =>$seksjons_nr,
-
'address' =>$address)
+
'address' =>$address,
+
'check_payments' =>$check_payments)
)),
'sort_location_code' =>
$this->nextmatchs->show_sort_order(array
(
@@ -226,7 +239,8 @@
'bruksnr' =>$bruksnr,
'feste_nr' =>$feste_nr,
'seksjons_nr' =>$seksjons_nr,
-
'address' =>$address)
+
'address' =>$address,
+
'check_payments' =>$check_payments)
)),
'lang_owner' => lang('owner'),
'lang_hits' =>
lang('number'),
@@ -237,9 +251,20 @@
'lang_seksjons_nr' => lang('Seksjons nr'),
'lang_location_code'=> lang('Location'),
'lang_view' => lang('view'),
- 'lang_map' => $text_map
+ 'lang_map' => $text_map,
);
+ $colspan = count($table_header[0]);
+
+ reset($payment_date);
+ while (is_array($payment_date) && list(,$date) =
each($payment_date))
+ {
+ $table_header[0]['payment_header'][] =
array('header'=>$date);
+ $colspan++;
+ }
+
+
+
$search_field_header[] = array
(
'lang_property' => lang('Property ID'),
@@ -271,7 +296,8 @@
'bruksnr' =>$bruksnr,
'feste_nr' =>$feste_nr,
'seksjons_nr' =>$seksjons_nr,
- 'address' =>$address
+ 'address' =>$address,
+ 'check_payments'
=>$check_payments
);
if(!$this->allrows)
@@ -312,7 +338,11 @@
'lang_search' =>
lang('search'),
'table_header_gab' =>
$table_header,
'values_gab' =>
$content,
- 'table_add' =>
$table_add
+ 'table_add' =>
$table_add,
+ 'lang_check_payments' =>
lang('check payments'),
+ 'lang_check_payments_statustext' =>
lang('List payments history'),
+ 'value_check_payments' =>
$check_payments,
+ 'colspan' =>
$colspan
);
$appname = lang('gab');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.uigab.inc.php class.sogab.in...,
Sigurd Nes <=