[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.solocation.inc.php class.uig...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc class.solocation.inc.php class.uig... |
|
Date: |
Tue, 05 Sep 2006 17:47:06 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/09/05 17:47:06
Modified files:
inc : class.solocation.inc.php class.uigab.inc.php
class.sogab.inc.php class.bogab.inc.php
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.solocation.inc.php?cvsroot=phpgroupware&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uigab.inc.php?cvsroot=phpgroupware&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.sogab.inc.php?cvsroot=phpgroupware&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.bogab.inc.php?cvsroot=phpgroupware&r1=1.10&r2=1.11
Patches:
Index: class.solocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- class.solocation.inc.php 5 Sep 2006 12:46:01 -0000 1.30
+++ class.solocation.inc.php 5 Sep 2006 17:47:06 -0000 1.31
@@ -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.solocation.inc.php,v 1.30 2006/09/05 12:46:01
sigurdne Exp $
+ * @version $Id: class.solocation.inc.php,v 1.31 2006/09/05 17:47:06
sigurdne Exp $
*/
/**
@@ -245,7 +245,7 @@
}
*/
-
+ $joinmethod ='';
for ($j=($type_id-1); $j>0; $j--)
{
$joinmethod .= " $this->join
fm_location". ($j);
@@ -611,7 +611,7 @@
function
generate_sql($type_id='',$cols='',$cols_return='',$uicols='',$read_single='')
{
- $joinmethod .= " fm_location" . ($type_id);
+ $joinmethod = " fm_location" . ($type_id);
$location_types =
$this->soadmin_location->select_location_type();
Index: class.uigab.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uigab.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- class.uigab.inc.php 17 Jun 2006 08:45:56 -0000 1.18
+++ class.uigab.inc.php 5 Sep 2006 17:47:06 -0000 1.19
@@ -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.18 2006/06/17 08:45:56 sigurdne
Exp $
+ * @version $Id: class.uigab.inc.php,v 1.19 2006/09/05 17:47:06 sigurdne
Exp $
*/
/**
@@ -64,7 +64,6 @@
$this->order =
$this->bo->order;
$this->filter =
$this->bo->filter;
$this->cat_id =
$this->bo->cat_id;
- $this->status_id =
$this->bo->status_id;
$this->allrows =
$this->bo->allrows;
$this->gab_insert_level =
$this->bo->gab_insert_level;
@@ -202,13 +201,15 @@
$config =
CreateObject('phpgwapi.config',$this->currentapp);
$config->read_repository();
- $link_to_map = $config->config_data['map_url'];
+
+ $link_to_map =
(isset($config->config_data['map_url'])?$config->config_data['map_url']:'');
+
if($link_to_map)
{
$text_map=lang('Map');
$lang_map_statustext = lang('View map');
}
- $link_to_gab = $config->config_data['gab_url'];
+ $link_to_gab =
(isset($config->config_data['gab_url'])?$config->config_data['gab_url']:'');
if($link_to_gab)
{
$text_gab=lang('GAB');
@@ -219,6 +220,7 @@
$i=0;
+ $content=array();
while (is_array($gab_list) && list(,$gab) =
each($gab_list))
{
if(is_array($payment_date))
@@ -267,7 +269,7 @@
'order' => $this->order,
'extra' => array('menuaction'=> $this->currentapp.'.uigab.index',
'cat_id' =>$this->cat_id,
-
'district_id' => $this->district_id,
+
// 'district_id' => $this->district_id,
'filter' =>$this->filter,
'allrows' => $this->allrows,
'query' =>$this->query,
@@ -287,7 +289,7 @@
'order' => $this->order,
'extra' => array('menuaction'=> $this->currentapp.'.uigab.index',
'cat_id' =>$this->cat_id,
-
'district_id' => $this->district_id,
+
// 'district_id' => $this->district_id,
'filter' =>$this->filter,
'allrows' => $this->allrows,
'query' =>$this->query,
@@ -306,7 +308,7 @@
'order' => $this->order,
'extra' => array('menuaction'=> $this->currentapp.'.uigab.index',
'cat_id' =>$this->cat_id,
-
'district_id' => $this->district_id,
+
// 'district_id' => $this->district_id,
'filter' =>$this->filter,
'allrows' => $this->allrows,
'query' =>$this->query,
@@ -327,7 +329,7 @@
'lang_seksjons_nr' => lang('Seksjons nr'),
'lang_location_code'=> lang('Location'),
'lang_view' => lang('view'),
- 'lang_map' => $text_map,
+ 'lang_map' => lang('map'),
);
$colspan = count($table_header[0]);
Index: class.sogab.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.sogab.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- class.sogab.inc.php 2 Apr 2006 10:21:14 -0000 1.17
+++ class.sogab.inc.php 5 Sep 2006 17:47:06 -0000 1.18
@@ -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.17 2006/04/02 10:21:14 sigurdne
Exp $
+ * @version $Id: class.sogab.inc.php,v 1.18 2006/09/05 17:47:06 sigurdne
Exp $
*/
/**
@@ -19,6 +19,7 @@
class sogab
{
var $gab_insert_level;
+ var $payment_date;
function sogab($gab_insert_level)
{
@@ -69,6 +70,7 @@
}
$where = 'WHERE';
+ $filtermethod = '';
if ($cat_id > 0)
{
@@ -76,12 +78,6 @@
$where = 'AND';
}
- if ($status_id)
- {
- $filtermethod .= " $where
fm_gab_location.status='$status_id' ";
- $where = 'AND';
- }
-
if ($address)
{
$filtermethod .= " $where
fm_gab_location.address $this->like '%$address%' ";
@@ -124,7 +120,7 @@
$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--)
{
@@ -154,6 +150,7 @@
$this->db->query($sql .
$ordermethod,__LINE__,__FILE__);
}
+ $gab_list = array();
while ($this->db->next_record())
{
$gab_list[] = array
@@ -253,11 +250,6 @@
$filtermethod .= " AND
fm_gab_location.category='$cat_id' ";
}
- if ($status_id)
- {
- $filtermethod .= " AND
fm_gab_location.status='$status_id' ";
- }
-
$sql .= " $filtermethod ";
//echo $sql;
$this->uicols = $this->bocommon->uicols;
Index: class.bogab.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.bogab.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- class.bogab.inc.php 3 Apr 2006 12:02:44 -0000 1.10
+++ class.bogab.inc.php 5 Sep 2006 17:47:06 -0000 1.11
@@ -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.10 2006/04/03 12:02:44 sigurdne
Exp $
+ * @version $Id: class.bogab.inc.php,v 1.11 2006/09/05 17:47:06 sigurdne
Exp $
*/
/**
@@ -41,14 +41,7 @@
$this->solocation =
CreateObject($this->currentapp.'.solocation');
$this->config =
CreateObject('phpgwapi.config');
$this->config->read_repository();
- $gab_insert_level =
$this->config->config_data['gab_insert_level'];
-
- if (! $gab_insert_level)
- {
- $gab_insert_level = 3;
- }
-
- $this->gab_insert_level = $gab_insert_level;
+ $this->gab_insert_level =
(isset($config->config_data['gab_insert_level'])?$config->config_data['gab_insert_level']:3);
$this->so =
CreateObject($this->currentapp.'.sogab',$this->gab_insert_level);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.solocation.inc.php class.uig...,
Sigurd Nes <=