[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.soproject.inc.php,1.9,1.10 cl
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.soproject.inc.php,1.9,1.10 class.sorequest.inc.php,1.4,1.5 class.sotts.inc.php,1.14,1.15 class.uiproject.inc.php,1.17,1.18 class.uirequest.inc.php,1.11,1.12 class.uitts.inc.php,1.24,1.25 |
|
Date: |
Tue, 13 May 2003 07:03:09 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv6111/inc
Modified Files:
class.soproject.inc.php class.sorequest.inc.php
class.sotts.inc.php class.uiproject.inc.php
class.uirequest.inc.php class.uitts.inc.php
Log Message:
no message
Index: class.soproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.soproject.inc.php 21 Apr 2003 09:23:35 -0000 1.9
--- class.soproject.inc.php 13 May 2003 11:03:06 -0000 1.10
***************
*** 225,228 ****
--- 225,239 ----
}
+
+ $sql = "SELECT * FROM fm_project_origin WHERE
project_id='$project_id'";
+
+ $this->db->query($sql,__LINE__,__FILE__);
+
+ if ($this->db->next_record())
+ {
+ $project['origin_id'] =
$this->db->f('origin_id');
+ $project['origin'] =
$this->db->f('origin');
+ }
+
//_debug_array($project);
return $project;
***************
*** 382,385 ****
--- 393,405 ----
}
+ if($project['origin'] && $project['origin_id'])
+ {
+ $this->db->query("INSERT INTO
fm_project_origin (origin,origin_id,project_id) "
+ . "VALUES ('"
+ . $project['origin']. "','"
+ . $project['origin_id']. "','"
+ . $project['project_id'].
"')",__LINE__,__FILE__);
+ }
+
$receipt['message'][] = array('msg'=>lang('project %1
has been saved',$project['project_id']));
return $receipt;
***************
*** 513,516 ****
--- 533,537 ----
$this->db->query("DELETE FROM fm_wo_project_history
WHERE history_record_id='" . $project_id . "'",__LINE__,__FILE__);
$this->db->query("DELETE FROM fm_wo_projectbranch
WHERE project_id='" . $project_id . "'",__LINE__,__FILE__);
+ $this->db->query("DELETE FROM fm_project_origin WHERE
project_id='" . $project_id . "'",__LINE__,__FILE__);
}
Index: class.sorequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sorequest.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.sorequest.inc.php 7 May 2003 11:18:25 -0000 1.4
--- class.sorequest.inc.php 13 May 2003 11:03:06 -0000 1.5
***************
*** 311,314 ****
--- 311,326 ----
}
+
+ $sql = "SELECT * FROM fm_request_origin WHERE
request_id='$request_id'";
+
+ $this->db->query($sql,__LINE__,__FILE__);
+
+ if ($this->db->next_record())
+ {
+ $request['origin_id'] =
$this->db->f('origin_id');
+ $request['origin'] =
$this->db->f('origin');
+ }
+
+
//_debug_array($request);
return $request;
***************
*** 447,450 ****
--- 459,471 ----
}
+ if($request['origin'] && $request['origin_id'])
+ {
+ $this->db->query("INSERT INTO
fm_request_origin (origin,origin_id,request_id) "
+ . "VALUES ('"
+ . $request['origin']. "','"
+ . $request['origin_id']. "','"
+ . $request['request_id'].
"')",__LINE__,__FILE__);
+ }
+
$receipt['message'][] = array('msg'=>lang('request %1
has been saved',$request['request_id']));
return $receipt;
***************
*** 545,548 ****
--- 566,570 ----
$this->db->query("DELETE FROM fm_wo_request WHERE id='"
. $request_id . "'",__LINE__,__FILE__);
$this->db->query("DELETE FROM fm_wo_request_history
WHERE history_record_id='" . $request_id . "'",__LINE__,__FILE__);
+ $this->db->query("DELETE FROM fm_request_origin WHERE
request_id='" . $request_id . "'",__LINE__,__FILE__);
}
}
Index: class.sotts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotts.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.sotts.inc.php 12 May 2003 21:45:32 -0000 1.14
--- class.sotts.inc.php 13 May 2003 11:03:06 -0000 1.15
***************
*** 196,199 ****
--- 196,217 ----
}
+ $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');
+ }
+
//_debug_array($ticket);
Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** class.uiproject.inc.php 3 May 2003 06:02:17 -0000 1.17
--- class.uiproject.inc.php 13 May 2003 11:03:06 -0000 1.18
***************
*** 260,263 ****
--- 260,271 ----
$values['equipment_id'] =
get_var('equipment_id',array('POST','GET'));
$values['descr'] =
get_var('descr',array('POST','GET'));
+ $ticket_id
= get_var('ticket_id',array('POST','GET'));
+
+ if($ticket_id)
+ {
+ $values['origin']= 'ticket';
+ $values['origin_id']= $ticket_id;
+ }
+
if($values['tenant_id'])
{
***************
*** 413,416 ****
--- 421,433 ----
+ if($values['origin']== 'ticket')
+ {
+ $origin_data = array
+ (
+ 'menuaction' =>
$this->currentapp.'.uitts.view',
+ 'id' =>
$values['origin_id']
+ );
+ }
+
$link_data = array
(
***************
*** 442,445 ****
--- 459,468 ----
$data = array
(
+ 'lang_origin'
=> lang('origin'),
+ 'lang_origin_statustext' =>
lang('Link to the origin for this project'),
+ 'link_origin'
=> $GLOBALS['phpgw']->link('/index.php',$origin_data),
+ 'value_origin'
=> $values['origin'],
+ 'value_origin_id'
=> $values['origin_id'],
+
'add_workorder_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit'),
'lang_add_workorder'
=> lang('Add Workorder'),
***************
*** 655,660 ****
--- 678,697 ----
'apartment_id' =>
$values['apartment_id']));
+ if($values['origin']== 'ticket')
+ {
+ $origin_data = array
+ (
+ 'menuaction' =>
$this->currentapp.'.uitts.view',
+ 'id' =>
$values['origin_id']
+ );
+ }
+
$data = array
(
+ 'lang_origin'
=> lang('origin'),
+ 'lang_origin_statustext' =>
lang('Link to the origin for this project'),
+ 'link_origin'
=> $GLOBALS['phpgw']->link('/index.php',$origin_data),
+ 'value_origin_id'
=> $values['origin_id'],
+
'table_header_workorder_budget' =>
$table_header_workorder_budget,
'lang_no_workorders' =>
lang('No workorder bugdet'),
Index: class.uirequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uirequest.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.uirequest.inc.php 3 May 2003 06:02:17 -0000 1.11
--- class.uirequest.inc.php 13 May 2003 11:03:06 -0000 1.12
***************
*** 324,327 ****
--- 324,334 ----
$values['tenant_id'] =
get_var('tenant_id',array('POST','GET'));
$values['equipment_id'] =
get_var('equipment_id',array('POST','GET'));
+ $ticket_id
= get_var('ticket_id',array('POST','GET'));
+
+ if($ticket_id)
+ {
+ $values['origin']= 'ticket';
+ $values['origin_id']= $ticket_id;
+ }
if($values['tenant_id'])
***************
*** 469,472 ****
--- 476,487 ----
'apartment_id' =>
$values['apartment_id']));
+ if($values['origin']== 'ticket')
+ {
+ $origin_data = array
+ (
+ 'menuaction' =>
$this->currentapp.'.uitts.view',
+ 'id' =>
$values['origin_id']
+ );
+ }
$link_data = array
***************
*** 550,553 ****
--- 565,574 ----
$data = array
(
+ 'lang_origin'
=> lang('origin'),
+ 'lang_origin_statustext' =>
lang('Link to the origin for this request'),
+ 'link_origin'
=> $GLOBALS['phpgw']->link('/index.php',$origin_data),
+ 'value_origin'
=> $values['origin'],
+ 'value_origin_id'
=> $values['origin_id'],
+
'generate_project_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit'),
'lang_generate_project'
=> lang('Generate project'),
***************
*** 796,801 ****
--- 817,836 ----
+ if($values['origin']== 'ticket')
+ {
+ $origin_data = array
+ (
+ 'menuaction' =>
$this->currentapp.'.uitts.view',
+ 'id' =>
$values['origin_id']
+ );
+ }
+
$data = array
(
+ 'lang_origin'
=> lang('origin'),
+ 'lang_origin_statustext' =>
lang('Link to the origin for this request'),
+ 'link_origin'
=> $GLOBALS['phpgw']->link('/index.php',$origin_data),
+ 'value_origin_id'
=> $values['origin_id'],
+
'lang_importance'
=> lang('Importance'),
'table_header_importance' =>
$table_header_importance,
Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** class.uitts.inc.php 12 May 2003 21:45:32 -0000 1.24
--- class.uitts.inc.php 13 May 2003 11:03:06 -0000 1.25
***************
*** 500,503 ****
--- 500,517 ----
);
}
+ if($ticket['request_id'])
+ {
+ $request_lookup_data = array
+ (
+ 'menuaction' =>
$this->currentapp.'.uirequest.view'
+ );
+ }
+ if($ticket['project_id'])
+ {
+ $project_lookup_data = array
+ (
+ 'menuaction' =>
$this->currentapp.'.uiproject.view'
+ );
+ }
//_debug_array($ticket);
***************
*** 510,513 ****
--- 524,537 ----
'link_report'
=> $GLOBALS['phpgw']->link('/index.php',$report_lookup_data),
'value_report_id'
=> $ticket['report_id'],
+
+ 'lang_request'
=> lang('Request'),
+ 'lang_request_statustext' =>
lang('Link to the request originatet from this ticket'),
+ 'link_request'
=> $GLOBALS['phpgw']->link('/index.php',$request_lookup_data),
+ 'value_request_id'
=> $ticket['request_id'],
+
+ 'lang_project'
=> lang('Project'),
+ 'lang_project_statustext' =>
lang('Link to the project originatet from this ticket'),
+ 'link_project'
=> $GLOBALS['phpgw']->link('/index.php',$project_lookup_data),
+ 'value_project_id'
=> $ticket['project_id'],
'location_data'
=> $location_data,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.soproject.inc.php,1.9,1.10 class.sorequest.inc.php,1.4,1.5 class.sotts.inc.php,1.14,1.15 class.uiproject.inc.php,1.17,1.18 class.uirequest.inc.php,1.11,1.12 class.uitts.inc.php,1.24,1.25,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/setup setup.inc.php,1.47,1.48 tables_current.inc.php,1.74,1.75
- Next by Date:
[Phpgroupware-cvs] CVS: property/templates/default project.xsl,1.7,1.8 request.xsl,1.4,1.5 tts.xsl,1.7,1.8
- Previous by thread:
[Phpgroupware-cvs] CVS: property/setup setup.inc.php,1.47,1.48 tables_current.inc.php,1.74,1.75
- Next by thread:
[Phpgroupware-cvs] CVS: property/templates/default project.xsl,1.7,1.8 request.xsl,1.4,1.5 tts.xsl,1.7,1.8
- Index(es):