fix time

diff --git a/dialogday.cpp b/dialogday.cpp
index 2437305..13ad4a8 100644 (file)
--- a/dialogday.cpp
+++ b/dialogday.cpp
@@ -181,24 +181,29 @@ void DialogDay::enableSecond(bool enable)
 
 TimeTable DialogDay::getTimes(TimeTable timetable)
 {
+    qDebug () << "ENT " << timetable.entrance.toString("hh:mm") << endl;
+    timeEditEntrance->setValueText(timetable.entrance.toString("hh:mm") + ":00");
+    timeEditExit->setValueText(timetable.exit.toString("hh:mm") + ":00");
+    timeEditFBegin->setValueText(timetable.firstPause.toString("hh:mm") + ":00" );
+    timeEditEndF->setValueText(timetable.endFirstPause.toString("hh:mm") + ":00" );
+    timeEditSBegin->setValueText(timetable.secondPause.toString("hh:mm") + ":00");
+    timeEditEndS->setValueText(timetable.endSecondPause.toString("hh:mm") + ":00");
 
-    timeEditEntrance->setValueText(timetable.entrance.toString("hh:m"));
-    timeEditExit->setValueText(timetable.exit.toString("hh:m"));
     checkBoxFirst->setChecked(false);
     checkBoxSecond->setChecked(false);
 
     if (timetable.firstPause != timetable.endFirstPause) {
         checkBoxFirst->setChecked(true);
-        timeEditFBegin->setValueText(timetable.firstPause.toString("hh:m"));
+        timeEditFBegin->setValueText(timetable.firstPause.toString("hh:mm") + ":00");
         timeEditFBegin->setEnabled(true);
-        timeEditEndF->setValueText(timetable.endFirstPause.toString("hh:m"));
+        timeEditEndF->setValueText(timetable.endFirstPause.toString("hh:mm") + ":00");
         timeEditEndF->setEnabled(true);
     }
     if (timetable.secondPause != timetable.endSecondPause) {
         checkBoxSecond->setChecked(true);
-        timeEditSBegin->setValueText(timetable.secondPause.toString("hh:m"));
+        timeEditSBegin->setValueText(timetable.secondPause.toString("hh:mm") + ":00");
         timeEditSBegin->setEnabled(true);
-        timeEditEndS->setValueText(timetable.endSecondPause.toString("hh:m"));
+        timeEditEndS->setValueText(timetable.endSecondPause.toString("hh:mm") + ":00");
         timeEditEndS->setEnabled(true);
     }
 
@@ -206,16 +211,16 @@ TimeTable DialogDay::getTimes(TimeTable timetable)
     if (this->exec() == QDialog::Accepted) {
 
 
-        timetable.entrance =  QTime::fromString(timeEditEntrance->valueText(), "hh:m");
-        timetable.exit =  QTime::fromString(timeEditExit->valueText(), "hh:m");
+        timetable.entrance =  QTime::fromString(timeEditEntrance->valueText(), "hh:mm:ss");
+        timetable.exit =  QTime::fromString(timeEditExit->valueText(), "hh:mm:ss");
         if (checkBoxFirst->isChecked()) {
 
-            timetable.firstPause = QTime::fromString(timeEditFBegin->valueText(), "hh:m");
-            timetable.endFirstPause = QTime::fromString(timeEditEndF->valueText(), "hh:m");
+            timetable.firstPause = QTime::fromString(timeEditFBegin->valueText(), "hh:mm:ss");
+            timetable.endFirstPause = QTime::fromString(timeEditEndF->valueText(), "hh:mm:ss");
         }
         if (checkBoxSecond->isChecked()) {
-            timetable.secondPause = QTime::fromString(timeEditSBegin->valueText(), "hh:m");
-            timetable.endSecondPause = QTime::fromString(timeEditEndS->valueText(), "hh:m");
+            timetable.secondPause = QTime::fromString(timeEditSBegin->valueText(), "hh:mm:ss");
+            timetable.endSecondPause = QTime::fromString(timeEditEndS->valueText(), "hh:mm:ss");
         }
         return timetable;
     }