src/Domain/Configuration/ConnectionSettings.h \
src/Domain/Configuration/StartupSettings.h \
src/Domain/Configuration/DisplaySettings.h \
+ src/Domain/Configuration/DateTimeSettings.h \
src/Domain/Configuration/Configuration.h \
src/IO/Communication/MessagingUtils.h \
src/IO/Communication/Communication.h \
src/Domain/Configuration/ConnectionSettings.cpp \
src/Domain/Configuration/StartupSettings.cpp \
src/Domain/Configuration/DisplaySettings.cpp \
+ src/Domain/Configuration/DateTimeSettings.cpp \
src/Domain/Configuration/Configuration.cpp \
src/IO/Communication/MessagingUtils.cpp \
src/IO/Communication/Communication.cpp \
#include "ConnectionSettings.h"
#include "StartupSettings.h"
#include "DisplaySettings.h"
+#include "DateTimeSettings.h"
#include "Room.h"
#include <QDomDocument>
#include <QDomElement>
if ( tagName == QString( "dayofweek" ) )
{
- QDomText t = node.ownerDocument().createTextNode( iDateTimeSettings->iDayOfWeek);
+ QDomText t = node.ownerDocument().createTextNode( iDateTimeSettings->dayOfWeek());
e.replaceChild( t, e.firstChild() );
}
else if( tagName == QString( "StandardTimeChangeMoment" ) )
{
- QDomText t = node.ownerDocument().createTextNode( iDateTimeSettings->iStandardTimeChangeMoment.toString("dd.MM.yyyy hh:mm:ss"));
+ QDomText t = node.ownerDocument().createTextNode( iDateTimeSettings->standardTimeChange().toString("ddMMyyyyhhmmss"));
e.replaceChild( t, e.firstChild() );
}
else if( tagName == QString( "DaylightSaveTimeChangeMoment" ) )
{
- QDomText t = node.ownerDocument().createTextNode( iDateTimeSettings->iDaylightSaveTimeChangeMoment.toString("dd.MM.yyyy hh:mm:ss"));
+ QDomText t = node.ownerDocument().createTextNode( iDateTimeSettings->daylightSaveTimeChange().toString("ddMMyyyyhhmmss"));
e.replaceChild( t, e.firstChild() );
}
}
QDateTime daylightSaveTimeChangeMoment;
QString dayOfWeek;
+ // Defaults
+ //standardTimeChangeMoment.fromString("05102009040000", "ddMMyyyyhhmmss");
+ //daylightSaveTimeChangeMoment.fromString("01042010030000", "ddMMyyyyhhmmss");
+ //dayOfWeek.append("sunday");
+
for ( QDomNode node = aXML.firstChild(); !node.isNull(); node = node.nextSibling() )
{
QDomElement e = node.toElement();
if ( tagName == QString( "dayofweek" ) )
{
dayOfWeek = e.text();
+ qDebug() << "Configuration::readDateTimeSettings: " +e.text();
}
- else if( tagName == QString( "StandardTimeChangeMoment" ) )
+ else if( tagName == QString( "standardtimechangemoment" ) )
{
- standardTimeChangeMoment.fromString(e.text(), "dd.MM.yyyy hh:mm:ss");
+ standardTimeChangeMoment = QDateTime::fromString(e.text(), "ddMMyyyyhhmmss");
+ qDebug() << "Configuration::readDateTimeSettings: " +standardTimeChangeMoment.toString("ddMMyyyyhhmmss");
}
- else if( tagName == QString( "DaylightSaveTimeChangeMoment" ) )
+ else if( tagName == QString( "daylightsavetimechangemoment" ) )
{
- daylightSaveTimeChangeMoment.fromString(e.text(), "dd.MM.yyyy hh:mm:ss");
+ daylightSaveTimeChangeMoment = QDateTime::fromString(e.text(), "ddMMyyyyhhmmss");
+ qDebug() << "Configuration::readDateTimeSettings: " +daylightSaveTimeChangeMoment.toString("ddMMyyyyhhmmss");
}
}
#include "DateTimeSettings.h"
+#include <QtDebug>
DateTimeSettings::DateTimeSettings(const QDateTime &aStandardTimeChange, const QDateTime &aDaylightTimeChange, const QString aDayOfWeek)
{
QString DateTimeSettings::standardTimeChange_Time()
{
QTime time = this->iStandardTimeChangeMoment.time();
+
+ qDebug() << "DateTimeSettings::standardTimeChange_Time: "
+ +time.toString("hh:mm:ss");
+
return (time.toString("hh:mm:ss"));
}
QString DateTimeSettings::standardTimeChange_Month()
{
QDate date = this->iStandardTimeChangeMoment.date();
- return (date.toString("MM"));
+
+ qDebug() << "DateTimeSettings::standardTimeChange_Month: "
+ +date.toString("MM");
+
+ return (date.toString("M"));
}
QString DateTimeSettings::standardTimeChange_Day()
{
QDate date = this->iStandardTimeChangeMoment.date();
- return (date.toString("dd"));
+
+ qDebug() << "DateTimeSettings::standardTimeChange_Day: "
+ +date.toString("dd");
+
+ return (date.toString("d"));
}
QString DateTimeSettings::daylightSaveTimeChange_Time()
{
QTime time = this->iDaylightSaveTimeChangeMoment.time();
+
+ qDebug() << "DateTimeSettings::daylightSaveTimeChange_Time: "
+ +time.toString("hh:mm:ss");
+
return (time.toString("hh:mm:ss"));
}
QString DateTimeSettings::daylightSaveTimeChange_Month()
{
QDate date = this->iDaylightSaveTimeChangeMoment.date();
- return (date.toString("MM"));
+
+ qDebug() << "DateTimeSettings::daylightSaveTimeChange_Month: "
+ +date.toString("MM");
+
+ return (date.toString("M"));
}
QString DateTimeSettings::daylightSaveTimeChange_Day()
{
QDate date = this->iDaylightSaveTimeChangeMoment.date();
- return (date.toString("dd"));
+
+ qDebug() << "DateTimeSettings::daylightSaveTimeChange_Day: "
+ +date.toString("dd");
+
+ return (date.toString("d"));
}
void DateTimeSettings::setDaylightSaveTimeChange(const QDateTime &aDaylightSaveTimeChange)
{
this->iDaylightSaveTimeChangeMoment = aDaylightSaveTimeChange;
+ qDebug() << "DateTimeSettings::setDaylightSaveTimeChange: "
+ +this->iDaylightSaveTimeChangeMoment.toString("ddMMyyyyhhmmss");
}
void DateTimeSettings::setStandardTimeChange(const QDateTime &aStandardTimeChange)
{
this->iStandardTimeChangeMoment = aStandardTimeChange;
+ qDebug() << "DateTimeSettings::setStandardTimeChange: "
+ +this->iStandardTimeChangeMoment.toString("ddMMyyyyhhmmss");
}
void DateTimeSettings::setDayOfWeek(const QString aDay)
{
this->iDayOfWeek = aDay;
+ qDebug() << "DateTimeSettings::setDayOfWeek: "
+ +this->iDayOfWeek;
}
QString DateTimeSettings::dayOfWeek()
{
- return(this->iDayOfWeek);
+
+ qDebug() << "DateTimeSettings::dayOfWeek: " +this->iDayOfWeek;
+
+ return (this->iDayOfWeek);
}
#include "MessagingUtils.h"
#include "Meeting.h"
#include "Configuration.h"
+#include "DateTimeSettings.h"
/*
* BaseMessage class functions
qDebug( "ReqMsgGetUserAvailability::setTimeZone - offset in minutes=%d", offsetMinutes );
#endif
- //TODO: timezone and daylight times to application configuration
+ DateTimeSettings *dateTimeSettings = Configuration::instance()->dateTimeSettings();
+
setNodeValue( QString( "Bias" ), QString::number( -offsetMinutes ), QDomNode::ElementNode, QString( "TimeZone" ) );
setNodeValue( QString( "Bias" ), QString::number( 0 ), QDomNode::ElementNode, QString( "StandardTime" ) );
- setNodeValue( QString( "Time" ), QString( "03:00:00" ), QDomNode::ElementNode, QString( "StandardTime" ) );
- setNodeValue( QString( "DayOrder" ), QString::number( 5 ), QDomNode::ElementNode, QString( "StandardTime" ) );
- setNodeValue( QString( "Month" ), QString::number( 10 ), QDomNode::ElementNode, QString( "StandardTime" ) );
- setNodeValue( QString( "DayOfWeek" ), QString( "Sunday" ), QDomNode::ElementNode, QString( "StandardTime" ) );
+ setNodeValue( QString( "Time" ), dateTimeSettings->standardTimeChange_Time(), QDomNode::ElementNode, QString( "StandardTime" ) );
+ setNodeValue( QString( "DayOrder" ), dateTimeSettings->standardTimeChange_Day(), QDomNode::ElementNode, QString( "StandardTime" ) );
+ setNodeValue( QString( "Month" ), dateTimeSettings->standardTimeChange_Month(), QDomNode::ElementNode, QString( "StandardTime" ) );
+ setNodeValue( QString( "DayOfWeek" ), dateTimeSettings->dayOfWeek(), QDomNode::ElementNode, QString( "StandardTime" ) );
setNodeValue( QString( "Bias" ), QString::number( -60 ), QDomNode::ElementNode, QString( "DaylightTime" ) );
- setNodeValue( QString( "Time" ), QString( "03:00:00" ), QDomNode::ElementNode, QString( "DaylightTime" ) );
- setNodeValue( QString( "DayOrder" ), QString::number( 1 ), QDomNode::ElementNode, QString( "DaylightTime" ) );
- setNodeValue( QString( "Month" ), QString::number( 4 ), QDomNode::ElementNode, QString( "DaylightTime" ) );
- setNodeValue( QString( "DayOfWeek" ), QString( "Sunday" ), QDomNode::ElementNode, QString( "DaylightTime" ) );
+ setNodeValue( QString( "Time" ), dateTimeSettings->daylightSaveTimeChange_Time(), QDomNode::ElementNode, QString( "DaylightTime" ) );
+ setNodeValue( QString( "DayOrder" ), dateTimeSettings->daylightSaveTimeChange_Day(), QDomNode::ElementNode, QString( "DaylightTime" ) );
+ setNodeValue( QString( "Month" ), dateTimeSettings->daylightSaveTimeChange_Month(), QDomNode::ElementNode, QString( "DaylightTime" ) );
+ setNodeValue( QString( "DayOfWeek" ), dateTimeSettings->dayOfWeek(), QDomNode::ElementNode, QString( "DaylightTime" ) );
#ifdef MU_DEBUG
qDebug( "ReqMsgGetUserAvailability::setTimeZone end : err=%d", err );