[Vtigercrm-commits] [vtiger-commits] r10481 - in /vtigercrm/branches/5.0.3/modules/Calendar: CalendarCommon.php Save.php TodoSave.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Tue Mar 20 01:46:31 2007
New Revision: 10481

Log:
date and time display changed in event notification mail. --Minnie

Modified:
    vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php
    vtigercrm/branches/5.0.3/modules/Calendar/Save.php
    vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php

Modified: vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php Tue Mar 20 01:46:31 2007
@@ -491,8 +491,11 @@
 	$mail_data['description'] = $description;
 	$mail_data['assingn_type'] = $assignType;
 	$mail_data['group_name'] = $grp_name;
-	$mail_data['st_date_time']=$st_date." ".$st_time;
-	$mail_data['end_date_time']=$end_date." ".$end_time;
+	$value = getaddEventPopupTime($st_time,$end_time,'24');
+	$start_hour = $value['starthour'].':'.$value['startmin'].''.$value['startfmt'];
+	$end_hour = $value['endhour'] .':'.$value['endmin'].''.$value['endfmt'];
+	$mail_data['st_date_time']=getDisplayDate($st_date)." ".$start_hour;
+	$mail_data['end_date_time']=getDisplayDate($end_date)." ".$end_hour;
 	$mail_data['location']=$location;
 	return $mail_data;
 

Modified: vtigercrm/branches/5.0.3/modules/Calendar/Save.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/Save.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/Save.php Tue Mar 20 01:46:31 2007
@@ -168,8 +168,11 @@
 	$mail_data['assingn_type'] = $_REQUEST['assigntype'];
 	$mail_data['group_name'] = $_REQUEST['assigned_group_name'];
 	$mail_data['mode'] = $_REQUEST['mode'];
-	$mail_data['st_date_time'] = $_REQUEST['date_start']." ".$_REQUEST['time_start'];
-	$mail_data['end_date_time']=$_REQUEST['due_date']." ".$_REQUEST['time_end'];
+	$value = getaddEventPopupTime($_REQUEST['time_start'],$_REQUEST['time_end'],'24');
+	$start_hour = $value['starthour'].':'.$value['startmin'].''.$value['startfmt'];
+	$end_hour = $value['endhour'] .':'.$value['endmin'].''.$value['endfmt'];
+	$mail_data['st_date_time'] = getDisplayDate($_REQUEST['date_start'])." ".$start_hour;
+	$mail_data['end_date_time']=getDisplayDate($_REQUEST['due_date'])." ".$end_hour;
 	$mail_data['location']=$_REQUEST['location'];
 	return $mail_data;
 }

Modified: vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php Tue Mar 20 01:46:31 2007
@@ -67,8 +67,10 @@
 	$mail_data['assingn_type'] = $_REQUEST['task_assigntype'];
 	$mail_data['group_name'] = $_REQUEST['task_assigned_group_name'];
 	$mail_data['mode'] = $_REQUEST['task_mode'];
-	$mail_data['st_date_time'] = $_REQUEST['task_date_start']." ".$_REQUEST['task_time_start'];
-	$mail_data['end_date_time']=$_REQUEST['task_due_date'];
+	$value = getaddEventPopupTime($_REQUEST['task_time_start'],$_REQUEST['task_time_end'],'24');
+	$start_hour = $value['starthour'].':'.$value['startmin'].''.$value['startfmt'];
+	$mail_data['st_date_time'] = getDisplayDate($_REQUEST['task_date_start'])." ".$start_hour;
+	$mail_data['end_date_time']=getDisplayDate($_REQUEST['task_due_date']);
 	return $mail_data;
 }