Bugfix: (bug #0000211) Events ending at midnight shouldn't be displayed at the following day. Fix for weekview.

1 files changed, 10 insertions, 8 deletions

diff --git a/core/pim/datebook/datebookweek.cpp b/core/pim/datebook/datebookweek.cpp
index e30c776..5bbf86a 100644
--- a/core/pim/datebook/datebookweek.cpp
+++ b/core/pim/datebook/datebookweek.cpp
@@ -126,32 +126,34 @@ void DateBookWeekView::initNames()
 	    header->setLabel( 4, tr("W", "Wednesday" ) );
 	    header->setLabel( 5, tr("T", "Thursday" ) );
 	    header->setLabel( 6, tr("F", "Friday" ) );
 	    header->setLabel( 7, tr("S", "Saturday" ) );
 	}
     }
 }
 
 
 
 void DateBookWeekView::showEvents( QValueList<EffectiveEvent> &ev )
 {
-    items.clear();
-    QValueListIterator<EffectiveEvent> it;
-    for ( it = ev.begin(); it != ev.end(); ++it ) {
-	DateBookWeekItem *i = new DateBookWeekItem( *it );
-	positionItem( i );
-	items.append( i );
-    }
-    viewport()->update();
+	items.clear();
+	QValueListIterator<EffectiveEvent> it;
+	for ( it = ev.begin(); it != ev.end(); ++it ) {
+		DateBookWeekItem *i = new DateBookWeekItem( *it );
+		if(!(i->event().end().hour()==i->event().start().hour() && i->event().end().minute()==i->event().start().minute())) {	// Skip effective events with no duration. (i.e ending at 00:00)
+			positionItem( i );
+			items.append( i );
+		}
+	}
+	viewport()->update();
 }
 
 void DateBookWeekView::moveToHour( int h )
 {
     int offset = h*rowHeight;
     setContentsPos( 0, offset );
 }
 
 void DateBookWeekView::keyPressEvent( QKeyEvent *e )
 {
     e->ignore();
 }