FCL/sf/app/organizer: comparison agendainterface/agendautil/src/agendautil

equal deleted inserted replaced

-:dcd0ca396fa1
+:5aadd1120515
 	iCalInstanceView->FindInstanceL(instanceList, filters, searchTimeRange);
 	// Parse thru the list and mark the dates which have events
 	for (int i = 0; i < instanceList.Count(); i++) {
-		CCalEntry::TType type = instanceList[i]->Entry().EntryTypeL();
+	    CCalEntry::TType type = instanceList[i]->Entry().EntryTypeL();
-		// Get the start time and end time of the events
+	    // Get the start time and end time of the events
-		TCalTime startCalTime = instanceList[i]->StartTimeL();
+	    TCalTime startCalTime = instanceList[i]->StartTimeL();
-		TCalTime endCalTime = instanceList[i]->EndTimeL();
+	    TCalTime endCalTime = instanceList[i]->EndTimeL();
-		TDateTime startDateTime = startCalTime.TimeLocalL().DateTime();
+	    TDateTime startDateTime = startCalTime.TimeLocalL().DateTime();
-		TDateTime endDateTime = endCalTime.TimeLocalL().DateTime();
+	    TDateTime endDateTime = endCalTime.TimeLocalL().DateTime();
-		QDate startDate(startDateTime.Year(), startDateTime.Month()+1,
+	    QDate startDate(startDateTime.Year(), startDateTime.Month()+1,
-						startDateTime.Day() + 1);
+	            startDateTime.Day() + 1);
-QDate endDate(endDateTime.Year(), endDateTime.Month()+1,
+	    QDate endDate(endDateTime.Year(), endDateTime.Month()+1,
-endDateTime.Day() + 1);
+	            endDateTime.Day() + 1);
-		if (type == CCalEntry::EEvent || type == CCalEntry::EAppt ||
+	    if (type == CCalEntry::EEvent || type == CCalEntry::EAppt ||
-				type == CCalEntry::EReminder) {
+	            type == CCalEntry::EReminder) {
-			if(endsAtStartOfDay(instanceList[i], endCalTime.TimeLocalL())) {
+	        if(endsAtStartOfDay(instanceList[i], endCalTime.TimeLocalL())) {
-				TDateTime endDateTime = endCalTime.TimeLocalL().DateTime();
+	            TDateTime endDateTime = endCalTime.TimeLocalL().DateTime();
-				// prevent problems with items ending tomorrow at 00:00
+	            // prevent problems with items ending tomorrow at 00:00
-				endDateTime.SetMinute(endDateTime.Minute() - 1);
+	            endDateTime.SetMinute(endDateTime.Minute() - 1);
-				TTime time(endDateTime);
+	            TTime time(endDateTime);
-				// If it is ending before the start of the grid
+	            endDate = endDate.addDays(-1);
-				if (time <= startDateForInstanceSearch.TimeLocalL()) {
+	            // If it is ending before the start of the grid
-					continue;
+	            if (time <= startDateForInstanceSearch.TimeLocalL()) {
-				}
+	                continue;
-			}
+	            }
-// Mark the required dates frm start date to end date
+	        }
-int numOfDays = 0;
+	        // Mark the required dates frm start date to end date
-//check if the start date of the entry is before the start day of the grid
+	        int numOfDays = 0;
-if(startDate < rangeStart.date()){
+	        //check if the start date of the entry is before the start day of the grid
-if(endDate<=rangeEnd.date()){
+	        if(startDate < rangeStart.date()){
-//if the end date of entry is lying in the grid ,
+	            if(endDate<=rangeEnd.date()){
-//then mark the entry from start day of the grid to the end date of the entry
+	                //if the end date of entry is lying in the grid ,
-numOfDays = rangeStart.date().daysTo(endDate);
+	                //then mark the entry from start day of the grid to the end date of the entry
-}
+	                numOfDays = rangeStart.date().daysTo(endDate);
-else{
+	            }
-//if end date of the entry is greater then the last date of grid,
+	            else{
-//then mark all the date of the grid with the entry
+	                //if end date of the entry is greater then the last date of grid,
-numOfDays = rangeStart.daysTo(rangeEnd);
+	                //then mark all the date of the grid with the entry
-}
+	                numOfDays = rangeStart.daysTo(rangeEnd);
-// Check if the event is all-day
+	            }
-if (instanceList[i]->Entry().EntryTypeL() == CCalEntry::EEvent) {
+	            //start the entries from the first day of the grid
-// no need to consider the date on which it ends
+	            for (int j = 0; j <= numOfDays; j++) {
-// reduce days count by 1
+	                QDate date = rangeStart.date().addDays(j);
-numOfDays--;
+	                if (date <= rangeEnd.date()) {
-}
+	                    dates.append(date);
-//start the entries from the first day of the grid
+	                } else {
-for (int j = 0; j <= numOfDays; j++) {
+	                    break;
-QDate date = rangeStart.date().addDays(j);
+	                }
-if (date <= rangeEnd.date()) {
+	            }
-dates.append(date);
+	        }
-} else {
+	        //if the start date of the entry is lying inside the grid
-break;
+	        else{
-}
+	            if(endDate<=rangeEnd.date()){
-}
+	                //if the end date of entry is lying in the grid ,
-}
+	                //then mark the entry from start date of the entry to the end date of the entry
-//if the start date of the entry is lying inside the grid
+	                numOfDays = startDate.daysTo(endDate);
-else{
+	            }
-if(endDate<=rangeEnd.date()){
+	            else{
-//if the end date of entry is lying in the grid ,
+	                //if end date of the entry is greater then the last date of grid,
-//then mark the entry from start date of the entry to the end date of the entry
+	                //then mark all the date from start date of the entry to the end date of the grid
-numOfDays = startDate.daysTo(endDate);
+	                numOfDays = startDate.daysTo(rangeEnd.date());
-}
+	            }
-else{
+	            for (int j = 0; j <= numOfDays; j++) {
-//if end date of the entry is greater then the last date of grid,
+	                QDate date = startDate.addDays(j);
-//then mark all the date from start date of the entry to the end date of the grid
+	                if (date <= rangeEnd.date()) {
-numOfDays = startDate.daysTo(rangeEnd.date());
+	                    dates.append(date);
-}
+	                } else {
-// Check if the event is all-day
+	                    break;
-if (instanceList[i]->Entry().EntryTypeL() == CCalEntry::EEvent) {
+	                }
-// no need to consider the date on which it ends
+	            }
-// reduce days count by 1
+	        }
-numOfDays--;
+	    } else if (type == CCalEntry::EAnniv) {
-}
+	        if (startDate <= rangeEnd.date()) {
-for (int j = 0; j <= numOfDays; j++) {
+	            dates.append(startDate);
-QDate date = startDate.addDays(j);
+	        }
-if (date <= rangeEnd.date()) {
+	    } else if (type == CCalEntry::ETodo) {
-dates.append(date);
+	        // if start time is less that today, then mark it for today
-} else {
+	        if (startDate < QDate::currentDate()) {
-break;
+	            dates.append(QDate::currentDate());
-}
+	        } else {
-}
+	            dates.append(startDate);
-}
+	        }
-} else if (type == CCalEntry::EAnniv) {
+	    }
-if (startDate <= rangeEnd.date()) {
+	}
-dates.append(startDate);
-}
-} else if (type == CCalEntry::ETodo) {
-// if start time is less that today, then mark it for today
-if (startDate < QDate::currentDate()) {
-dates.append(QDate::currentDate());
-} else {
-dates.append(startDate);
-}
-}
-}
 CleanupStack::PopAndDestroy(&instanceList);
 }
 QList<AgendaEntry> AgendaUtilPrivate::createEntryIdListForDay( QDateTime day,
 AgendaUtil::FilterFlags filter )
 				TCalTime calTime;
 				QDateTime dateTime = agendaEntry.lastModifiedDateTime();
 				TDateTime tempDateTime(dateTime.date().year(),
 						static_cast<TMonth> (dateTime.date().month() - 1),
 						dateTime.date().day() - 1, dateTime.time().hour(),
-						dateTime.time().minute(), 0, 0);
+						dateTime.time().minute(), dateTime.time().second(), 0);
 				TTime tempTime(tempDateTime);
 				calTime.SetTimeLocalL(tempTime);
 				calEntry.SetLastModifiedDateL(calTime);
 				// Set the dtstamp time.It is used to set the creation time.
 				QDateTime dtStamp = agendaEntry.dtStamp();
 				TDateTime
 				creationDateTime(dtStamp.date().year(),
 						static_cast<TMonth> (dtStamp.date().month() - 1),
 						dtStamp.date().day() - 1, dtStamp.time().hour(),
-						dtStamp.time().minute(), 0, 0);
+						dtStamp.time().minute(), dtStamp.time().second(), 0);
 				TTime creationTTime(creationDateTime);
 				creationCalTime.SetTimeLocalL(creationTTime);
 				calEntry.SetDTStampL(creationCalTime);
 			} else {

changeset 83	5aadd1120515
parent 81	ce92091cbd61