fix search date
authornicola <nicola@nicola-x910.(none)>
Tue, 2 Mar 2010 11:45:54 +0000 (12:45 +0100)
committernicola <nicola@nicola-x910.(none)>
Tue, 2 Mar 2010 11:45:54 +0000 (12:45 +0100)
dialogsearch.cpp

index 9a07bbe..c47a79e 100644 (file)
@@ -4,6 +4,10 @@
 #include <QMessageBox>
 #include "badgedata.h"
 #include <QDebug>
+#include <QLocale>
+#include <QtGui>
+
+
 
 DialogSearch::DialogSearch(QWidget *parent) :
     QDialog(parent)/*,
@@ -117,11 +121,20 @@ void DialogSearch::changeEvent(QEvent *e)
 QTime DialogSearch::totalHours(bool &ok)
 {
 
+
     if (this->exec() == QDialog::Accepted) {
         BadgeData data;
+        QLocale locale;
+        QString begin = pushButtonStart->valueText();
+        QString end = pushButtonEnd->valueText();
+
+        begin.replace(QString("  "), QString(" "));
+        end.replace(QString("  "), QString(" "));
+
         ok = true;
-        qDebug() << "S " << pushButtonStart->valueText() << " E " << pushButtonEnd->valueText() << endl;
-        return data.totalTime(QDate::fromString(pushButtonStart->valueText(), "yyyy-M-d"), QDate::fromString(pushButtonEnd->valueText(), "yyyy-M-d"));
+        //qDebug() << "FORM " << locale.dateFormat(QLocale::LongFormat) << endl;
+        //qDebug() << "STR " << pushButtonStart->valueText() << " DATE " << QDate::fromString(begin, "dddd d MMMM yyyy").toString() << endl;
+        return data.totalTime(QDate::fromString(begin, "dddd d MMMM yyyy"), QDate::fromString(end, "dddd d MMMM yyyy"));
     }
     ok = false;