[Vtigercrm-commits] [vtiger-commits] r6538 - in /vtigercrm/trunk/modules/Calendar: Appointment.php CalendarAjax.php addEventUI.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Sat May 27 09:29:41 2006
New Revision: 6538

Log:
changes made for calendar sharing

Modified:
    vtigercrm/trunk/modules/Calendar/Appointment.php
    vtigercrm/trunk/modules/Calendar/CalendarAjax.php
    vtigercrm/trunk/modules/Calendar/addEventUI.php

Modified: vtigercrm/trunk/modules/Calendar/Appointment.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/Appointment.php (original)
+++ vtigercrm/trunk/modules/Calendar/Appointment.php Sat May 27 09:29:41 2006
@@ -45,7 +45,7 @@
 	function readAppointment($userid, &$from_datetime, &$to_datetime, $view)
 	{
 		global $current_user,$adb;
-		$shared_ids = getSharedCalendarId($current_user->id,'shared');		
+		$shared_ids = getSharedCalendarId($current_user->id);		
 		if(empty($shared_ids))
 			$shared_ids = $current_user->id;
                 $q= "select activity.*, crmentity.*, account.accountname,account.accountid,activitygrouprelation.groupname FROM activity inner join crmentity on activity.activityid = crmentity.crmid left join recurringevents on activity.activityid=recurringevents.activityid left outer join activitygrouprelation on activitygrouprelation.activityid=activity.activityid left join cntactivityrel on activity.activityid = cntactivityrel.activityid left join contactdetails on cntactivityrel.contactid = contactdetails.contactid left join account  on contactdetails.accountid = account.accountid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE activity.activitytype in ('Call','Meeting') AND ";

Modified: vtigercrm/trunk/modules/Calendar/CalendarAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/CalendarAjax.php (original)
+++ vtigercrm/trunk/modules/Calendar/CalendarAjax.php Sat May 27 09:29:41 2006
@@ -31,6 +31,10 @@
         	calendar_layout($calendar_arr);
 	        $mod_strings = return_module_language($current_language,$temp_module);
         	$currentModule = $_REQUEST['module'];
+	}
+	elseif($type == 'settings')
+	{
+		require_once('modules/Calendar/calendar_share.php');	
 	}
 	else
 	{

Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/addEventUI.php (original)
+++ vtigercrm/trunk/modules/Calendar/addEventUI.php Sat May 27 09:29:41 2006
@@ -1,15 +1,24 @@
 <?php
+/*********************************************************************************
+** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is:  vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+*
+ ********************************************************************************/
+
 require_once('include/utils/CommonUtils.php');
 require_once('modules/Activities/Activity.php');
 require_once('modules/Calendar/Calendar.php');
-
- global $theme;
+require_once("modules/Emails/mail.php");
+
+ global $theme,$mod_strings,$app_strings,$current_user;
  $theme_path="themes/".$theme."/";
  $image_path=$theme_path."images/";
  require_once ($theme_path."layout_utils.php");
- global $mod_strings,$app_strings,$current_user;
  $userDetails=getOtherUserName($current_user->id);
- require_once("modules/Emails/mail.php");
  $to_email = getUserEmailId('id',$current_user->id);
  $date_format = parse_calendardate($app_strings['NTC_DATE_FORMAT']);
 $mysel= $_GET['view'];
@@ -531,17 +540,24 @@
 
 	<!-- Add Activity DIV stops-->
 
-<div id="reportLay" style="width:125px;" onMouseout="fninvsh('reportLay')" onMouseover="fnvshNrm('reportLay')">
+<div id="calAction" style="width:125px;" onMouseout="fninvsh('calAction')" onMouseover="fnvshNrm('calAction')">
 	<table width="100%" cellpadding="0" cellspacing="0" border="0" bgcolor="#FFFFFF">
 		<tr>
 			<td>
-				<a href="#" onClick="changeCalstatus();" class="calMnu">- <?php echo $mod_strings['LBL_COMPLETED']?></a>
-				<a href="#" onClick="changeCalstatus();" class="calMnu">- <?php echo $mod_strings['LBL_EPENDING']?></a>
+				<a href="" id="complete" class="calMnu">- <?php echo $mod_strings['LBL_COMPLETED']?></a>
+				<a href="" id="pending" class="calMnu">- <?php echo $mod_strings['LBL_EPENDING']?></a>
 				<span style="border-top:1px dashed #CCCCCC;width:99%;display:block;"></span>
-				<a href="#" onClick="" class="calMnu">- <?php echo $mod_strings['LBL_POSTPONE']?></a>
-				<a href="#" onClick="calchangeowner();" class="calMnu">- <?php echo $mod_strings['LBL_CHANGEOWNER']?></a>
-				<a href="#" onClick="changeCalstatus();" class="calMnu">- <?php echo $mod_strings['LBL_DEL']?></a>
+				<a href="" id="postpone" class="calMnu">- <?php echo $mod_strings['LBL_POSTPONE']?></a>
+				<a href="#" id="changeowner" onClick="calchangeowner();" class="calMnu">- <?php echo $mod_strings['LBL_CHANGEOWNER']?></a>
+				<a href="" id="actdelete" class="calMnu">- <?php echo $mod_strings['LBL_DEL']?></a>
 			</td>
 		</tr>
 	</table>
 </div>
+
+<!-- Dropdown for Add Event -->
+<div id='addEventDropDown' onmouseover='fnShowEvent()' onmouseout='fnRemoveEvent()'>
+	<a href='' id="addcall" class='submenu'>Add Call</a>
+        <a href='' id="addmeeting" class='submenu'>Add Meeting</a>
+        <a href='' id="addtodo" class='submenu'>Add Todo</a>
+</div>