[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.uitts.inc.php, 1.45, 1.46 class.so
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] property/inc class.uitts.inc.php, 1.45, 1.46 class.sotts.inc.php, 1.35, 1.36 class.botts.inc.php, 1.25, 1.26 |
|
Date: |
Sun, 16 Nov 2003 13:21:55 +0000 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv22184/inc
Modified Files:
class.uitts.inc.php class.sotts.inc.php class.botts.inc.php
Log Message:
no message
Index: class.sotts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotts.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** class.sotts.inc.php 14 Nov 2003 19:00:37 -0000 1.35
--- class.sotts.inc.php 16 Nov 2003 13:21:52 -0000 1.36
***************
*** 21,24 ****
--- 21,26 ----
$this->join = $this->bocommon->join;
$this->soadmin_entity =
CreateObject($this->currentapp.'.soadmin_entity');
+ $this->dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+
}
***************
*** 209,217 ****
$entity[$i]['entity_id']=$this->db->f('entity_id');
$entity[$i]['cat_id']=$this->db->f('cat_id');
! // $entity[$i]['name']=$this->db->f('name');
$uicols[] = $this->db->f('name');
-
$i++;
}
$this->uicols = $uicols;
return $entity;
--- 211,222 ----
$entity[$i]['entity_id']=$this->db->f('entity_id');
$entity[$i]['cat_id']=$this->db->f('cat_id');
! $entity[$i]['type']='entity';
$uicols[] = $this->db->f('name');
$i++;
}
+
+ $entity[$i]['type']='project';
+ $uicols[] = lang('project');
+
$this->uicols = $uicols;
return $entity;
***************
*** 220,224 ****
function get_child_date($id,$type,$entity_id='',$cat_id='')
{
- $dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
$table= 'fm_' . $type . '_origin';
if($cat_id)
--- 225,228 ----
***************
*** 234,250 ****
while ($this->db->next_record())
{
! $date_info[$i]['entry_date']=
$GLOBALS['phpgw']->common->show_date($this->db->f('entry_date'),$dateformat);
if($this->db->f('cat_id'))
{
! $category =
$this->soadmin_entity->read_single_category($this->db->f('entity_id'),$this->db->f('cat_id'));
!
$date_info[$i]['type']=$category['name'];
}
else
{
! $date_info[$i]['type']=lang($type);
}
$i++;
}
return $date_info;
}
--- 238,254 ----
while ($this->db->next_record())
{
! $date_info['date_info'][$i]['entry_date']=
$GLOBALS['phpgw']->common->show_date($this->db->f('entry_date'),$this->dateformat);
if($this->db->f('cat_id'))
{
!
$date_info['date_info'][$i]['link']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.view&entity_id='.$entity_id.'&cat_id='
. $cat_id . '&id=' . $this->db->f('id'));
}
else
{
!
$date_info['date_info'][$i]['link']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.ui'
. $type . '.view&id=' . $this->db->f($type . '_id'));
}
$i++;
}
+ //_debug_array($date_info);
return $date_info;
}
***************
*** 282,286 ****
}
! $sql = "SELECT * FROM fm_report_origin WHERE
origin_id='$id' and origin ='ticket'";
$this->db->query($sql,__LINE__,__FILE__);
--- 286,290 ----
}
! $sql = "SELECT * FROM fm_report_origin WHERE
origin_id='$id' and origin ='tts'";
$this->db->query($sql,__LINE__,__FILE__);
***************
*** 291,310 ****
}
! $sql = "SELECT * FROM fm_request_origin WHERE
origin_id='$id' and origin ='ticket'";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record())
{
! $ticket['request_id'][]['id'] =
$this->db->f('request_id');
}
! $sql = "SELECT * FROM fm_project_origin WHERE
origin_id='$id' and origin ='ticket'";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record())
{
! $ticket['project_id'][]['id'] =
$this->db->f('project_id');
}
--- 295,320 ----
}
! $sql = "SELECT * FROM fm_request_origin WHERE
origin_id='$id' and origin ='tts'";
$this->db->query($sql,__LINE__,__FILE__);
+ $i=0;
while ($this->db->next_record())
{
! $ticket['request_id'][$i]['id'] =
$this->db->f('request_id');
! $ticket['request_id'][$i]['entry_date'] =
$GLOBALS['phpgw']->common->show_date($this->db->f('entry_date'),$this->dateformat);
! $i++;
}
! $sql = "SELECT * FROM fm_project_origin WHERE
origin_id='$id' and origin ='tts'";
$this->db->query($sql,__LINE__,__FILE__);
+ $i=0;
while ($this->db->next_record())
{
! $ticket['project_id'][$i]['id'] =
$this->db->f('project_id');
! $ticket['project_id'][$i]['entry_date'] =
$GLOBALS['phpgw']->common->show_date($this->db->f('entry_date'),$this->dateformat);
! $i++;
}
***************
*** 330,333 ****
--- 340,344 ----
$ticket['entity'][$i]['link_info'][$j]['id'] = $this->db->f('id');
$ticket['entity'][$i]['link_info'][$j]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.view&entity_id='.$this->db->f('entity_id').'&cat_id='
. $this->db->f('cat_id'));
+
$ticket['entity'][$i]['link_info'][$j]['entry_date'] =
$GLOBALS['phpgw']->common->show_date($this->db->f('entry_date'),$this->dateformat);
$j++;
}
***************
*** 341,344 ****
--- 352,356 ----
$ticket['entity'][$i]['link_info'][$j]['id'] = $this->db->f('id');
$ticket['entity'][$i]['link_info'][$j]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.view&entity_id='.$this->db->f('entity_id').'&cat_id='
. $this->db->f('cat_id'));
+
$ticket['entity'][$i]['link_info'][$j]['entry_date'] =
$GLOBALS['phpgw']->common->show_date($this->db->f('entry_date'),$this->dateformat);
$j++;
}
Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** class.uitts.inc.php 15 Nov 2003 22:57:20 -0000 1.45
--- class.uitts.inc.php 16 Nov 2003 13:21:52 -0000 1.46
***************
*** 79,82 ****
--- 79,85 ----
$ticket_list = $this->bo->read();
+ $uicols=$this->bo->uicols;
+
+ //_debug_array($uicols);
//_debug_array($ticket_list);
while (is_array($ticket_list) && list(,$ticket) =
each($ticket_list))
***************
*** 93,96 ****
--- 96,100 ----
'user'
=> $ticket['user'],
'assignedto'
=> $ticket['assignedto'],
+ 'child_date'
=> $ticket['child_date'],
'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.view&id='
. $ticket['id']),
'lang_view_statustext' =>
lang('view the ticket'),
***************
*** 165,170 ****
)),
'lang_opened_by' => lang('Opened
by')
-
);
$table_add[] = array
--- 169,178 ----
)),
'lang_opened_by' => lang('Opened
by')
);
+
+ for ($i=0;$i<count($uicols);$i++)
+ {
+ $table_header[0]['extra'][$i]['header']
= $uicols[$i];
+ }
$table_add[] = array
Index: class.botts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.botts.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** class.botts.inc.php 14 Nov 2003 19:00:37 -0000 1.25
--- class.botts.inc.php 16 Nov 2003 13:21:52 -0000 1.26
***************
*** 300,304 ****
}
-
function read()
{
--- 300,303 ----
***************
*** 311,317 ****
$entity = $this->so->get_origin_entity_type();
- $this->uicols = $this->so->uicols;
! _debug_array($this->uicols);
for ($i=0; $i<count($tickets); $i++)
{
--- 310,315 ----
$entity = $this->so->get_origin_entity_type();
! $this->uicols=$this->so->uicols;
for ($i=0; $i<count($tickets); $i++)
{
***************
*** 337,352 ****
}
- $tickets[$i]['project_date'] =
$this->so->get_child_date($tickets[$i]['id'],'project');
-
for ($j=0;$j<count($entity);$j++)
{
!
$tickets[$i]['entity_date_'.$entity[$j]['entity_id'].'_'.$entity[$j]['cat_id']]
=
$this->so->get_child_date($tickets[$i]['id'],'entity',$entity[$j]['entity_id'],$entity[$j]['cat_id']);
}
-
}
! $this->uicols[] = lang('project');
!
! _debug_array($tickets);
return $tickets;
}
--- 335,345 ----
}
for ($j=0;$j<count($entity);$j++)
{
! $tickets[$i]['child_date'][$j] =
$this->so->get_child_date($tickets[$i]['id'],$entity[$j]['type'],$entity[$j]['entity_id'],$entity[$j]['cat_id']);
}
}
! //_debug_array($tickets);
return $tickets;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.uitts.inc.php, 1.45, 1.46 class.sotts.inc.php, 1.35, 1.36 class.botts.inc.php, 1.25, 1.26,
Sigurd Nes <address@hidden> <=