[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.sogab.inc.php class.uigab.in...
From: |
Sigurd Nes |
Subject: |
[Phpgroupware-cvs] property/inc class.sogab.inc.php class.uigab.in... |
Date: |
Sun, 02 Apr 2006 10:21:14 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Branch:
Changes by: Sigurd Nes <address@hidden> 06/04/02 10:21:14
Modified files:
inc : class.sogab.inc.php class.uigab.inc.php
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.sogab.inc.php.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.uigab.inc.php.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
Patches:
Index: property/inc/class.sogab.inc.php
diff -u property/inc/class.sogab.inc.php:1.16
property/inc/class.sogab.inc.php:1.17
--- property/inc/class.sogab.inc.php:1.16 Fri Mar 31 11:24:22 2006
+++ property/inc/class.sogab.inc.php Sun Apr 2 10:21:14 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.16 2006/03/31 11:24:22 sigurdne
Exp $
+ * @version $Id: class.sogab.inc.php,v 1.17 2006/04/02 10:21:14 sigurdne
Exp $
*/
/**
@@ -114,9 +114,17 @@
$where = 'AND';
}
+ if($check_payments)
+ {
+
+ $j = 1;
+ }
+ else
+ {
+ $j = $this->gab_insert_level;
+ }
- $j = $this->gab_insert_level;
- $joinmethod .= " $this->join fm_location". ($j);
+ $joinmethod .= "$this->join fm_location". ($j);
$on = 'ON';
for ($i=($j); $i>0; $i--)
{
@@ -124,7 +132,15 @@
$on = 'AND';
}
- $sql = "SELECT gab_id,count(gab_id) as hits, loc" . $j
. "_name as address ,fm_gab_location.location_code, fm_gab_location.owner as
owner FROM fm_gab_location $joinmethod $filtermethod GROUP BY
gab_id,fm_gab_location.location_code,loc" . $j . "_name,owner ";
+
+ if($check_payments)
+ {
+ $sql = "SELECT gab_id,count(gab_id) as hits,
loc" . $j . "_name as address ,fm_gab_location.loc1 as location_code,
fm_gab_location.owner as owner FROM fm_gab_location $joinmethod $filtermethod
GROUP BY gab_id,fm_gab_location.loc1,loc" . $j . "_name,owner ";
+ }
+ else
+ {
+ $sql = "SELECT gab_id,count(gab_id) as hits,
loc" . $j . "_name as address ,fm_gab_location.location_code,
fm_gab_location.owner as owner FROM fm_gab_location $joinmethod $filtermethod
GROUP BY gab_id,fm_gab_location.location_code,loc" . $j . "_name,owner ";
+ }
$this->db2->query($sql,__LINE__,__FILE__);
$this->total_records = $this->db2->num_rows();
@@ -216,8 +232,7 @@
$cols .= ',gab_id';
$cols_return[] = 'gab_id';
$cols_return[] = 'owner';
-
-
+
$sql =
$this->bocommon->generate_sql(array('entity_table'=>$entity_table,'cols'=>$cols,'cols_return'=>$cols_return,
'uicols'=>$uicols,'joinmethod'=>$joinmethod,'paranthesis'=>$paranthesis,'query'=>$query));
@@ -246,8 +261,14 @@
$sql .= " $filtermethod ";
//echo $sql;
$this->uicols = $this->bocommon->uicols;
+
+ $this->uicols['input_type'][] = 'text';
+ $this->uicols['name'][] = 'owner';
+ $this->uicols['descr'][] = lang('owner');
+ $this->uicols['statustext'][] = lang('owner');
+
$cols_return = $this->bocommon->cols_return;
- $type_id =
$this->bocommon->type_id;
+ $type_id = $this->bocommon->type_id;
$this->cols_extra = $this->bocommon->cols_extra;
Index: property/inc/class.uigab.inc.php
diff -u property/inc/class.uigab.inc.php:1.15
property/inc/class.uigab.inc.php:1.16
--- property/inc/class.uigab.inc.php:1.15 Fri Mar 31 11:34:15 2006
+++ property/inc/class.uigab.inc.php Sun Apr 2 10:21:14 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.15 2006/03/31 11:34:15 sigurdne
Exp $
+ * @version $Id: class.uigab.inc.php,v 1.16 2006/04/02 10:21:14 sigurdne
Exp $
*/
/**
@@ -246,7 +246,7 @@
'check_payments' =>$check_payments)
)),
'lang_owner' => lang('owner'),
- 'lang_hits' =>
lang('number'),
+ 'lang_hits' => lang('hits'),
'lang_address' => lang('Address'),
'lang_gaards_nr' => lang('gaards nr'),
'lang_bruksnr' => lang('bruks nr'),
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.sogab.inc.php class.uigab.in...,
Sigurd Nes <=