[Vtigercrm-commits] [vtiger-commits] r9199 - in /vtigercrm/trunk: data/CRMEntity.php modules/HelpDesk/DetailViewAjax.php modules/HelpDesk/HelpDesk.php modules/HelpDesk/Save.php
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Wed Aug 30 08:53:06 EDT 2006
Author: saraj
Date: Wed Aug 30 06:52:59 2006
New Revision: 9199
Log:
* Removed the ticket history update code from common function and added as seperate, now when we create or update ticket then the history will be updated seperately and not inside the saveentity function
Modified:
vtigercrm/trunk/data/CRMEntity.php
vtigercrm/trunk/modules/HelpDesk/DetailViewAjax.php
vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
vtigercrm/trunk/modules/HelpDesk/Save.php
Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Wed Aug 30 06:52:59 2006
@@ -494,64 +494,7 @@
$adb->query($sql_qry);
}
- //code added by richie starts
-
- /** Function to get the update ticket history for the specified ticketid
- * @param $id -- $ticketid:: Type Integer
- */
- function constructUpdateLog($id)
- {
- global $adb;
- global $current_user;
- $ticketid = $id;
- //Updating History
- $tktresult = $adb->query("select * from vtiger_troubletickets where ticketid='".$ticketid."'");
- $crmresult = $adb->query("select * from vtiger_crmentity where crmid='".$ticketid."'");
- $updatelog = $adb->query_result($tktresult,0,"update_log");
- $old_user_id = $adb->query_result($crmresult,0,"smownerid");
- $old_status = $adb->query_result($tktresult,0,"status");
- $old_priority = $adb->query_result($tktresult,0,"priority");
- $old_severity = $adb->query_result($tktresult,0,"severity");
- $old_category = $adb->query_result($tktresult,0,"category");
- if($_REQUEST['old_smownerid'] != $old_user_id && $old_user_id != 0)
- {
- $user_name = getUserName($this->column_fields['assigned_user_id']);
- $updatelog .= ' Transferred to '.$user_name.'\.';
- }
- elseif($old_user_id == 0)
- {
- $group_info = getGroupName($ticketid,'HelpDesk');
- $group_name = $group_info[0];
- if($group_name != $_REQUEST['assigned_group_name'])
- $updatelog .= ' Transferred to group '.$_REQUEST['assigned_group_name'].'\.';
- }
- if($old_status != $this->column_fields['ticketstatus'])
- {
- $updatelog .= ' Status Changed to '.$this->column_fields['ticketstatus'].'\.';
- }
- if($old_priority != $this->column_fields['ticketpriorities'])
- {
- $updatelog .= ' Priority Changed to '.$this->column_fields['ticketpriorities'].'\.';
- }
- if($old_severity != $this->column_fields['ticketseverities'])
- {
- $updatelog .= ' Severity Changed to '.$this->column_fields['ticketseverities'].'\.';
- }
- if($old_category != $this->column_fields['ticketcategories'])
- {
- $updatelog .= ' Category Changed to '.$this->column_fields['ticketcategories'].'\.';
- }
- if($_REQUEST['old_smownerid'] != $old_user_id || $old_status != $this->column_fields['ticketstatus'] || $old_priority != $this->column_fields['ticketpriorities'] || $old_severity != $this->column_fields['ticketseverities'] || $old_category != $this->column_fields['ticketcategories'] || $old_userid == 0)
- {
- $updatelog .= ' -- '.date("l dS F Y h:i:s A").' by '.$current_user->user_name.'--//--';
- }
- else
- {
- $update_log .= '--//--';
- }
-
- return $updatelog;
- }
+
/** Function to insert values in the specifed table for the specified module
* @param $table_name -- table name:: Type varchar
* @param $module -- module:: Type varchar
@@ -560,7 +503,7 @@
{
global $log;
global $current_user;
- $log->info("function insertIntoCrmEntity ".$module.' vtiger_table name ' .$table_name);
+ $log->info("function insertIntoEntityTable ".$module.' vtiger_table name ' .$table_name);
global $adb;
$insertion_mode = $this->mode;
@@ -667,6 +610,12 @@
$fldvalue = getDBInsertDateValue($this->column_fields[$fieldname]);
}
}
+ elseif($uitype == 7)
+ {
+ //strip out the spaces and commas in numbers if given ie., in amounts there may be ,
+ $fldvalue = str_replace(",","",$this->column_fields[$fieldname]);//trim($this->column_fields[$fieldname],",");
+
+ }
else
{
$fldvalue = $this->column_fields[$fieldname];
@@ -684,14 +633,6 @@
if($fldvalue=='') $fldvalue ="NULL";
if($insertion_mode == 'edit')
{
- //code by richie starts
- if(($table_name == "vtiger_troubletickets") && ($columname == "update_log"))
- {
- $fldvalue = $this->constructUpdateLog($this->id);
- $fldvalue = from_html($adb->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
- }
- //code by richie ends
-
if($table_name == 'vtiger_notes' && $columname == 'filename' && $_FILES['filename']['name'] == '')
{
$fldvalue = $this->getOldFileName($this->id);
@@ -715,32 +656,6 @@
}
else
{
- //code by richie starts
- if(($table_name == "vtiger_troubletickets") && ($columname == "update_log"))
- {
- global $current_user;
- $fldvalue = date("l dS F Y h:i:s A").' by '.$current_user->user_name;
- if($_REQUEST['assigned_group_name'] != '' && $_REQUEST['assigntype'] == 'T')
- {
- $group_name = $_REQUEST['assigned_group_name'];
- }
- elseif($this->column_fields['assigned_user_id'] != '')
- {
- $tkt_ownerid = $this->column_fields['assigned_user_id'];
- }
- else
- {
- $tkt_ownerid = $current_user->id;
- }
- if($group_name != '')
- $tkt_ownername = $group_name;
- else
- $tkt_ownername = getUserName($tkt_ownerid);
- $fldvalue = " Ticket created. Assigned to ".$tkt_ownername." -- ".$fldvalue."--//--";
- $fldvalue = from_html($adb->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
- //echo ' updatevalue is ............. ' .$fldvalue;
- }
- //code by richie ends
$column .= ", ".$columname;
$value .= ", ".$fldvalue."";
}
Modified: vtigercrm/trunk/modules/HelpDesk/DetailViewAjax.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/DetailViewAjax.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/DetailViewAjax.php Wed Aug 30 06:52:59 2006
@@ -36,7 +36,19 @@
$modObj->column_fields[$fieldname] = $fieldvalue;
$modObj->id = $crmid;
$modObj->mode = "edit";
+
+ //Added to construct the update log for Ticket history
+ $assigned_group_name = $_REQUEST['assigned_group_name'];
+ $assigntype = $_REQUEST['assigntype'];
+
+ $fldvalue = $modObj->constructUpdateLog(&$modObj, $modObj->mode, $assigned_group_name, $assigntype);
+ $fldvalue = from_html($adb->formatString('vtiger_troubletickets','update_log',$fldvalue),($modObj->mode == 'edit')?true:false);
+
$modObj->save("HelpDesk");
+
+ //update the log information for ticket history
+ $adb->query("update vtiger_troubletickets set update_log=$fldvalue where ticketid=".$modObj->id);
+
if($modObj->id != "")
{
echo ":#:SUCCESS";
Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Wed Aug 30 06:52:59 2006
@@ -467,6 +467,89 @@
return getHistory('HelpDesk',$query,$id);
}
+ /** Function to get the update ticket history for the specified ticketid
+ * @param $id -- $ticketid:: Type Integer
+ */
+ function constructUpdateLog($focus, $mode, $assigned_group_name, $assigntype)
+ {
+ global $adb;
+ global $current_user;
+
+ if($mode != 'edit')//this will be updated when we create new ticket
+ {
+ $updatelog = " Ticket created. Assigned to ";
+
+ if($assigned_group_name != '' && $assigntype == 'T')
+ {
+ $updatelog .= " group ".$assigned_group_name;
+ }
+ elseif($focus->column_fields['assigned_user_id'] != '')
+ {
+ $updatelog .= " user ".getUserName($focus->column_fields['assigned_user_id']);
+ }
+ else
+ {
+ $updatelog .= " user ".getUserName($current_user->id);
+ }
+
+ $fldvalue = date("l dS F Y h:i:s A").' by '.$current_user->user_name;
+ $updatelog .= " -- ".$fldvalue."--//--";
+ }
+ else
+ {
+ $ticketid = $focus->id;
+
+ //First retrieve the existing information
+ $tktresult = $adb->query("select * from vtiger_troubletickets where ticketid='".$ticketid."'");
+ $crmresult = $adb->query("select * from vtiger_crmentity where crmid='".$ticketid."'");
+
+ $updatelog = $adb->query_result($tktresult,0,"update_log");
+
+ $old_user_id = $adb->query_result($crmresult,0,"smownerid");
+ $old_status = $adb->query_result($tktresult,0,"status");
+ $old_priority = $adb->query_result($tktresult,0,"priority");
+ $old_severity = $adb->query_result($tktresult,0,"severity");
+ $old_category = $adb->query_result($tktresult,0,"category");
+
+ //Assigned to change log
+ if($assigned_group_name != '' && $assigntype == 'T')
+ {
+ $group_info = getGroupName($ticketid,'HelpDesk');
+ $group_name = $group_info[0];
+ if($group_name != $assigned_group_name)
+ $updatelog .= ' Transferred to group '.$assigned_group_name.'\.';
+ }
+ elseif($focus->column_fields['assigned_user_id'] != $old_user_id)
+ {
+ $user_name = getUserName($focus->column_fields['assigned_user_id']);
+ $updatelog .= ' Transferred to user '.$user_name.'\.';
+ }
+ //Status change log
+ if($old_status != $focus->column_fields['ticketstatus'])
+ {
+ $updatelog .= ' Status Changed to '.$focus->column_fields['ticketstatus'].'\.';
+ }
+ //Priority change log
+ if($old_priority != $focus->column_fields['ticketpriorities'])
+ {
+ $updatelog .= ' Priority Changed to '.$focus->column_fields['ticketpriorities'].'\.';
+ }
+ //Severity change log
+ if($old_severity != $focus->column_fields['ticketseverities'])
+ {
+ $updatelog .= ' Severity Changed to '.$focus->column_fields['ticketseverities'].'\.';
+ }
+ //Category change log
+ if($old_category != $focus->column_fields['ticketcategories'])
+ {
+ $updatelog .= ' Category Changed to '.$focus->column_fields['ticketcategories'].'\.';
+ }
+
+ $updatelog .= ' -- '.date("l dS F Y h:i:s A").' by '.$current_user->user_name.'--//--';
+ }
+ return $updatelog;
+ }
+
}
Modified: vtigercrm/trunk/modules/HelpDesk/Save.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/Save.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/Save.php Wed Aug 30 06:52:59 2006
@@ -29,7 +29,17 @@
setObjectValuesFromRequest(&$focus);
+global $adb;
+//Added to update the ticket history
+//Before save we have to construct the update log.
+$mode = $_REQUEST['mode'];
+$fldvalue = $focus->constructUpdateLog(&$focus, $mode, $_REQUEST['assigned_group_name'], $_REQUEST['assigntype']);
+$fldvalue = from_html($adb->formatString('vtiger_troubletickets','update_log',$fldvalue),($mode == 'edit')?true:false);
+
$focus->save("HelpDesk");
+
+//After save the record, we should update the log
+$adb->query("update vtiger_troubletickets set update_log=$fldvalue where ticketid=".$focus->id);
//Added to retrieve the existing attachment of the ticket and save it for the new duplicated ticket
if($_FILES['filename']['name'] == '' && $_REQUEST['mode'] != 'edit' && $_REQUEST['old_id'] != '')
@@ -213,4 +223,5 @@
$log->debug("Exiting getTicketComments method ...");
return $commentlist;
}
+
?>
More information about the vtigercrm-commits
mailing list