beta

diff --git a/dialogsearch.cpp b/dialogsearch.cpp
index 1c91603..23a9b91 100644 (file)
--- a/dialogsearch.cpp
+++ b/dialogsearch.cpp
@@ -2,12 +2,15 @@
 #include "ui_dialogsearch.h"
 #include "dialogcalendar.h"
 #include <QMessageBox>
+#include "badgedata.h"
 
 DialogSearch::DialogSearch(QWidget *parent) :
     QDialog(parent),
     ui(new Ui::DialogSearch)
 {
     ui->setupUi(this);
+    //move(, 0);
+    //showMaximized();
 }
 
 DialogSearch::~DialogSearch()
@@ -39,21 +42,24 @@ void DialogSearch::end()
     ui->dateEditEnd->setDate(cal.getDate(ui->dateEditEnd->date()));
 }
 
-int DialogSearch::totalHours()
+QTime DialogSearch::totalHours(bool &ok)
 {
-    if (this->exec() == QDialog::Accepted) {
 
+    if (this->exec() == QDialog::Accepted) {
+        BadgeData data;
+        ok = true;
+        return data.totalTime(ui->dateEditStart->date(), ui->dateEditEnd->date());
     }
+    ok = false;
 
 
-
-    return 0;
+    return QTime(0, 0, 0, 0);
 }
 
 void DialogSearch::accept()
 {
     if (ui->dateEditEnd->date() < ui->dateEditStart->date()) {
-        int ret = QMessageBox::warning(this, tr("Badge"),
+        QMessageBox::warning(this, tr("Badge"),
                                         tr("End date must to be major or equal of start date.\n"));
     }
     else