Bugfix: (bug #0000211) Events ending at mat the following day. Fix for dayview.

1 files changed, 4 insertions, 2 deletions

diff --git a/core/pim/datebook/datebookday.cpp b/core/pim/datebook/datebookday.cpp
index a6a1be3..42f026a 100644
--- a/core/pim/datebook/datebookday.cpp
+++ b/core/pim/datebook/datebookday.cpp
@@ -116,397 +116,399 @@ void DateBookDayView::moveDown()
 
 void DateBookDayView::paintCell( QPainter *p, int, int, const QRect &cr, bool )
 {
     int w = cr.width();
     int h = cr.height();
     p->fillRect( 0, 0, w, h, colorGroup().brush( QColorGroup::Base ) );
     if ( showGrid() ) {
 	// Draw our lines
 	int x2 = w - 1;
 	int y2 = h - 1;
 	QPen pen( p->pen() );
 	p->setPen( colorGroup().dark() );
 	p->drawLine( x2, 0, x2, y2 );
 	p->drawLine( 0, y2, x2, y2 );
 
 	p->setPen( colorGroup().midlight() );
 	p->drawLine( 0, y2 - h/2, x2, y2 - h/2);
 
 	p->setPen( pen );
     }
 }
 
 void DateBookDayView::paintFocus( QPainter *, const QRect & )
 {
 }
 
 
 void DateBookDayView::resizeEvent( QResizeEvent *e )
 {
     QTable::resizeEvent( e );
     columnWidthChanged( 0 );
     emit sigColWidthChanged();
 }
 
 void DateBookDayView::keyPressEvent( QKeyEvent *e )
 {
     QString txt = e->text();
     if ( !txt.isNull() && txt[0] > ' ' && e->key() < 0x1000 ) {
 	// we this is some sort of thing we know about...
 	e->accept();
 	emit sigCapturedKey( txt );
     } else {
 	// I don't know what this key is, do you?
 	e->ignore();
     }
 }
 
 void DateBookDayView::setRowStyle( int style )
 {
 	if (style<0) style = 0;
 
 	for (int i=0; i<numRows(); i++)
 		setRowHeight(i, style*10+20);
 }
 
 //===========================================================================
 
 DateBookDay::DateBookDay( bool ampm, bool startOnMonday,
 			  DateBookDB *newDb, QWidget *parent,
                           const char *name )
     : QVBox( parent, name ),
       currDate( QDate::currentDate() ),
       db( newDb ),
       startTime( 0 )
 {
     widgetList.setAutoDelete( true );
     header = new DateBookDayHeader( startOnMonday, this, "day header" );
     header->setDate( currDate.year(), currDate.month(), currDate.day() );
     view = new DateBookDayView( ampm, this, "day view" );
 
     connect( header, SIGNAL( dateChanged( int, int, int ) ),
              this, SLOT( dateChanged( int, int, int ) ) );
     connect( view, SIGNAL( sigColWidthChanged() ),
              this, SLOT( slotColWidthChanged() ) );
     connect( qApp, SIGNAL(weekChanged(bool)),
 	     this, SLOT(slotWeekChanged(bool)) );
     connect( view, SIGNAL(sigCapturedKey(const QString &)),
 	     this, SIGNAL(sigNewEvent(const QString&)) );
 
     QTimer *timer = new QTimer( this );
 
     connect( timer, SIGNAL(timeout()),
              this, SLOT(updateView()) );	//connect timer for updating timeMarker & daywidgetcolors
     timer->start( 1000*60*5, FALSE ); //update every 5min
 
     selectedWidget = 0;
 
     timeMarker =  new DateBookDayTimeMarker( this );
     timeMarker->setTime( QTime::currentTime() );
     rowStyle = -1; // initialize with bogus values
 }
 
 void DateBookDay::setJumpToCurTime( bool bJump )
 {
 	jumpToCurTime = bJump;
 }
 
 void DateBookDay::setRowStyle( int style )
 {
 	if (rowStyle != style) view->setRowStyle( style );
 	rowStyle = style;
 }
 
 void DateBookDay::updateView( void )
 {
 	timeMarker->setTime( QTime::currentTime() );
 	//need to find a way to update all DateBookDayWidgets
 }
 
 void DateBookDay::setSelectedWidget( DateBookDayWidget *w )
 {
 	selectedWidget = w;
 }
 
 DateBookDayWidget * DateBookDay::getSelectedWidget( void )
 {
 	return selectedWidget;
 }
 
 void DateBookDay::selectedDates( QDateTime &start, QDateTime &end )
 {
     start.setDate( currDate );
     end.setDate( currDate );
 
     int sh=99,eh=-1;
 
     int n = dayView()->numSelections();
 
     for (int i=0; i<n; i++) {
 	QTableSelection sel = dayView()->selection( i );
 	sh = QMIN(sh,sel.topRow());
 	eh = QMAX(sh,sel.bottomRow()+1);
     }
     if (sh > 23 || eh < 1) {
         sh=8;
         eh=9;
     }
 
     start.setTime( QTime( sh, 0, 0 ) );
     end.setTime( QTime( eh, 0, 0 ) );
 }
 
 void DateBookDay::setDate( int y, int m, int d )
 {
     header->setDate( y, m, d );
 
     selectedWidget = 0;
 }
 
 void DateBookDay::setDate( QDate d)
 {
     header->setDate( d.year(), d.month(), d.day() );
 
     selectedWidget = 0;
 }
 
 void DateBookDay::dateChanged( int y, int m, int d )
 {
     QDate date( y, m, d );
     if ( currDate == date )
 	return;
     currDate.setYMD( y, m, d );
     relayoutPage();
     dayView()->clearSelection();
     QTableSelection ts;
 
     if (jumpToCurTime && this->date() == QDate::currentDate())
     {
     	ts.init( QTime::currentTime().hour(), 0);
 	ts.expandTo( QTime::currentTime().hour(), 0);
     } else
     {
 	ts.init( startTime, 0 );
 	ts.expandTo( startTime, 0 );
     }
 
     dayView()->addSelection( ts );
 
     selectedWidget = 0;
 
 }
 
 void DateBookDay::redraw()
 {
     if ( isUpdatesEnabled() )
 	relayoutPage();
 }
 
 void DateBookDay::getEvents()
 {
     widgetList.clear();
 
-    QValueList<EffectiveEvent> eventList = db->getEffectiveEvents( currDate,
-								   currDate );
+	QValueList<EffectiveEvent> eventList = db->getEffectiveEvents( currDate, currDate );
     QValueListIterator<EffectiveEvent> it;
     for ( it = eventList.begin(); it != eventList.end(); ++it ) {
+		EffectiveEvent ev=*it;
+		if(!(ev.end().hour()==ev.start().hour() && ev.end().minute()==ev.start().minute())) {	// Skip effective events with no duration. (i.e ending at 00:00)
         DateBookDayWidget* w = new DateBookDayWidget( *it, this );
         connect( w, SIGNAL( deleteMe( const Event & ) ),
                  this, SIGNAL( removeEvent( const Event & ) ) );
         connect( w, SIGNAL( editMe( const Event & ) ),
                  this, SIGNAL( editEvent( const Event & ) ) );
         connect( w, SIGNAL( beamMe( const Event & ) ),
                  this, SIGNAL( beamEvent( const Event & ) ) );
         widgetList.append( w );
     }
+    }
 
 }
 
 static int place( const DateBookDayWidget *item, bool *used, int maxn )
 {
     int place = 0;
     int start = item->event().start().hour();
     QTime e = item->event().end();
     int end = e.hour();
     if ( e.minute() < 5 )
 	end--;
     if ( end < start )
 	end = start;
     while ( place < maxn ) {
 	bool free = TRUE;
 	int s = start;
 	while( s <= end ) {
 	    if ( used[10*s+place] ) {
 		free = FALSE;
 		break;
 	    }
 	    s++;
 	}
 	if ( free ) break;
 	place++;
     }
     if ( place == maxn ) {
 	return -1;
     }
     while( start <= end ) {
 	used[10*start+place] = TRUE;
 	start++;
     }
     return place;
 }
 
 
 void DateBookDay::relayoutPage( bool fromResize )
 {
     setUpdatesEnabled( FALSE );
     if ( !fromResize )
         getEvents();    // no need we already have them!
 
     widgetList.sort();
     //sorts the widgetList by the heights of the widget so that the tallest widgets are at the beginning
     //this is needed for the simple algo below to work correctly, otherwise some widgets would be drawn outside the view
 
     int wCount = widgetList.count();
     int wid = view->columnWidth(0)-1;
     int wd;
     int n = 1;
 
     QArray<int> anzIntersect(wCount); //this stores the number of maximal intersections of each widget
 
     for (int i = 0; i<wCount; anzIntersect[i] = 1, i++);
 
     if ( wCount < 20 ) {
 
 	QArray<QRect> geometries(wCount);
 	for (int i = 0; i < wCount; geometries[i] = widgetList.at(i)->geometry(), i++);	//stores geometry for each widget in vector
 
 	for ( int i = 0; i < wCount; i++)
 	{
 		QValueList<int> intersectedWidgets;
 
 		//find all widgets intersecting with widgetList.at(i)
 		for ( int j = 0; j < wCount; j++)
 			if (i != j)
 				if (geometries[j].intersects(geometries[i]))
 					intersectedWidgets.append(j);
 
 		//for each of these intersecting widgets find out how many widgets are they intersecting with
 		for ( uint j = 0; j < intersectedWidgets.count(); j++)
 		{
 			QArray<int> inter(wCount);
 			inter[j]=1;
 
 			if (intersectedWidgets[j] != -1)
 				for ( uint k = j; k < intersectedWidgets.count(); k++)
 					if (j != k && intersectedWidgets[k] != -1)
 						if (geometries[intersectedWidgets[k]].intersects(geometries[intersectedWidgets[j]]))
 						{
 							inter[j]++;
 							intersectedWidgets[k] = -1;
 						}
 			if (inter[j] > anzIntersect[i]) anzIntersect[i] = inter[j] + 1;
 		}
 
 		if (anzIntersect[i] == 1 && intersectedWidgets.count()) anzIntersect[i]++;
 	}
 
 
 	for ( int i = 0; i < wCount; i++) {
 	    DateBookDayWidget *w = widgetList.at(i);
 	    QRect geom = w->geometry();
 
 	    geom.setX( 0 );
 
 	    wd = (view->columnWidth(0)-1) / anzIntersect[i] - (anzIntersect[i]>1?2:0);
 
 	    geom.setWidth( wd );
 
 	    while ( intersects( w, geom ) ) {
 		geom.moveBy( wd + 2 + 1, 0 );
 	    }
 	    w->setGeometry( geom );
 	}
 
 	if (jumpToCurTime && this->date() == QDate::currentDate())
 		view->setContentsPos( 0, QTime::currentTime().hour() * view->rowHeight(0) ); //set listview to current hour
 	else
 		view->setContentsPos( 0, startTime * view->rowHeight(0) );
 
 
     } else {
 
 
 	int hours[24];
 	memset( hours, 0, 24*sizeof( int ) );
 	bool overFlow = FALSE;
 	for ( int i = 0; i < wCount; i++ ) {
 	    DateBookDayWidget *w = widgetList.at(i);
 	    int start = w->event().start().hour();
 	    QTime e = w->event().end();
 	    int end = e.hour();
 	    if ( e.minute() < 5 )
 		end--;
 	    if ( end < start )
 		end = start;
 	    while( start <= end ) {
 		hours[start]++;
 		if ( hours[start] >= 10 )
 		    overFlow = TRUE;
 		++start;
 	    }
 	    if ( overFlow )
 		break;
 	}
 	for ( int i = 0; i < 24; i++ ) {
 	    n = QMAX( n, hours[i] );
 	}
 	wid = ( view->columnWidth(0)-1 ) / n;
 
 	bool used[24*10];
 	memset( used, FALSE, 24*10*sizeof( bool ) );
 
 	for ( int i = 0; i < wCount; i++ ) {
 	    DateBookDayWidget *w = widgetList.at(i);
 	    int xp = place( w, used, n );
 	    if ( xp != -1 ) {
 		QRect geom = w->geometry();
 		geom.setX( xp*(wid+2) );
 		geom.setWidth( wid );
 		w->setGeometry( geom );
 	    }
 	}
 
 	if (jumpToCurTime && this->date() == QDate::currentDate())
 		view->setContentsPos( 0, QTime::currentTime().hour() * view->rowHeight(0) ); //set listview to current hour
 	else
 		view->setContentsPos( 0, startTime * view->rowHeight(0) );
     }
 
     timeMarker->setTime( QTime::currentTime() );	//display timeMarker
     timeMarker->raise();				//on top of all widgets
      if (this->date() == QDate::currentDate())		//only show timeMarker on current day
     	timeMarker->show(); else timeMarker->hide();
 
     setUpdatesEnabled( TRUE );
     return;
 }
 
 DateBookDayWidget *DateBookDay::intersects( const DateBookDayWidget *item, const QRect &geom )
 {
     int i = 0;
     DateBookDayWidget *w = widgetList.at(i);
     int wCount = widgetList.count();
     while ( i < wCount && w != item ) {
 	if ( w->geometry().intersects( geom ) ) {
 	    return w;
 	}
 	w = widgetList.at(++i);
     }
 
     return 0;
 }
 
 
 QDate DateBookDay::date() const
 {
     return currDate;
 }