[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property inc/class.bolocation.inc.php inc/class...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property inc/class.bolocation.inc.php inc/class... |
|
Date: |
Mon, 30 Oct 2006 09:49:14 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/10/30 09:49:13
Modified files:
inc : class.bolocation.inc.php class.botts.inc.php
class.solocation.inc.php class.sotts2.inc.php
class.uitts.inc.php
setup : default_records.inc.php
templates/base : tts.xsl
Log message:
More work on limited version for external users
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.bolocation.inc.php?cvsroot=phpgroupware&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.botts.inc.php?cvsroot=phpgroupware&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.solocation.inc.php?cvsroot=phpgroupware&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.sotts2.inc.php?cvsroot=phpgroupware&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uitts.inc.php?cvsroot=phpgroupware&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/property/setup/default_records.inc.php?cvsroot=phpgroupware&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/tts.xsl?cvsroot=phpgroupware&r1=1.14&r2=1.15
Patches:
Index: inc/class.bolocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.bolocation.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- inc/class.bolocation.inc.php 10 Oct 2006 13:11:26 -0000 1.22
+++ inc/class.bolocation.inc.php 30 Oct 2006 09:49:13 -0000 1.23
@@ -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.bolocation.inc.php,v 1.22 2006/10/10 13:11:26
sigurdne Exp $
+ * @version $Id: class.bolocation.inc.php,v 1.23 2006/10/30 09:49:13
sigurdne Exp $
*/
/**
@@ -721,5 +721,9 @@
return $history;
}
+ function get_tenant_location($tenant_id='')
+ {
+ return $this->so->get_tenant_location($tenant_id);
+ }
}
?>
Index: inc/class.botts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.botts.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- inc/class.botts.inc.php 29 Oct 2006 20:04:40 -0000 1.28
+++ inc/class.botts.inc.php 30 Oct 2006 09:49:13 -0000 1.29
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage helpdesk
- * @version $Id: class.botts.inc.php,v 1.28 2006/10/29 20:04:40 sigurdne
Exp $
+ * @version $Id: class.botts.inc.php,v 1.29 2006/10/30 09:49:13 sigurdne
Exp $
*/
/**
@@ -473,6 +473,8 @@
function add($ticket)
{
+ if((!isset($ticket['location_code']) || !
$ticket['location_code']) && isset($ticket['location']) &&
is_array($ticket['location']))
+ {
while (is_array($ticket['location']) && list(,$value) =
each($ticket['location']))
{
if($value)
@@ -480,9 +482,11 @@
$location[] = $value;
}
}
+ $ticket['location_code']=implode("-",
$location);
+ }
$ticket['finnish_date'] =
$this->bocommon->date_to_timestamp($ticket['finnish_date']);
- $ticket['location_code']=implode("-", $location);
+
$receipt = $this->so->add($ticket);
Index: inc/class.solocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- inc/class.solocation.inc.php 27 Oct 2006 11:14:35 -0000 1.40
+++ inc/class.solocation.inc.php 30 Oct 2006 09:49:13 -0000 1.41
@@ -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.40 2006/10/27 11:14:35
sigurdne Exp $
+ * @version $Id: class.solocation.inc.php,v 1.41 2006/10/30 09:49:13
sigurdne Exp $
*/
/**
@@ -1303,5 +1303,27 @@
return $location;
}
+
+ function get_tenant_location($tenant_id='')
+ {
+ $location_code = '';
+
+ $location_level =
$this->soadmin_location->read_config_single('tenant_id');
+
+ $this->db->query("SELECT location_code FROM
fm_location{$location_level} WHERE tenant_id='" . $tenant_id
."'",__LINE__,__FILE__);
+ while ($this->db->next_record())
+ {
+ $location_code[] =
$this->db->f('location_code');
+ }
+ if (count($location_code) ==1)
+ {
+ return $location_code[0];
+ }
+ else
+ {
+ return $location_code;
+ }
+ }
+
}
?>
Index: inc/class.sotts2.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.sotts2.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- inc/class.sotts2.inc.php 6 Oct 2006 08:56:22 -0000 1.14
+++ inc/class.sotts2.inc.php 30 Oct 2006 09:49:13 -0000 1.15
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage helpdesk
- * @version $Id: class.sotts2.inc.php,v 1.14 2006/10/06 08:56:22
sigurdne Exp $
+ * @version $Id: class.sotts2.inc.php,v 1.15 2006/10/30 09:49:13
sigurdne Exp $
*/
/**
@@ -147,14 +147,14 @@
** F - finnish date
*/
- $finnish_date =
$this->bocommon->date_to_timestamp($ticket['finnish_date']);
+ $finnish_date =
(isset($ticket['finnish_date'])?$this->bocommon->date_to_timestamp($ticket['finnish_date']):'');
- if ($oldfinnish_date && $ticket['finnish_date']):
+ if ($oldfinnish_date && isset($ticket['finnish_date'])
&& $ticket['finnish_date']):
{
$this->db->query("update fm_tts_tickets set
finnish_date2='" . $finnish_date
. "' where id='$id'",__LINE__,__FILE__);
}
- elseif(!$oldfinnish_date && $ticket['finnish_date'] ):
+ elseif(!$oldfinnish_date &&
isset($ticket['finnish_date']) && $ticket['finnish_date']):
{
$this->db->query("update fm_tts_tickets set
finnish_date='" . $finnish_date
. "' where id='$id'",__LINE__,__FILE__);
@@ -165,7 +165,7 @@
{
$oldfinnish_date = $oldfinnish_date2;
}
- if($ticket['finnish_date'])
+ if(isset($ticket['finnish_date']) &&
$ticket['finnish_date'])
{
if ($oldfinnish_date != $finnish_date)
{
@@ -192,7 +192,7 @@
}
}
- if ($oldassigned != $ticket['assignedto'])
+ if (($oldassigned != $ticket['assignedto']) &&
$ticket['assignedto'] != 'ignore')
{
$fields_updated = True;
@@ -203,7 +203,7 @@
$this->historylog->add('A',$id,$ticket['assignedto'],$oldassigned);
}
- if ($oldgroup_id != $ticket['group_id'])
+ if (($oldgroup_id != $ticket['group_id']) &&
$ticket['group_id'] != 'ignore')
{
$fields_updated = True;
@@ -222,7 +222,7 @@
$this->historylog->add('P',$id,$ticket['priority'],$oldpriority);
}
- if ($oldcat_id != $ticket['cat_id'])
+ if (($oldcat_id != $ticket['cat_id']) &&
$ticket['cat_id'] != 'ignore')
{
$fields_updated = True;
$this->db->query("update fm_tts_tickets set
cat_id='" . $ticket['cat_id']
Index: inc/class.uitts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- inc/class.uitts.inc.php 29 Oct 2006 20:04:40 -0000 1.46
+++ inc/class.uitts.inc.php 30 Oct 2006 09:49:13 -0000 1.47
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage helpdesk
- * @version $Id: class.uitts.inc.php,v 1.46 2006/10/29 20:04:40 sigurdne
Exp $
+ * @version $Id: class.uitts.inc.php,v 1.47 2006/10/30 09:49:13 sigurdne
Exp $
*/
/**
@@ -33,7 +33,13 @@
function uitts()
{
- $this->tenant_id =
$GLOBALS['phpgw']->session->appsession('tenant_id','property');
+ if($this->tenant_id =
$GLOBALS['phpgw']->session->appsession('tenant_id','property'))
+ {
+ $GLOBALS['phpgw_info']['flags']['noframework']
= True;
+ $GLOBALS['phpgw_info']['flags']['noheader'] =
True;
+ $GLOBALS['phpgw_info']['flags']['nofooter'] =
True;
+ }
+
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
$GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
@@ -814,7 +820,7 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uitts.index2',
- 'second_display'=> true,
+ 'second_display' => true,
'sort' => $this->sort,
'order' => $this->order,
'cat_id' => $this->cat_id,
@@ -837,7 +843,6 @@
$autorefresh =
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['refreshinterval'].';
URL='.$GLOBALS['phpgw']->link('/index.php',$link_data);
}
-
if(!$this->allrows)
{
$record_limit =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
@@ -847,7 +852,6 @@
$record_limit = $this->bo->total_records;
}
-
$msgbox_data = $this->bocommon->msgbox_data($receipt);
$link_date_search =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiproject.date_search'));
@@ -1160,7 +1164,7 @@
$bolocation =
CreateObject($this->currentapp.'.bolocation');
$values = get_var('values',array('POST'));
- $insert_record =
$GLOBALS['phpgw']->session->appsession('insert_record',$this->currentapp);
+
$insert_record_entity =
$GLOBALS['phpgw']->session->appsession('insert_record_entity',$this->currentapp);
if(isset($insert_record_entity) &&
is_array($insert_record_entity))
@@ -1173,17 +1177,60 @@
$GLOBALS['phpgw']->xslttpl->add_file(array('tts'));
-//_debug_array($insert_record);
- if (isset($values['save']))
+
+ if(!$this->tenant_id)
{
- for ($i=0;
$i<count($insert_record['location']); $i++)
+ $receipt['error'][]=array('msg'=>lang('No
Tenant selected !'));
+ }
+ else
{
-
if($_POST[$insert_record['location'][$i]])
+ $values['extra']['tenant_id'] =
$this->tenant_id;
+ $values['location_code'] =
$bolocation->get_tenant_location($this->tenant_id);
+
+
+ if(!$values['location_code'])
{
-
$values['location'][$insert_record['location'][$i]]=
$_POST[$insert_record['location'][$i]];
+
$receipt['error'][]=array('msg'=>lang('No location for this tenant!'));
+ }
+ else
+ {
+ $location =
explode('-',$values['location_code']);
+ $i = 1;
+ foreach ($location as $entry)
+ {
+
$values['location']["loc{$i}"]=$entry;
+ $i++;
+ }
+ }
+ if(is_array($values['location_code']))
+ {
+
$receipt['error'][]=array('msg'=>lang('Several locations for this tenant!'));
}
}
+ $values['location_data'] =
$bolocation->read_single($values['location_code'],array('extra'=>array('tenant_id'=>$this->tenant_id)));
+
+ $values['street_name'] =
$values['location_data']['street_name'];
+ $values['street_number'] =
$values['location_data']['street_number'];
+
+
+ $values['assignedto']=
(isset($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['assigntodefault'])?$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['assigntodefault']:'');
+ if(!$values['assignedto'])
+ {
+ $receipt['error'][]=array('msg'=>lang('Please
set default assign to in preferences for user %1!',
$GLOBALS['phpgw']->accounts->id2name($this->account)));
+ }
+
+ $values['group_id']=
(isset($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['groupdefault'])?$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['groupdefault']:'');
+
+ $values['cat_id'] =
(isset($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_category'])?$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_category']:'');
+
+ if(!$values['cat_id'])
+ {
+ $receipt['error'][]=array('msg'=>lang('Please
set default category in preferences for user %1!',
$GLOBALS['phpgw']->accounts->id2name($this->account)));
+ }
+
+ if (isset($values['save']))
+ {
while (is_array($insert_record['extra']) &&
list($key,$column) = each($insert_record['extra']))
{
if($_POST[$key])
@@ -1192,13 +1239,6 @@
}
}
- $values['street_name'] =
$_POST['street_name'];
- $values['street_number'] =
$_POST['street_number'];
- if(isset($values['location']) &&
$values['location'])
- {
- $values['location_name'] =
$_POST['loc' . (count($values['location'])).'_name']; // if not address - get
the parent name as address
- }
-
if(!$values['subject'])
{
$receipt['error'][]=array('msg'=>lang('Please type a subject for this ticket
!'));
@@ -1209,25 +1249,15 @@
$receipt['error'][]=array('msg'=>lang('Please give som details !'));
}
- if((!isset($values['location']['loc1']) ||
!$values['location']['loc1']) && (!isset($values['extra']['p_num']) ||
!$values['extra']['p_num']))
- {
-
$receipt['error'][]=array('msg'=>lang('Please select a location - or an
entity!'));
- }
-
if(!isset($receipt['error']))
{
$receipt = $this->bo->add($values);
$GLOBALS['phpgw']->session->appsession('receipt',$this->currentapp,$receipt);
$GLOBALS['phpgw']->session->appsession('session_data','fm_tts','');
-
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uitts.index'));
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uitts.index2'));
}
else
{
- if(isset($values['location']) &&
$values['location'])
- {
- $location_code=implode("-",
$values['location']);
- $values['location_data'] =
$bolocation->read_single($location_code,(isset($values['extra'])?$values['extra']:false));
- }
if(isset($values['extra']['p_num']) &&
$values['extra']['p_num'])
{
$values['p'][$values['extra']['p_entity_id']]['p_num']=$values['extra']['p_num'];
@@ -1248,30 +1278,11 @@
'entity_data' => false
));
-
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uitts.add2'
);
- if(!isset($values['assignedto']))
- {
- $values['assignedto']=
(isset($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['assigntodefault'])?$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['assigntodefault']:'');
- }
- if(!isset($values['group_id']))
- {
- $values['group_id']=
(isset($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['groupdefault'])?$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['groupdefault']:'');
- }
-
- if(!isset($values['cat_id']))
- {
- $this->cat_id =
(isset($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_category'])?$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_category']:'');
- }
- else
- {
- $this->cat_id = $values['cat_id'];
- }
-
$dateformat =
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
$sep = '/';
$dlarr[strpos($dateformat,'y')] = 'yyyy';
@@ -1705,8 +1716,12 @@
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>4, 'acl_location'=>
'.ticket.external'));
}
+ $values['assignedto'] = 'ignore';
+ $values['group_id'] = 'ignore';
+ $values['cat_id'] = 'ignore';
+
$so2 =
CreateObject($this->currentapp.'.sotts2');
- $so2->acl_location = $this->acl_location;
+ $so2->acl_location = '.ticket.external';
$receipt = $so2->update_ticket($values,$id);
}
@@ -1890,7 +1905,7 @@
'lang_assignedfrom'
=> lang('Assigned from'),
'value_assignedfrom' =>
$ticket['user_name'],
'lang_assignedto'
=> lang('Assigned to'),
- 'value_assignedto'
=> $ticket['assignedto_name'],
+ 'value_assignedto'
=> (isset($ticket['assignedto_name'])?$ticket['assignedto_name']:''),
'lang_no_additional_notes' =>
lang('No additional notes'),
'lang_history'
=> lang('History'),
Index: setup/default_records.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/setup/default_records.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- setup/default_records.inc.php 29 Oct 2006 20:04:40 -0000 1.33
+++ setup/default_records.inc.php 30 Oct 2006 09:49:13 -0000 1.34
@@ -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: default_records.inc.php,v 1.33 2006/10/29 20:04:40
sigurdne Exp $
+ * @version $Id: default_records.inc.php,v 1.34 2006/10/30 09:49:13
sigurdne Exp $
*/
@@ -84,16 +84,16 @@
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_streetaddress (id,
descr) VALUES (1, 'street name 1')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location3
(location_code, loc1, loc2, loc3, loc3_name, entry_date, category, user_id,
status, remark) VALUES ('5000-01-01', '5000', '01', '01', 'entrance name1',
1087745654, 1, 11, 1, NULL)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location3
(location_code, loc1, loc2, loc3, loc3_name, entry_date, category, user_id,
status, remark) VALUES ('5000-01-02', '5000', '01', '02', 'entrance name2',
1087745654, 1, 11, 1, NULL)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location3
(location_code, loc1, loc2, loc3, loc3_name, entry_date, category, user_id,
status, remark) VALUES ('5000-01-03', '5000', '01', '03', 'entrance name3',
1087745654, 1, 11, 1, NULL)");
-
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location4
(location_code, loc1, loc2, loc3, loc4, loc4_name, entry_date, category,
street_id, street_number, user_id, tenant_id, status, remark) VALUES
('5000-01-01-001', '5000', '01', '01', '001', 'apartment name1', 1087745753, 1,
1, '1A', 11, 1, 1, NULL)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location4
(location_code, loc1, loc2, loc3, loc4, loc4_name, entry_date, category,
street_id, street_number, user_id, tenant_id, status, remark) VALUES
('5000-01-01-002', '5000', '01', '01', '002', 'apartment name2', 1087745753, 1,
1, '1B', 11, 1, 1, NULL)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location4
(location_code, loc1, loc2, loc3, loc4, loc4_name, entry_date, category,
street_id, street_number, user_id, tenant_id, status, remark) VALUES
('5000-01-02-001', '5000', '01', '02', '001', 'apartment name3', 1087745753, 1,
1, '2A', 11, 1, 1, NULL)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location4
(location_code, loc1, loc2, loc3, loc4, loc4_name, entry_date, category,
street_id, street_number, user_id, tenant_id, status, remark) VALUES
('5000-01-02-002', '5000', '01', '02', '002', 'apartment name4', 1087745753, 1,
1, '2B', 11, 1, 1, NULL)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location4
(location_code, loc1, loc2, loc3, loc4, loc4_name, entry_date, category,
street_id, street_number, user_id, tenant_id, status, remark) VALUES
('5000-01-03-001', '5000', '01', '03', '001', 'apartment name5', 1087745753, 1,
1, '3A', 11, 1, 1, NULL)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location4
(location_code, loc1, loc2, loc3, loc4, loc4_name, entry_date, category,
street_id, street_number, user_id, tenant_id, status, remark) VALUES
('5000-01-03-002', '5000', '01', '03', '002', 'apartment name6', 1087745753, 1,
1, '3B', 11, 1, 1, NULL)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location3
(location_code, loc1, loc2, loc3, loc3_name, entry_date, category, user_id,
status, remark) VALUES ('5000-01-01', '5000', '01', '01', 'entrance name1',
1087745654, 1, 6, 1, NULL)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location3
(location_code, loc1, loc2, loc3, loc3_name, entry_date, category, user_id,
status, remark) VALUES ('5000-01-02', '5000', '01', '02', 'entrance name2',
1087745654, 1, 6, 1, NULL)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location3
(location_code, loc1, loc2, loc3, loc3_name, entry_date, category, user_id,
status, remark) VALUES ('5000-01-03', '5000', '01', '03', 'entrance name3',
1087745654, 1, 6, 1, NULL)");
+
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location4
(location_code, loc1, loc2, loc3, loc4, loc4_name, entry_date, category,
street_id, street_number, user_id, tenant_id, status, remark) VALUES
('5000-01-01-001', '5000', '01', '01', '001', 'apartment name1', 1087745753, 1,
1, '1A', 6, 1, 1, NULL)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location4
(location_code, loc1, loc2, loc3, loc4, loc4_name, entry_date, category,
street_id, street_number, user_id, tenant_id, status, remark) VALUES
('5000-01-01-002', '5000', '01', '01', '002', 'apartment name2', 1087745753, 1,
1, '1B', 6, 2, 1, NULL)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location4
(location_code, loc1, loc2, loc3, loc4, loc4_name, entry_date, category,
street_id, street_number, user_id, tenant_id, status, remark) VALUES
('5000-01-02-001', '5000', '01', '02', '001', 'apartment name3', 1087745753, 1,
1, '2A', 6, 3, 1, NULL)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location4
(location_code, loc1, loc2, loc3, loc4, loc4_name, entry_date, category,
street_id, street_number, user_id, tenant_id, status, remark) VALUES
('5000-01-02-002', '5000', '01', '02', '002', 'apartment name4', 1087745753, 1,
1, '2B', 6, 4, 1, NULL)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location4
(location_code, loc1, loc2, loc3, loc4, loc4_name, entry_date, category,
street_id, street_number, user_id, tenant_id, status, remark) VALUES
('5000-01-03-001', '5000', '01', '03', '001', 'apartment name5', 1087745753, 1,
1, '3A', 6, 5, 1, NULL)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location4
(location_code, loc1, loc2, loc3, loc4, loc4_name, entry_date, category,
street_id, street_number, user_id, tenant_id, status, remark) VALUES
('5000-01-03-002', '5000', '01', '03', '002', 'apartment name6', 1087745753, 1,
1, '3B', 6, 6, 1, NULL)");
#
# fm_branch
@@ -247,7 +247,6 @@
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location_config
(location_type, column_name, input_text, lookup_form, f_key, ref_to_category,
query_value, reference_table, reference_id, datatype, precision_, scale,
default_value, nullable) VALUES (1, 'owner_id', NULL, NULL, 1, 1, NULL,
'fm_owner', 'id', 'int', 4, NULL, NULL, 'True')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location_config
(location_type, column_name, input_text, lookup_form, f_key, ref_to_category,
query_value, reference_table, reference_id, datatype, precision_, scale,
default_value, nullable) VALUES (1, 'part_of_town_id', NULL, NULL, 1, NULL,
NULL, 'fm_part_of_town', 'part_of_town_id', 'int', 4, NULL, NULL, 'True')");
-
#
# Dumping data for table fm_tenant_category
#
@@ -256,7 +255,6 @@
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_tenant_category (id,
descr) VALUES (2, 'female')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_tenant_category (id,
descr) VALUES (3, 'organization')");
-
#
# Dumping data for table fm_tenant_attribute
#
@@ -265,6 +263,16 @@
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_tenant_attribute (id,
list, search, lookup_form, column_name, input_text, statustext, size, datatype,
attrib_sort, precision_, scale, default_value, nullable) VALUES (2, 1, 1, NULL,
'last_name', 'Last name', 'Last name', NULL, 'V', 2, 50, NULL, NULL, 'True')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_tenant_attribute (id,
list, search, lookup_form, column_name, input_text, statustext, size, datatype,
attrib_sort, precision_, scale, default_value, nullable) VALUES (3, 1, 1, NULL,
'contact_phone', 'contact phone', 'contact phone', NULL, 'V', 3, 20, NULL,
NULL, 'True')");
+#
+# Dumping data for table fm_tenant
+#
+
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_tenant (id, first_name,
last_name, category) VALUES (1, 'First name1', 'Last name1', 1)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_tenant (id, first_name,
last_name, category) VALUES (2, 'First name2', 'Last name2', 2)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_tenant (id, first_name,
last_name, category) VALUES (3, 'First name3', 'Last name3', 1)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_tenant (id, first_name,
last_name, category) VALUES (4, 'First name4', 'Last name4', 2)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_tenant (id, first_name,
last_name, category) VALUES (5, 'First name5', 'Last name5', 1)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_tenant (id, first_name,
last_name, category) VALUES (6, 'First name6', 'Last name6', 2)");
#
# Dumping data for table fm_ecoart
Index: templates/base/tts.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/tts.xsl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- templates/base/tts.xsl 29 Oct 2006 20:04:40 -0000 1.14
+++ templates/base/tts.xsl 30 Oct 2006 09:49:13 -0000 1.15
@@ -1,4 +1,4 @@
-<!-- $Id: tts.xsl,v 1.14 2006/10/29 20:04:40 sigurdne Exp $ -->
+<!-- $Id: tts.xsl,v 1.15 2006/10/30 09:49:13 sigurdne Exp $ -->
<xsl:template name="app_data">
<xsl:choose>
@@ -606,7 +606,7 @@
<xsl:value-of
select="lang_contact_phone"/>
</td>
<td>
- <input type="text"
name="values[contact_phone]" value="{value_contact_phone}"
onMouseout="window.status='';return true;">
+ <input type="text"
name="values[extra][contact_phone]" value="{value_contact_phone}"
onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_contact_phone_statustext"/>
@@ -620,7 +620,7 @@
<xsl:value-of
select="lang_contact_email"/>
</td>
<td>
- <input type="text"
name="values[contact_email]" value="{value_contact_email}"
onMouseout="window.status='';return true;">
+ <input type="text"
name="values[extra][contact_email]" value="{value_contact_email}"
onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_contact_email_statustext"/>
@@ -629,7 +629,7 @@
</input>
</td>
</tr>
-
+<!--
<tr>
<td>
<xsl:value-of
select="lang_finnish_date"/>
@@ -645,7 +645,7 @@
[<xsl:value-of
select="lang_dateformat"/>]
</td>
</tr>
-
+-->
<tr>
<td valign="top">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property inc/class.bolocation.inc.php inc/class...,
Sigurd Nes <=