Bugfix:

Certain events were not correctly displayed, namely those with
"starting minutes" larger than "ending minutes" (for example an event
starting at 07.30 and ending at 18.00) was displayed as ending at 18.30.

Also added more informative text for events in the weekview.
Events starting and ending on the same day is mentioned with start
and end time.
Events that span across multiple days is also mentioned with start
and end dates.

1 files changed, 15 insertions, 20 deletions

diff --git a/core/pim/datebook/datebookweek.cpp b/core/pim/datebook/datebookweek.cpp
index ddd41af..e30c776 100644
--- a/core/pim/datebook/datebookweek.cpp
+++ b/core/pim/datebook/datebookweek.cpp
@@ -97,206 +97,209 @@ void DateBookWeekView::initNames()
 	    header->addLabel( tr("W", "Wednesday" ) );
 	    header->addLabel( tr("T", "Thursday" ) );
 	    header->addLabel( tr("F", "Friday" ) );
 	    header->addLabel( tr("S", "Saturday" ) );
 	    header->addLabel( tr("S", "Sunday" ) );
 	} else {
 	    header->addLabel( tr("S", "Sunday" ) );
 	    header->addLabel( tr("M", "Monday") );
 	    header->addLabel( tr("T", "Tuesday") );
 	    header->addLabel( tr("W", "Wednesday" ) );
 	    header->addLabel( tr("T", "Thursday" ) );
 	    header->addLabel( tr("F", "Friday" ) );
 	    header->addLabel( tr("S", "Saturday" ) );
 	}
 	bFirst = false;
     } else {
 	// we are change things...
 	if ( bOnMonday ) {
 	    header->setLabel( 1, tr("M", "Monday") );
 	    header->setLabel( 2, tr("T", "Tuesday") );
 	    header->setLabel( 3, tr("W", "Wednesday" ) );
 	    header->setLabel( 4, tr("T", "Thursday" ) );
 	    header->setLabel( 5, tr("F", "Friday" ) );
 	    header->setLabel( 6, tr("S", "Saturday" ) );
 	    header->setLabel( 7, tr("S", "Sunday" ) );
 	} else {
 	    header->setLabel( 1, tr("S", "Sunday" ) );
 	    header->setLabel( 2, tr("M", "Monday") );
 	    header->setLabel( 3, tr("T", "Tuesday") );
 	    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();
 }
 
 void DateBookWeekView::moveToHour( int h )
 {
     int offset = h*rowHeight;
     setContentsPos( 0, offset );
 }
 
 void DateBookWeekView::keyPressEvent( QKeyEvent *e )
 {
     e->ignore();
 }
 
 void DateBookWeekView::slotChangeClock( bool c )
 {
     ampm = c;
     viewport()->update();
 }
 
 static inline int db_round30min( int m )
 {
     if ( m < 15 )
 	m = 0;
     else if ( m < 45 )
 	m = 1;
     else
 	m = 2;
 
     return m;
 }
 
 void DateBookWeekView::alterDay( int day )
 {
     if ( !bOnMonday ) {
 	    day--;
     }
     emit showDay( day );
 }
 
 void DateBookWeekView::positionItem( DateBookWeekItem *i )
 {
     const int Width = 8;
     const EffectiveEvent ev = i->event();
 
     // 30 minute intervals
     int y = ev.start().hour() * 2;
     y += db_round30min( ev.start().minute() );
+    int y2 = ev.end().hour() * 2;
+    y2 += db_round30min( ev.end().minute() );
     if ( y > 47 )
 	y = 47;
+    if ( y2 > 48 )
+        y2 = 48;
     y = y * rowHeight / 2;
+    y2 = y2 * rowHeight / 2;
 
     int h;
     if ( ev.event().type() == Event::AllDay ) {
-	h = 48;
+	h = 48 * rowHeight / 2;
 	y = 0;
     } else {
-	h = ( ev.end().hour() - ev.start().hour() ) * 2;
-	h += db_round30min( ev.end().minute() - ev.start().minute() );
+	h=y2-y;
 	if ( h < 1 ) h = 1;
     }
-    h = h * rowHeight / 2;
 
     int dow = ev.date().dayOfWeek();
     if ( !bOnMonday ) {
 	if ( dow == 7 )
 	    dow = 1;
 	else
 	    dow++;
     }
     int x = header->sectionPos( dow ) - 1;
     int xlim = header->sectionPos( dow ) + header->sectionSize( dow );
     DateBookWeekItem *isect = 0;
     do {
 	i->setGeometry( x, y, Width, h );
 	isect = intersects( i );
 	x += Width - 1;
     } while ( isect && x < xlim );
 }
 
 DateBookWeekItem *DateBookWeekView::intersects( const DateBookWeekItem *item )
 {
     QRect geom = item->geometry();
 
     // We allow the edges to overlap
     geom.moveBy( 1, 1 );
     geom.setSize( geom.size()-QSize(2,2) );
 
     QListIterator<DateBookWeekItem> it(items);
     for ( ; it.current(); ++it ) {
 	DateBookWeekItem *i = it.current();
 	if ( i != item ) {
 	    if ( i->geometry().intersects( geom ) ) {
 		return i;
 	    }
 	}
     }
 
     return 0;
 }
 
 void DateBookWeekView::contentsMousePressEvent( QMouseEvent *e )
 {
     QListIterator<DateBookWeekItem> it(items);
     for ( ; it.current(); ++it ) {
 	DateBookWeekItem *i = it.current();
 	if ( i->geometry().contains( e->pos() ) ) {
 	    showingEvent = true;
 	    emit signalShowEvent( i->event() );
 	    break;
 	}
     }
 }
 
 void DateBookWeekView::contentsMouseReleaseEvent( QMouseEvent *e )
 {
     if ( showingEvent ) {
 	showingEvent = false;
 	emit signalHideEvent();
     } else {
 	int d = header->sectionAt( e->pos().x() );
 	if ( d > 0 ) {
 // 	    if ( !bOnMonday )
 // 		d--;
 	    emit showDay( d );
 	}
     }
 }
 
 void DateBookWeekView::drawContents( QPainter *p, int cx, int cy, int cw, int ch )
 {
     QRect ur( cx, cy, cw, ch );
     p->setPen( lightGray );
     for ( int i = 1; i <= 7; i++ )
 	p->drawLine( header->sectionPos(i)-2, cy, header->sectionPos(i)-2, cy+ch );
 
     p->setPen( black );
     for ( int t = 0; t < 24; t++ ) {
 	int y = t*rowHeight;
 	if ( QRect( 1, y, 20, rowHeight ).intersects( ur ) ) {
 	    QString s;
 	    if ( ampm ) {
 		if ( t == 0 )
 		    s = QString::number( 12 );
 		else if ( t == 12 )
 		    s = QString::number(12) + tr( "p" );
 		else if ( t > 12 ) {
 		    if ( t - 12 < 10 )
 			s = " ";
 		    else
 			s = "";
 		    s += QString::number( t - 12 ) + tr("p");
 		} else {
 		    if ( 12 - t < 3 )
 			s = "";
 		    else
 			s = " ";
 		    s += QString::number( t );
@@ -375,209 +378,201 @@ DateBookWeek::DateBookWeek( bool ap, bool startOnMonday, DateBookDB *newDB,
     connect( tHide, SIGNAL( timeout() ),
              lblDesc, SLOT( hide() ) );
     connect( header->spinYear, SIGNAL(valueChanged(int)),
 	     this, SLOT(slotYearChanged(int)) );
     connect( qApp, SIGNAL(weekChanged(bool)),
 	     this, SLOT(slotWeekChanged(bool)) );
     connect( qApp, SIGNAL(clockChanged(bool)),
 	    this, SLOT(slotClockChanged(bool)));
     setDate(QDate::currentDate());
 
 }
 
 void DateBookWeek::keyPressEvent(QKeyEvent *e)
 {
     switch(e->key()) {
 	case Key_Up:
 	    view->scrollBy(0, -20);
 	    break;
 	case Key_Down:
 	    view->scrollBy(0, 20);
 	    break;
 	case Key_Left:
 	    setDate(date().addDays(-7));
 	    break;
 	case Key_Right:
 	    setDate(date().addDays(7));
 	    break;
 	default:
 	    e->ignore();
     }
 }
 
 void DateBookWeek::showDay( int day )
 {
     QDate d;
     d = dateFromWeek( _week, year, bStartOnMonday );
     day--;
     d = d.addDays( day );
     emit showDate( d.year(), d.month(), d.day() );
 }
 
 void DateBookWeek::setDate( int y, int m, int d )
 {
     QDate date;
     date.setYMD( y, m, d );
     setDate(QDate(y, m, d));
 }
 
 void DateBookWeek::setDate(QDate date)
 {
     dow = date.dayOfWeek();
     int w, y;
     calcWeek( date, w, y, bStartOnMonday );
     header->setDate( y, w );
 }
 
 void DateBookWeek::dateChanged( int y, int w )
 {
     year = y;
     _week = w;
     getEvents();
 }
 
 QDate DateBookWeek::date() const
 {
     QDate d;
     d = dateFromWeek( _week - 1, year, bStartOnMonday );
     if ( bStartOnMonday )
 	d = d.addDays( 7 + dow - 1 );
     else {
 	if ( dow == 7 )
 	    d = d.addDays( dow );
 	else
 	    d = d.addDays( 7 + dow );
     }
     return d;
 }
 
 void DateBookWeek::getEvents()
 {
     QDate startWeek = weekDate();
 
     QDate endWeek = startWeek.addDays( 6 );
     QValueList<EffectiveEvent> eventList = db->getEffectiveEvents(startWeek,
 								  endWeek);
     view->showEvents( eventList );
     view->moveToHour( startTime );
 }
 
 void DateBookWeek::generateAllDayTooltext( QString& text ) {
     text += "<b>" + tr("This is an all day event.") + "</b><br>";
 }
 
 void DateBookWeek::generateNormalTooltext( QString& str,
                                            const EffectiveEvent &ev ) {
     str += "<b>" + QObject::tr("Start") + "</b>: ";
-
-    if ( ev.startDate() != ev.date() ) {
-	// multi-day event.  Show start date
-	str += TimeString::longDateString( ev.startDate() );
-    } else {
-	// Show start time.
-	str += TimeString::timeString(ev.start(), ampm, FALSE );
+    str += TimeString::timeString( ev.event().start().time(), ampm, FALSE );
+    if( ev.startDate()!=ev.endDate() ) {
+        str += " <i>" + TimeString::longDateString( ev.startDate() )+"</i>";
     }
-
-
-    str += "<br><b>" + QObject::tr("End") + "</b>: ";
-    if ( ev.endDate() != ev.date() ) {
-        // multi-day event.  Show end date
-        str += TimeString::longDateString( ev.endDate() );
-    } else {
-        // Show end time.
-        str += TimeString::timeString( ev.end(), ampm, FALSE );
+    str += "<br>";
+    str += "<b>" + QObject::tr("End") + "</b>: ";
+    str += TimeString::timeString( ev.event().end().time(), ampm, FALSE );
+    if( ev.startDate()!=ev.endDate() ) {
+        str += " <i>" + TimeString::longDateString( ev.endDate() ) + "</i>";
     }
 }
 
 void DateBookWeek::slotShowEvent( const EffectiveEvent &ev )
 {
     if ( tHide->isActive() )
         tHide->stop();
 
     // why would someone use "<"?  Oh well, fix it up...
     // I wonder what other things may be messed up...
     QString strDesc = ev.description();
     int where = strDesc.find( "<" );
     while ( where != -1 ) {
 	strDesc.remove( where, 1 );
 	strDesc.insert( where, "&#60;" );
 	where = strDesc.find( "<", where );
     }
 
     QString strCat;
     // ### FIX later...
 //     QString strCat = ev.category();
 //     where = strCat.find( "<" );
 //     while ( where != -1 ) {
 // 	strCat.remove( where, 1 );
 // 	strCat.insert( where, "&#60;" );
 // 	where = strCat.find( "<", where );
 //     }
 
     QString strLocation = ev.location();
     while ( where != -1 ) {
 	strLocation.remove( where, 1 );
 	strLocation.insert( where, "&#60;" );
 	where = strLocation.find( "<", where );
     }
 
     QString strNote = ev.notes();
     where = strNote.find( "<" );
     while ( where != -1 ) {
 	strNote.remove( where, 1 );
 	strNote.insert( where, "&#60;" );
 	where = strNote.find( "<", where );
     }
 
     QString str = "<b>" + strDesc + "</b><br>"
                   + strLocation + "<br>"
                   + "<i>" + strCat + "</i>"
                   + "<br>" + TimeString::longDateString( ev.date() )
 	          + "<br>";
 
     if (ev.event().type() == Event::Normal )
         generateNormalTooltext( str, ev );
     else
         generateAllDayTooltext( str );
 
     str += "<br><br>" + strNote;
 
     lblDesc->setText( str );
     lblDesc->resize( lblDesc->sizeHint() );
     // move the label so it is "centerd" horizontally...
     lblDesc->move( QMAX(0,(width() - lblDesc->width()) / 2), 0 );
     lblDesc->show();
 }
 
 void DateBookWeek::slotHideEvent()
 {
     tHide->start( 2000, true );
 }
 
 void DateBookWeek::setStartViewTime( int startHere )
 {
     startTime = startHere;
     view->moveToHour( startTime );
 }
 
 int DateBookWeek::startViewTime() const
 {
     return startTime;
 }
 
 void DateBookWeek::redraw()
 {
     getEvents();
 }
 
 void DateBookWeek::slotYearChanged( int y )
 {
     int totWeek;
     QDate d( y, 12, 31 );
     int throwAway;
     calcWeek( d, totWeek, throwAway, bStartOnMonday );
     while ( totWeek == 1 ) {
 	d = d.addDays( -1 );
 	calcWeek( d, totWeek, throwAway, bStartOnMonday );
     }
     if ( totWeek != totalWeeks() )
 	setTotalWeeks( totWeek );