FCL/sf/app/commonemail: comparison meetingrequest/mrservices/src/cesmrconflictchecker.cpp

equal deleted inserted replaced

-:c8382f7b54ef
+:726fba06891a
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
 *  Description : ESMR conflict checker implementation
-*  Version     : %version: e002sa33#9 %
+*  Version     : %version: e002sa33#10.1.2 %
 *
 */
 #include "emailtrace.h"
 #include "cesmrconflictchecker.h"
 #include "cesmrcaldbmgr.h"
 #include "esmrhelper.h"
 #include "esmrentryhelper.h"
 #include "esmrinternaluid.h"
+#include "cesmrcaluserutil.h"
 #include <calcommon.h>
 #include <calinstance.h>
 #include <calentryview.h>
 #include <calinstanceview.h>
 TTime aEnd,
 CCalInstanceView* aInstanceView )
 {
 FUNC_LOG;
 const CalCommon::TCalViewFilter instanceFilter =
-CalCommon::EIncludeAppts;
+CalCommon::EIncludeAppts | CalCommon::EIncludeEvents;
 TDateTime start = aStart.DateTime();
 TDateTime end   = aEnd.DateTime();
 start.SetHour( KZero );
 aEntry.EndTimeL().TimeUtcL(),
 allCalenInstanceView[i] );
 allCalenInstanceView[i]->FindInstanceL(
 aInstances,
-CalCommon::EIncludeAppts,
+CalCommon::EIncludeAppts |
+CalCommon::EIncludeEvents ,
 timeRange );
 }
 RemoveAndDeleteNonConflictingInstancesL(
 aInstances,
 if ( tmpInstanceArray.Count() )
 {
 MoveInstancesL( tmpInstanceArray, aInstances );
 if ( !aFindAllConflicts )
 {
-break;
+//break;
 }
 }
 }
 }
 else if ( rRule.Until().TimeUtcL() != Time::NullTTime() )
 if ( tmpInstanceArray.Count() )
 {
 MoveInstancesL( tmpInstanceArray, aInstances );
 if ( !aFindAllConflicts )
 {
-break;
+//break;
 }
 }
 // Move to next occurence
 start += interval;
 if ( tmpInstanceArray.Count() )
 {
 MoveInstancesL( tmpInstanceArray, aInstances );
 if ( !aFindAllConflicts )
 {
-break;
+//break;
 }
 }
 }
 }
 if ( tmpInstanceArray.Count() )
 {
 MoveInstancesL( tmpInstanceArray, aInstances );
 if ( !aFindAllConflicts )
 {
-break;
+// break;
 }
 }
 }
 }
 CleanupStack::PopAndDestroy( &days );
 CleanupStack::PopAndDestroy( &tmpInstanceArray );
 }
 /**
+* Judge is one CCalEntry is a all day event
+* @param aEntry the entry be checked
+* @return ETure if it is a all day event
+*/
+TBool IsAllDayEventL( const CCalEntry& aEntry )
+{
+FUNC_LOG;
+// for judge all day event
+CCalEntry* tmpEntry = ESMRHelper::CopyEntryLC(
+						aEntry,
+						aEntry.MethodL(),
+ESMRHelper::ECopyFull );
+CESMRCalUserUtil* entryUtil = CESMRCalUserUtil::NewLC( *tmpEntry );
+TBool allDayEvent( entryUtil->IsAlldayEventL() );
+CleanupStack::PopAndDestroy( entryUtil );
+CleanupStack::PopAndDestroy( tmpEntry );
+return allDayEvent;
+}
+/**
+* Get the first visible instance from the iterater.
+* @param aIterater the handler of the iterater.
+* @return the first instance
+*/
+CCalInstance* FirstInstanceL ( CCalInstanceIterator* aIterater)
+	{
+	FUNC_LOG;
+	CCalInstance* previous = aIterater->PreviousL();
+	while( previous )
+		{
+		CleanupStack::PushL( previous );
+		CleanupStack::PopAndDestroy( previous );
+		previous = aIterater->PreviousL();
+		}
+	CCalInstance* next = aIterater->NextL();
+	CleanupStack::PushL( next );
+	CleanupStack::PopAndDestroy( next );
+	previous = aIterater->PreviousL();
+	return previous;
+	}
+/**
 * Finds conflict for recurrent entry
 */
 void FindConflictsForRepeatingMeetingL(
 const CCalEntry& aEntry,
 RPointerArray< CCalInstance >& aInstances,
 if ( instance ) // Instance is stored
 {
 CleanupStack::PushL( instance );
 RCPointerArray< CCalInstance > tmpInstanceArray;
 CleanupClosePushL( tmpInstanceArray );
 CCalEntry& parent = instance->Entry();
-CCalInstanceView* instanceView = aDb.InstanceViewL( parent );
+CCalInstanceView* instanceView = aDb.InstanceViewL( aEntry );
+// create the iterator for instances by current entry
 CCalInstanceIterator* iterator = instanceView->FindInstanceByUidL(
-parent.UidL(),
+		aEntry.UidL(),
-parent.StartTimeL() );
+		aEntry.StartTimeL() );
 CleanupStack::PushL( iterator );
 CCalEntry* entry = ESMRHelper::CopyEntryLC(
 parent,
 parent.MethodL(),
 ESMRHelper::ECopyFull );
+// For CCalInstanceIterator class don't have any function on how to get current instance,
-while ( iterator->HasMore() )
+// handle the special situation for it.
-{
+if( iterator ->Count() == 1 )
-CCalInstance* next = iterator->NextL();
+	{
-CleanupStack::PushL( next );
+			entry->SetStartAndEndTimeL( aEntry.StartTimeL(), aEntry.EndTimeL() );
-entry->SetStartAndEndTimeL( next->StartTimeL(), next->EndTimeL() );
-CleanupStack::PopAndDestroy( next );
+			FindConflictsForEntryL( *entry,
-FindConflictsForEntryL( *entry,
+									tmpInstanceArray,
-tmpInstanceArray,
+									aDb );
-aDb );
+			if ( tmpInstanceArray.Count() )
-if ( tmpInstanceArray.Count() )
+				{
-{
+			    MoveInstancesL( tmpInstanceArray, aInstances );
-MoveInstancesL( tmpInstanceArray, aInstances );
+				}
+	}
-if ( !aFindAllConflicts )
+else
-{
+	{
-break;
+			 // For CCalInstanceIterator class don't have any function on how to get current instance,
-}
+			 // handle the first instance action when find conflict.
-}
+			 CCalInstance* previous = FirstInstanceL( iterator );
-}
+			 CleanupStack::PushL( previous );
+			 entry->SetStartAndEndTimeL( previous->StartTimeL(), previous->EndTimeL() );
+			 CleanupStack::PopAndDestroy( previous );
+			 FindConflictsForEntryL( *entry, tmpInstanceArray, aDb );
+			 if ( tmpInstanceArray.Count() )
+				{
+				MoveInstancesL( tmpInstanceArray, aInstances );
+				}
+			 // does the normal find conflict action. From the second to the end.
+			 while ( iterator->HasMore() )
+				{
+				CCalInstance* next = iterator->NextL();
+				CleanupStack::PushL( next );
+				entry->SetStartAndEndTimeL( next->StartTimeL(), next->EndTimeL() );
+				CleanupStack::PopAndDestroy( next );
+				FindConflictsForEntryL( *entry,
+										tmpInstanceArray,
+										aDb );
+				if ( tmpInstanceArray.Count() )
+					{
+					MoveInstancesL( tmpInstanceArray, aInstances );
+					}
+				}
+	}
 CleanupStack::PopAndDestroy( entry );
 CleanupStack::PopAndDestroy( iterator );

branch	RCL_3
changeset 80	726fba06891a
parent 64	3533d4323edc