FCL/sf/app/organizer: comparison calendarui/views/src/calenagendaviewwidget.cpp

equal deleted inserted replaced

-:2c54b51f39c4
+:bb2d3e476f29
 #include "calenagendaview.h"
 #include "calendocloader.h"
 #include "calenservices.h"
 #include "calencontext.h"
 #include "calendateutils.h"
+#include "calenagendautils.h"
 #include "CalenUid.h"
 #include "caleneventlistviewitem.h"
 #include "calenpluginlabel.h"
 #include "calendarprivatecrkeys.h"
 #include "OstTraceDefinitions.h"
 } else if (mInstanceArray.count() < mListModel->rowCount()) {
 // There are less number of events than the number
 // of items in the list. Remove the extra rows
 mListModel->removeRows(0, mListModel->rowCount() - mInstanceArray.count());
 }
+//to set the index to first item of the list , when view refresh
 mIndex = 0;
+//status reset for not setting any property
 mIconCheck = false;
 mListModel->setColumnCount(singleColumn);
 mIconCheck = true;
 // Add all the events to the list
 for (int index = 0; index < mInstanceArray.count(); index++) {
 if (index < 0 || entry.isNull()) {
 // Not a valid index or entry. Dont do anything
 OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_CREATELISTITEM_EXIT );
 return;
 }
-// Check if the entry is a timed entry
+// Check if the entry is a timed entry and not all day event
-// TODO: Right now, only appointment/meeting type is being handled
+// an all-day event when it is synched from OUTLOOK then entry type will be EAppt
-// Handle other timed entry types like reminder etc
+if (!CalenAgendaUtils::isAlldayEvent(entry) && entry.isTimedEntry()) {
-if (entry.isTimedEntry()) {
 // Get the text and icon data for the entry
 addTimedEventToList(index, entry);
 } else {
 addNonTimedEventToList(index, entry);
 }
 // only if valid geo-coordinates are present
 if (!entry.geoValue().isNull()){
 iconData << HbIcon(locationIcon);
 }
 else {
-iconData << HbIcon();
+iconData << QVariant();
 }
 textData << entry.location();
 }
 // Add the end time to the list item
 if (eventStartTime < eventEndTime) {
 if (entryType == AgendaEntry::TypeAnniversary) {
 // Nothing to do as of now as anniversary events
 // cannot be created
 // TODO: To be handled in case of sync
-} else if (entryType == AgendaEntry::TypeEvent) {
+} else if (CalenAgendaUtils::isAlldayEvent(entry)) {
 // This is an all day event
 // Append the all-day icon
 iconData << HbIcon(allDayIcon);
 // Check if alarm is enabled for the entry
 if (entry.alarm().isNull()) {
 // Insert a blank icon. Else next text item will get shifted to left
-iconData << HbIcon();
+iconData << QVariant();
 } else {
 	// if entry is not repeating in place of reminder icon put a blank
 	// icon and move reminder icon to the place of repeating icon
 	 if (!entry.isRepeating()) {
-		 iconData << HbIcon();
+iconData << QVariant();
 	 }
 iconData << HbIcon(reminderIcon);
 }
 // Check if the entry is recurring
 iconData << HbIcon(exceptionIcon);
 } else {
 	// put the blank icon only when both reminder and repeating icons
 	// are not there
 	if (entry.alarm().isNull()) {
-	iconData << HbIcon();
+	iconData << QVariant();
 	}
 }
 // Append the location
 if (!entry.location().isEmpty()) {
 // TODO: Location icon must be shown
 // only if valid geo-coordinates are present
 if (!entry.geoValue().isNull()){
 iconData << HbIcon(locationIcon);
 }else {
-iconData << HbIcon();
+iconData << QVariant();
 }
 } else {
 textData << QVariant();
 }
 // The fourth text item has to be empty
 textData << QVariant();
 // Check if alarm is enabled for the entry
 if (entry.alarm().isNull()) {
 	// Insert a blank icon. Else next text item will get shifted to left
-	iconData << HbIcon();
+	iconData << QVariant();
 } else {
 	// if entry is not repeating in place of reminder icon put a blank
 	// icon and move reminder icon to the place of repeating icon
 	if (!entry.isRepeating()) {
-		iconData << HbIcon();
+		iconData << QVariant();
 	}
 	iconData << HbIcon(reminderIcon);
 }
 // Check if the entry is recurring
 	iconData << HbIcon(repeatIcon);
 } else {
 	// Insert the blank icon only when both reminder and repeating icons
 	// are not there
 	if (entry.alarm().isNull()) {
-		iconData << HbIcon();
+		iconData << QVariant();
 	}
 }
 }
 // Get the list model index and set the text and icon data
 }
 for(int index = 0; index < mInstanceArray.count() ; index ++) {
 AgendaEntry entry = mInstanceArray[index];
 if (!entry.isNull()) {
 AgendaEntry::Type eventType = entry.type();
+// Need to check explicitly for Appt that got synched from OUTLOOK
+// that can be an all-day event
+if (AgendaEntry::TypeAppoinment == eventType) {
+	if (CalenAgendaUtils::isAlldayEvent(entry)) {
+		eventType = AgendaEntry::TypeEvent;
+	}
+}
 switch(eventType) {
 // Apply the stretching to only to-do's,
 // anniversary and all-day event types
 case AgendaEntry::TypeTodo:
 case AgendaEntry::TypeEvent:
 // Get the entry details first
 AgendaEntry entry = mInstanceArray[mSelectedIndex];
 // Set the context
 setContextFromHighlight(entry);
+//for not setting any property again
 mIconCheck = false;
 // Launch the event viewer.
 mServices.IssueCommandL(ECalenEventView);
 OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_VIEWENTRY_EXIT );
 mListModel->clear();
 OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_CLEARLISTMODEL_EXIT );
 }
+// ----------------------------------------------------------------------------
+// CalenAgendaViewWidget::hasAllDayIcon
+// return true  if property for all day icon to set
+// ----------------------------------------------------------------------------
+//
 bool CalenAgendaViewWidget::hasAllDayIcon()
 {
 return mIconCheck;
 }
+// ----------------------------------------------------------------------------
+// CalenAgendaViewWidget::checkEntryIcons
+// check if all day icon is present
+// ----------------------------------------------------------------------------
+//
 void CalenAgendaViewWidget::checkEntryIcons()
 {
-//  return allDayLeftIcon;
 int index = 0;
 //check the number of entries
 index  = mInstanceArray.count();
 // Get each of the entry details
 AgendaEntry entry;
 if(mIndex < index )
 entry = mInstanceArray[mIndex];
-mRightAlarmIcon = false;
-mRightRepeatIcon = false;
-mRightExceptionIcon = false;
 mLeftAllDayIcon = false;
+mLocationData = false;
-if(!entry.alarm().isNull()){
+if(!entry.isTimedEntry() || CalenAgendaUtils::isAlldayEvent(entry)){
-mRightAlarmIcon = true;
-}
-if (entry.isRepeating()){
-mRightRepeatIcon = true;
-}
-if (!entry.recurrenceId().isNull()){
-mRightExceptionIcon = true;
-}
-if(!entry.isTimedEntry()){
 //all day icon is not there if its a timed entry
 mLeftAllDayIcon = true;
 }
+if (!entry.location().isEmpty()) {
+mLocationData = true ;
+}
 //check if shift to next entry
 if(mNextEntry)
 mIndex++;
 }
+// ----------------------------------------------------------------------------
+// CalenAgendaViewWidget::isAllDayIcon
+// retirn true  if all day icon is present
+// ----------------------------------------------------------------------------
+//
 bool CalenAgendaViewWidget::isAllDayIcon()
 {
 return mLeftAllDayIcon;
 }
-bool CalenAgendaViewWidget::isExceptionIcon()
+// ----------------------------------------------------------------------------
+// CalenAgendaViewWidget::isLocationData
+// return true  if location entry is present
+// ----------------------------------------------------------------------------
+//
+bool CalenAgendaViewWidget::isLocationData()
 {
-return mRightExceptionIcon;
+return mLocationData;
 }
-bool CalenAgendaViewWidget::isAlarmIcon()
-{
-return mRightAlarmIcon;
-}
-bool CalenAgendaViewWidget::isRepeatingIcon()
-{
-return mRightRepeatIcon;
-}
 // End of file	--Don't remove this.

changeset 57	bb2d3e476f29
parent 55	2c54b51f39c4
child 64	1881ad52dc45