[Vtigercrm-commits] [vtiger-commits] r10657 - in /vtigercrm/branches/5.0.3: include/utils/ListViewUtils.php modules/Calendar/CalendarCommon.php modules/Calendar/ListView.php modules/Calendar/script.js modules/CustomView/CustomView.php
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Thu Apr 12 07:54:03 EDT 2007
Author: saraj
Date: Thu Apr 12 05:53:51 2007
New Revision: 10657
Log:
fix for calendar related issue. Fixes #3524 #3568 #3591 --minnie
Modified:
vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php
vtigercrm/branches/5.0.3/modules/Calendar/ListView.php
vtigercrm/branches/5.0.3/modules/Calendar/script.js
vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php
Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Thu Apr 12 05:53:51 2007
@@ -625,8 +625,6 @@
if(($module == 'Calendar' || $module == 'Tasks' || $module == 'Meetings' || $module == 'Emails' || $module == 'HelpDesk' || $module == 'Invoice' || $module == 'Leads' || $module == 'Contacts') && (($name=='Related to') || ($name=='Contact Name') || ($name=='Close') || ($name == 'First Name')))
{
$status = $adb->query_result($list_result,$i-1,"status");
- if($status == '')
- $status = $adb->query_result($list_result,$i-1,"eventstatus");
if ($name=='Related to')
$value=getRelatedTo($module,$list_result,$i-1);
if($name=='Contact Name')
@@ -666,7 +664,7 @@
else
{
$activityid = $adb->query_result($list_result,$i-1,"activityid");
- $activitytype = $adb->query_result($list_result,$i-1,"activitytype");
+ $activitytype = $adb->query_result($list_result,$i-1,"type");
if($activitytype=='Task')
$evt_status='&status=Completed';
else
@@ -1054,21 +1052,18 @@
$colname = $value;
}
//added for getting event status in Custom view - Jaguar
- if($module == 'Calendar' && $colname == "status")
+ if($module == 'Calendar' && ($colname == "status" || $colname == "eventstatus"))
{
$colname="activitystatus";
}
//Ends
$field_val = $adb->query_result($list_result,$list_result_count,$colname);
-
+ $temp_val = $field_val;
if(strlen($field_val) > 40)
{
$temp_val = substr($field_val,0,40).'...';
}
- else
- {
- $temp_val = $field_val;
- }
+
if($uitype == 53)
{
$value = $adb->query_result($list_result,$list_result_count,'user_name');
@@ -1081,11 +1076,6 @@
{
$value = getUserName($adb->query_result($list_result,$list_result_count,'inventorymanager'));
}
- elseif($uitype == 15 && $module == 'Calendar')
- {
- $activitytype = $adb->query_result($list_result,$list_result_count,$colname);
- $value = $app_strings[$activitytype];
- }
elseif($uitype == 5 || $uitype == 6 || $uitype == 23 || $uitype == 70)
{
if($temp_val != '' && $temp_val != '0000-00-00')
@@ -1118,7 +1108,6 @@
}
elseif($uitype == 15 || $uitype == 111 || $uitype == 16)
{
- $temp_val = $adb->query_result($list_result,$list_result_count,$colname);
if($current_module_strings[$temp_val] != '')
{
$value = $current_module_strings[$temp_val];
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 Thu Apr 12 05:53:51 2007
@@ -191,7 +191,7 @@
$combo .= '<option value="'.$value.'" '.$minsel.'>'.$value.'</option>';
}
$combo .= '</select> ';
- $combo .= '<select name="'.$bimode.'fmt" id="'.$bimode.'fmt" class=small>';
+ $combo .= '<select name="'.$bimode.'fmt" id="'.$bimode.'fmt" class=small '.$jsfn.'>';
$amselected = ($fmt == 'am')?'selected':'';
$pmselected = ($fmt == 'pm')?'selected':'';
$combo .= '<option value="am" '.$amselected.'>AM</option>';
Modified: vtigercrm/branches/5.0.3/modules/Calendar/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/ListView.php Thu Apr 12 05:53:51 2007
@@ -203,8 +203,8 @@
//Cambiado code to add close button in custom vtiger_field
if (($viewid!=0)&&($viewid!="")){
- if (!isset($oCustomView->list_fields['Close'])) $oCustomView->list_fields['Close']=array ( 'activity' => 'status' );
- if (!isset($oCustomView->list_fields_name['Close'])) $oCustomView->list_fields_name['Close']='status';
+ if (!isset($oCustomView->list_fields['Close'])) $oCustomView->list_fields['Close']=array ( 'vtiger_activity' => 'eventstatus' );
+ if (!isset($oCustomView->list_fields_name['Close'])) $oCustomView->list_fields_name['Close']='eventstatus';
}
$listview_header = getListViewHeader($focus,"Calendar",$url_string,$sorder,$order_by,"",$oCustomView);
$smarty->assign("LISTHEADER", $listview_header);
Modified: vtigercrm/branches/5.0.3/modules/Calendar/script.js
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/script.js (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/script.js Thu Apr 12 05:53:51 2007
@@ -787,9 +787,17 @@
postBody: 'module=Calendar&action=ActivityAjax&record='+record+'&'+status+'&view='+view+'&hour='+hour+'&day='+day+'&month='+month+'&year='+year+'&type=change_status&viewOption='+OptionData+'&subtab=event&ajax=true',
onComplete: function(response) {
if(OptionData == 'listview')
- $("listView").innerHTML=response.responseText;
+ {
+ result = response.responseText.split('####');
+ $("total_activities").innerHTML = result[1];
+ $("listView").innerHTML=result[0];
+ }
if(OptionData == 'hourview')
- $("hrView").innerHTML=response.responseText;
+ {
+ result = response.responseText.split('####');
+ $("total_activities").innerHTML = result[1];
+ $("hrView").innerHTML=result[0];
+ }
}
}
);
@@ -802,7 +810,9 @@
method: 'post',
postBody: 'module=Calendar&action=ActivityAjax&record='+record+'&'+status+'&view='+view+'&hour='+hour+'&day='+day+'&month='+month+'&year='+year+'&type=change_status&subtab=todo&ajax=true',
onComplete: function(response) {
- $("mnuTab2").innerHTML=response.responseText;
+ result = response.responseText.split('####');
+ $("total_activities").innerHTML = result[1];
+ $("mnuTab2").innerHTML=result[0];
}
}
)
@@ -932,9 +942,17 @@
postBody: eventurl,
onComplete: function(response) {
if(OptionData == 'listview')
- $("listView").innerHTML=response.responseText;
+ {
+ result = response.responseText.split('####');
+ $("total_activities").innerHTML = result[1];
+ $("listView").innerHTML=result[0];
+ }
if(OptionData == 'hourview')
- $("hrView").innerHTML=response.responseText;
+ {
+ result = response.responseText.split('####');
+ $("total_activities").innerHTML = result[1];
+ $("hrView").innerHTML=result[0];
+ }
}
}
);
@@ -949,7 +967,9 @@
method: 'post',
postBody: todourl,
onComplete: function(response) {
- $("mnuTab2").innerHTML=response.responseText;
+ result = response.responseText.split('####');
+ $("total_activities").innerHTML = result[1];
+ $("mnuTab2").innerHTML=result[0];
}
}
);
@@ -1276,14 +1296,10 @@
{
if(hour == 11)
{
- hour = 12;
- min = min;
- fmt = 'pm';
+ hour = 12; min = min; fmt = 'pm';
}else if(hour == 12)
{
- hour = 1;
- min = min;
- fmt = 'am';
+ hour = 1; min = min; fmt = 'am';
}
else hour = hour + 1;
hour = _2digit(hour);
@@ -1320,11 +1336,13 @@
{
if(hour == 11 && min == 55)
{
- hour = 12;
- min = 0;
- fmt = 'am';
+ hour = 12; min = 0; fmt = 'am';
date = tempdate;
}
+ else if(hour == 12 && min == 55)
+ {
+ hour = 1; min = 0; fmt = 'pm';
+ }
else
{
if(min == 55)
@@ -1352,6 +1370,12 @@
min = 0;
fmt = 'pm';
}
+ else if(hour == 12 && min == 55)
+ {
+ hour = 1;
+ min = 0;
+ fmt = 'am';
+ }
else
{
if(min == 55)
Modified: vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php (original)
+++ vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php Thu Apr 12 05:53:51 2007
@@ -762,7 +762,7 @@
$sqllist_column = $list[0].".".$list[1];
if($this->customviewmodule == "Calendar")
{
- if($list[1] == "status")
+ if($list[1] == "status" || $list[1] == "eventstatus")
{
$sqllist_column = "case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end as activitystatus";
}
@@ -869,7 +869,7 @@
}else
{
//Added for getting vtiger_activity Status -Jaguar
- if($this->customviewmodule == "Calendar" && $columns[1] == "status")
+ if($this->customviewmodule == "Calendar" && ($columns[1] == "status" || $columns[1] == "eventstatus"))
{
$advfiltersql[] = "case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end".$this->getAdvComparator($advfltrow["comparator"],trim($advfltrow["value"]),$datatype);
}
@@ -1446,7 +1446,7 @@
$listviewquery = substr($listquery, strpos($listquery,'FROM'),strlen($listquery));
if($module == "Calendar" || $module == "Emails")
{
- $query = "select ".$this->getCvColumnListSQL($viewid)." ,vtiger_crmentity.crmid,vtiger_activity.* ".$listviewquery;
+ $query = "select ".$this->getCvColumnListSQL($viewid)." , vtiger_activity.activityid, vtiger_activity.activitytype as type, vtiger_activity.priority, case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end as status, vtiger_crmentity.crmid ".$listviewquery;
}else if($module == "Notes")
{
$query = "select ".$this->getCvColumnListSQL($viewid)." ,vtiger_crmentity.crmid,vtiger_notes.* ".$listviewquery;
More information about the vtigercrm-commits
mailing list