| -rw-r--r-- | core/pim/datebook/holiday/birthday/birthday.cpp | 90 | ||||
| -rw-r--r-- | core/pim/datebook/holiday/birthday/birthday.h | 2 | ||||
| -rw-r--r-- | core/pim/datebook/holiday/christian/chrisholiday.cpp | 50 | ||||
| -rw-r--r-- | core/pim/datebook/holiday/christian/chrisholiday.h | 2 |
4 files changed, 142 insertions, 2 deletions
diff --git a/core/pim/datebook/holiday/birthday/birthday.cpp b/core/pim/datebook/holiday/birthday/birthday.cpp index 98e2d40..74bcf8b 100644 --- a/core/pim/datebook/holiday/birthday/birthday.cpp +++ b/core/pim/datebook/holiday/birthday/birthday.cpp @@ -3,2 +3,3 @@ #include <opie2/ocontactaccess.h> +#include <qpe/event.h> @@ -64,5 +65,92 @@ QStringList Birthday::entries(unsigned year, unsigned month, unsigned day) -QMap<QDate,QStringList> Birthday::entries(const QDate&,const QDate&) +QMap<QDate,QString> Birthday::_entries(const QDate&start,const QDate&end,bool anniversary) +{ + QMap<QDate,QString> ret; + QDate s = (start<end?start:end); + QDate e = (start<end?end:start); + + int daysto = start.daysTo(end); + if (daysto < 0) { + daysto = end.daysTo(start); + } + if ( m_contactdb->hasQuerySettings(Opie::OPimContactAccess::DateDiff ) ){ + Opie::OPimContact querybirthdays; + QString pre; + if (anniversary) { + querybirthdays.setAnniversary(e); + } else { + querybirthdays.setBirthday(e); + } + QMap<QDate,QString> collector; + QMap<QDate,QString>::ConstIterator sit; + m_list = m_contactdb->queryByExample( querybirthdays,Opie::OPimContactAccess::DateDiff,s); + QDate t; + if ( m_list.count() > 0 ){ + if (anniversary) { + pre = QObject::tr("Anniversary","holidays"); + } else { + pre = QObject::tr("Birthday","holidays"); + } + for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) { + if (!anniversary) { + t.setYMD(e.year(),(*m_it).birthday().month(),(*m_it).birthday().day()); + } else { + t.setYMD(e.year(),(*m_it).anniversary().month(),(*m_it).anniversary().day()); + } + if (ret[t].isEmpty()) { + ret[t]=pre; + } + ret[t]+=" "+(*m_it).fullName(); + } + } + } + return ret; +} + +QMap<QDate,QStringList> Birthday::entries(const QDate&start,const QDate&end) { QMap<QDate,QStringList> ret; + QMap<QDate,QString> collector; + QMap<QDate,QString>::ConstIterator sit; + + collector = _entries(start,end,false); + for (sit=collector.begin();sit!=collector.end();++sit) { + ret[sit.key()].append(sit.data()); + } + collector = _entries(start,end,true); + for (sit=collector.begin();sit!=collector.end();++sit) { + ret[sit.key()].append(sit.data()); + } + return ret; +} + +QValueList<EffectiveEvent> Birthday::events(const QDate&start,const QDate&end) +{ + QValueList<EffectiveEvent> ret; + QMap<QDate,QString> collector; + QMap<QDate,QString>::ConstIterator sit; + + collector = _entries(start,end,false); + + for (sit=collector.begin();sit!=collector.end();++sit) { + Event ev; + ev.setAllDay(true); + ev.setStart(sit.key()); + ev.setEnd(sit.key()); + ev.setDescription(sit.data()); + odebug << sit.key() << oendl; + ret.append(EffectiveEvent(ev,sit.key())); + } + + collector = _entries(start,end,true); + + for (sit=collector.begin();sit!=collector.end();++sit) { + Event ev; + ev.setAllDay(true); + ev.setStart(sit.key()); + ev.setEnd(sit.key()); + ev.setDescription(sit.data()); + odebug << sit.key() << oendl; + ret.append(EffectiveEvent(ev,sit.key())); + } return ret; diff --git a/core/pim/datebook/holiday/birthday/birthday.h b/core/pim/datebook/holiday/birthday/birthday.h index 5c9aacd..c308dd0 100644 --- a/core/pim/datebook/holiday/birthday/birthday.h +++ b/core/pim/datebook/holiday/birthday/birthday.h @@ -21,2 +21,3 @@ public: virtual QMap<QDate,QStringList> entries(const QDate&,const QDate&); + virtual QValueList<EffectiveEvent> events(const QDate&,const QDate&); protected: @@ -25,2 +26,3 @@ protected: Opie::OPimContactAccess::List::Iterator m_it; + virtual QMap<QDate,QString> _entries(const QDate&,const QDate&,bool anniversary); }; diff --git a/core/pim/datebook/holiday/christian/chrisholiday.cpp b/core/pim/datebook/holiday/christian/chrisholiday.cpp index ef6516e..f8e310f 100644 --- a/core/pim/datebook/holiday/christian/chrisholiday.cpp +++ b/core/pim/datebook/holiday/christian/chrisholiday.cpp @@ -3,2 +3,3 @@ #include <qobject.h> +#include <qpe/event.h> @@ -89,5 +90,52 @@ void ChrisHoliday::calc_easter() -QMap<QDate,QStringList> ChrisHoliday::entries(const QDate&,const QDate&) +QMap<QDate,QStringList> ChrisHoliday::entries(const QDate&start,const QDate&end) { QMap<QDate,QStringList> ret; + if (start==end) { + ret[start]=entries(start); + return ret; + } + QDate d; + int daysto; + if (end < start) { + d = end; + daysto = end.daysTo(start); + } else { + d = start; + daysto = start.daysTo(end); + } + QStringList temp; + for (int i=0;i<daysto;++i) { + temp = entries(d.addDays(i)); + if (temp.count()==0) continue; + ret[d.addDays(i)]+=temp; + temp.clear(); + } + return ret; +} + +QValueList<EffectiveEvent> ChrisHoliday::events(const QDate&start,const QDate&end) +{ + QValueList<EffectiveEvent> ret; + QDate d = (start<end?start:end); + int daysto = start.daysTo(end); + if (daysto < 0) { + daysto = end.daysTo(start); + } + + QStringList temp; + for (int i =0; i<daysto;++i) { + temp = entries(d.addDays(i)); + if (temp.count()==0) { + continue; + } + for (unsigned j=0;j<temp.count();++j) { + Event ev; + ev.setDescription(temp[j]); + ev.setStart(d.addDays(i)); + ev.setAllDay(true); + ret.append(EffectiveEvent(ev,d.addDays(i))); + } + } + return ret; diff --git a/core/pim/datebook/holiday/christian/chrisholiday.h b/core/pim/datebook/holiday/christian/chrisholiday.h index 9ae500e..1ecb813 100644 --- a/core/pim/datebook/holiday/christian/chrisholiday.h +++ b/core/pim/datebook/holiday/christian/chrisholiday.h @@ -22,2 +22,4 @@ public: virtual QMap<QDate,QStringList> entries(const QDate&,const QDate&); + virtual QValueList<EffectiveEvent> events(const QDate&,const QDate&); + protected: |