[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.botts.inc.php,1.2,1.3 class.s
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.botts.inc.php,1.2,1.3 class.sotts.inc.php,1.2,1.3 class.uitts.inc.php,1.2,1.3 |
|
Date: |
Thu, 06 Feb 2003 07:03:23 -0500 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv13622/inc
Modified Files:
class.botts.inc.php class.sotts.inc.php class.uitts.inc.php
Log Message:
no message
Index: class.botts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.botts.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.botts.inc.php 6 Feb 2003 09:03:45 -0000 1.2
--- class.botts.inc.php 6 Feb 2003 12:03:18 -0000 1.3
***************
*** 50,54 ****
$this->socommon =
CreateObject($this->currentapp.'.socommon');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->historylog =
createobject('phpgwapi.historylog',$this->currentapp);
$this->send =
CreateObject('phpgwapi.send');
$this->config =
CreateObject('phpgwapi.config');
--- 50,54 ----
$this->socommon =
CreateObject($this->currentapp.'.socommon');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->historylog =
createobject('phpgwapi.historylog',$this->currentapp .'_tts');
$this->send =
CreateObject('phpgwapi.send');
$this->config =
CreateObject('phpgwapi.config');
***************
*** 227,231 ****
for ($i=0; $i<count($tickets); $i++)
{
! $tickets[$i]['owner_lid'] =
$GLOBALS['phpgw']->accounts->id2name($tickets[$i]['owner_id']);
$tickets[$i]['assignedto'] =
$GLOBALS['phpgw']->accounts->id2name($tickets[$i]['assignedto']);
--- 227,231 ----
for ($i=0; $i<count($tickets); $i++)
{
! $tickets[$i]['owner'] =
$GLOBALS['phpgw']->accounts->id2name($tickets[$i]['owner']);
$tickets[$i]['assignedto'] =
$GLOBALS['phpgw']->accounts->id2name($tickets[$i]['assignedto']);
***************
*** 305,309 ****
'value_date' =>
$GLOBALS['phpgw']->common->show_date($value['datetime']),
'value_user' => $value['owner'],
! 'value_note' =>
nl2br(stripslashes($value['new_value'])),
);
$i++;
--- 305,309 ----
'value_date' =>
$GLOBALS['phpgw']->common->show_date($value['datetime']),
'value_user' => $value['owner'],
! 'value_note' =>
stripslashes(stripslashes($value['new_value'])),
);
$i++;
***************
*** 338,341 ****
--- 338,345 ----
}
+
if($value['new_value']=='O'){$value['new_value']=lang('Opened');}
+
if($value['new_value']=='X'){$value['new_value']=lang('Closed');}
+
+
$record_history[$i]['value_action'] =
$type?$type:'';
unset($type);
***************
*** 364,367 ****
--- 368,373 ----
$record_history[$i]['value_new_value']
= '';
}
+
+ $i++;
}
Index: class.sotts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotts.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.sotts.inc.php 6 Feb 2003 09:03:45 -0000 1.2
--- class.sotts.inc.php 6 Feb 2003 12:03:18 -0000 1.3
***************
*** 19,23 ****
$this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! $this->historylog =
createobject('phpgwapi.historylog',$this->currentapp);
$this->config =
CreateObject('phpgwapi.config');
--- 19,23 ----
$this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! $this->historylog =
createobject('phpgwapi.historylog',$this->currentapp .'_tts');
$this->config =
CreateObject('phpgwapi.config');
***************
*** 152,159 ****
if ($this->db->next_record())
{
! $ticket['assignedto'] =
(int)$this->db->f('assignedto');
! $ticket['owner_id'] =
(int)$this->db->f('owner');
$ticket['status'] =
$this->db->f('status');
! $ticket['cat_id'] =
(int)$this->db->f('cat_id');
$ticket['subject'] =
stripslashes($this->db->f('subject'));
$ticket['priority'] =
$this->db->f('priority');
--- 152,159 ----
if ($this->db->next_record())
{
! $ticket['assignedto'] =
$this->db->f('assignedto');
! $ticket['owner_id'] =
$this->db->f('owner');
$ticket['status'] =
$this->db->f('status');
! $ticket['cat_id'] =
$this->db->f('cat_id');
$ticket['subject'] =
stripslashes($this->db->f('subject'));
$ticket['priority'] =
$this->db->f('priority');
***************
*** 237,246 ****
$this->db->next_record();
! $oldassigned = $this->db->f('assignedto');
! $oldpriority = $this->db->f('priority');
! $oldcat_id = $this->db->f('cat_id');
! $old_status = $this->db->f('status');
! $old_billable_hours = $this->db->f('billable_hours');
! $old_billable_rate = $this->db->f('billable_rate');
// Figure out and last note
--- 237,248 ----
$this->db->next_record();
! $oldassigned = $this->db->f('assignedto');
! $oldpriority = $this->db->f('priority');
! $oldcat_id =
$this->db->f('cat_id');
! $old_status = $this->db->f('status');
! $old_billable_hours =
$this->db->f('billable_hours');
! $old_billable_rate = $this->db->f('billable_rate');
! if($oldcat_id ==0){$oldcat_id ='';}
! if($oldassigned ==0){$oldassigned ='';}
// Figure out and last note
***************
*** 258,263 ****
/*
! ** phpgw_fm_tts_append.append_type - Defs
! ** R - Reopen ticket
** X - Ticket closed
** O - Ticket opened
--- 260,265 ----
/*
! ** phpgw_fm_tts_append.append_type - Defs
! ** R - Reopen ticket
** X - Ticket closed
** O - Ticket opened
***************
*** 275,282 ****
{
$fields_updated = True;
!
$this->historylog->add($ticket['status'],$id,$ticket['status'],$old_status);
! $this->db->query("update phpgw_fm_tts_tickets
set status='"
. $ticket['status'] . "' where
id='$id'",__LINE__,__FILE__);
}
--- 277,293 ----
{
$fields_updated = True;
! if($old_status=='X')
! {
!
$this->historylog->add('R',$id,$ticket['status'],$old_status);
!
! $this->db->query("update
phpgw_fm_tts_tickets set status='O' where id='$id'",__LINE__,__FILE__);
! }
! else
! {
!
$this->historylog->add($ticket['status'],$id,$ticket['status'],$old_status);
! $this->db->query("update
phpgw_fm_tts_tickets set status='"
. $ticket['status'] . "' where
id='$id'",__LINE__,__FILE__);
+ }
}
***************
*** 324,328 ****
{
$fields_updated = True;
!
$this->historylog->add('C',$id,$ticket['note'],$old_note);
// Do this before we go into mail_ticket()
--- 335,339 ----
{
$fields_updated = True;
!
$this->historylog->add('C',$id,$this->db->db_addslashes($ticket['note']),$old_note);
// Do this before we go into mail_ticket()
Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.uitts.inc.php 6 Feb 2003 09:03:45 -0000 1.2
--- class.uitts.inc.php 6 Feb 2003 12:03:18 -0000 1.3
***************
*** 412,416 ****
if($values['save'])
{
! $this->bo->update_ticket($values,$id);
}
--- 412,416 ----
if($values['save'])
{
! $receipt =
$this->bo->update_ticket($values,$id);
}
***************
*** 424,437 ****
//_debug_array($record_history);
- $request_link
=$GLOBALS['phpgw']->link('/property/add_request.php',"objekt_id=$objekt_id"
- .
"&property_name=$property_name&bygg_id=$bygg_id&building_name=$building_name"
- .
"&seksjons_id=$seksjons_id&etasje=$etasje&leie_id=$leie_id&street=$street"
- .
"&tenant_name=$tenant_name&tenant_id=$tenant_id&contact_phone=$contact_phone");
! $order_link =
$GLOBALS['phpgw']->link('/property/add_workorder.php',"objekt_id=$objekt_id"
! .
"&property_name=$property_name&bygg_id=$bygg_id&building_name=$building_name"
! .
"&seksjons_id=$seksjons_id&etasje=$etasje&leie_id=$leie_id&street=$street"
! .
"&tenant_name=$tenant_name&tenant_id=$tenant_id&contact_phone=$contact_phone");
$form_link = array
--- 424,463 ----
//_debug_array($record_history);
+ $request_link_data = array
+ (
+ 'menuaction' =>
$this->currentapp.'.uitts.view',
+ 'id' => $id,
+ 'sub' => 'order',
+ 'location_code' =>
$ticket['location_code'],
+ 'property_id' =>
$ticket['property_id'],
+ 'property_name' =>
$ticket['property_name'],
+ 'building_id' =>
$ticket['building_id'],
+ 'building_name' =>
$ticket['building_name'],
+ 'entrance_id' =>
$ticket['entrance_id'],
+ 'floor' =>
$ticket['floor'],
+ 'apartment_id' =>
$ticket['apartment_id'],
+ 'street' =>
$ticket['street'],
+ 'tenant_id' =>
$ticket['tenant_id'],
+ 'contact_phone' =>
$ticket['contact_phone']
+ );
! $order_link_data = array
! (
! 'menuaction' =>
$this->currentapp.'.uitts.view',
! 'id' => $id,
! 'sub' => 'order',
! 'location_code' =>
$ticket['location_code'],
! 'property_id' =>
$ticket['property_id'],
! 'property_name' =>
$ticket['property_name'],
! 'building_id' =>
$ticket['building_id'],
! 'building_name' =>
$ticket['building_name'],
! 'entrance_id' =>
$ticket['entrance_id'],
! 'floor' =>
$ticket['floor'],
! 'apartment_id' =>
$ticket['apartment_id'],
! 'street' =>
$ticket['street'],
! 'tenant_id' =>
$ticket['tenant_id'],
! 'contact_phone' =>
$ticket['contact_phone']
! );
$form_link = array
***************
*** 442,446 ****
);
-
$table_header_history[] = array
(
--- 468,471 ----
***************
*** 462,465 ****
--- 487,492 ----
(
+ 'error'
=> $receipt['error'],
+ 'message'
=> $receipt['message'],
'lang_location_code' =>
lang('Location Code'),
'lang_property_id'
=> lang('Property id'),
***************
*** 520,530 ****
'lang_no_additional_notes' =>
lang('No additional notes'),
'lang_no_history'
=> lang('No history for this record'),
'additional_notes'
=> $additional_notes,
'record_history'
=> $record_history,
! 'request_link'
=> $request_link,
! 'order_link'
=> $order_link,
'lang_generate_request' =>
lang('Generate Request'),
! 'lang_generate_workorder' =>
lang('Generate order'),
'appname'
=> lang($this->currentapp),
'function_msg'
=> lang('view ticket detail'),
--- 547,562 ----
'lang_no_additional_notes' =>
lang('No additional notes'),
+ 'lang_history'
=> lang('History'),
'lang_no_history'
=> lang('No history for this record'),
'additional_notes'
=> $additional_notes,
'record_history'
=> $record_history,
! 'request_link'
=> $GLOBALS['phpgw']->link('/index.php',$request_link_data),
! 'order_link'
=> $GLOBALS['phpgw']->link('/index.php',$order_link_data),
!
'lang_generate_request' =>
lang('Generate Request'),
! 'lang_generate_request_statustext'
=> lang('Klick this to generate a request with this information'),
! 'lang_generate_order' =>
lang('Generate order'),
! 'lang_generate_order_statustext'
=> lang('Klick this to generate an order with this information'),
!
'appname'
=> lang($this->currentapp),
'function_msg'
=> lang('view ticket detail'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.botts.inc.php,1.2,1.3 class.sotts.inc.php,1.2,1.3 class.uitts.inc.php,1.2,1.3,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/inc class.botts.inc.php,1.1,1.2 class.sotts.inc.php,1.1,1.2 class.uiinvestment.inc.php,1.6,1.7 class.uitts.inc.php,1.1,1.2
- Next by Date:
[Phpgroupware-cvs] CVS: property/templates/default tts.xsl,1.2,1.3
- Previous by thread:
[Phpgroupware-cvs] CVS: property/inc class.botts.inc.php,1.1,1.2 class.sotts.inc.php,1.1,1.2 class.uiinvestment.inc.php,1.6,1.7 class.uitts.inc.php,1.1,1.2
- Next by thread:
[Phpgroupware-cvs] CVS: property/templates/default tts.xsl,1.2,1.3
- Index(es):