fix: NaN in eidt mode (#133)

* Feat: EventoEdit show NaN bugfix * fix bug --------- Co-authored-by: feipiao594 <feipiao.hpp@gamil.com>
NJUPT-SAST · Dec 9, 2023 · 47217cf · 47217cf
1 parent d881382
commit 47217cf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/qml/page/T_EventoEdit.qml b/qml/page/T_EventoEdit.qml
@@ -178,8 +178,7 @@ FluScrollablePage {
         FluCalendarPicker {
             id: clender_picker_event_start
             width: 220
-            current: EventoEditController.isEditMode ? Date.fromLocaleString(
-                                                           EventoEditController.eventStart) : new Date
+            current: EventoEditController.isEditMode ? new Date(EventoEditController.eventStart) : new Date
             anchors {
                 left: clender_picker_register_start.left
                 top: item_event_time.top
@@ -189,8 +188,7 @@ FluScrollablePage {
         FluTimePicker {
             id: time_picker_event_start
             hourFormat: FluTimePickerType.HH
-            current: EventoEditController.isEditMode ? Date.fromLocaleString(
-                                                           EventoEditController.eventStart) : new Date
+            current: EventoEditController.isEditMode ? new Date(EventoEditController.eventStart) : new Date
 
             anchors {
                 left: time_picker_register_start.left
@@ -212,8 +210,7 @@ FluScrollablePage {
         FluCalendarPicker {
             id: clender_picker_event_end
             width: 220
-            current: EventoEditController.isEditMode ? Date.fromLocaleString(
-                                                           EventoEditController.eventEnd) : new Date
+            current: EventoEditController.isEditMode ? new Date(EventoEditController.eventEnd) : new Date
             anchors {
                 left: clender_picker_register_start.left
                 top: text_end2.top
@@ -223,8 +220,7 @@ FluScrollablePage {
         FluTimePicker {
             id: time_picker_event_end
             hourFormat: FluTimePickerType.HH
-            current: EventoEditController.isEditMode ? Date.fromLocaleString(
-                                                           EventoEditController.eventEnd) : new Date
+            current: EventoEditController.isEditMode ? new Date(EventoEditController.eventEnd) : new Date
             anchors {
                 left: time_picker_register_start.left
                 top: text_end2.top
@@ -256,8 +252,7 @@ FluScrollablePage {
         FluCalendarPicker {
             id: clender_picker_register_start
             width: 220
-            current: EventoEditController.isEditMode ? Date.fromLocaleString(
-                                                           EventoEditController.registerStart) : new Date
+            current: EventoEditController.isEditMode ? new Date(EventoEditController.registerStart) : new Date
             anchors {
                 left: text_start1.right
                 leftMargin: 18
@@ -268,8 +263,7 @@ FluScrollablePage {
         FluTimePicker {
             id: time_picker_register_start
             hourFormat: FluTimePickerType.HH
-            current: EventoEditController.isEditMode ? Date.fromLocaleString(
-                                                           EventoEditController.registerStart) : new Date
+            current: EventoEditController.isEditMode ? new Date(EventoEditController.registerStart) : new Date
             anchors {
                 left: clender_picker_register_start.right
                 leftMargin: 15
@@ -291,8 +285,7 @@ FluScrollablePage {
         FluCalendarPicker {
             id: clender_picker_register_end
             width: 220
-            current: EventoEditController.isEditMode ? Date.fromLocaleString(
-                                                           EventoEditController.registerEnd) : new Date
+            current: EventoEditController.isEditMode ? new Date(EventoEditController.registerEnd) : new Date
             anchors {
                 left: clender_picker_register_start.left
                 top: text_end1.top
@@ -302,8 +295,7 @@ FluScrollablePage {
         FluTimePicker {
             id: time_picker_register_end
             hourFormat: FluTimePickerType.HH
-            current: EventoEditController.isEditMode ? Date.fromLocaleString(
-                                                           EventoEditController.registerEnd) : (new Date)
+            current: EventoEditController.isEditMode ? new Date(EventoEditController.registerEnd) : (new Date)
             anchors {
                 left: time_picker_register_start.left
                 top: text_end1.top
@@ -651,7 +643,7 @@ FluScrollablePage {
                 right: area3.right
             }
             onClicked: {
-                EventoEditController.index = combo_box_type.find(
+                EventoEditCoisEditModeller.index = combo_box_type.find(
                             combo_box_type.displayText)
                 if (rect_department.departmentIds.length === 0 || textbox_title.text === ""
                         || textbox_description.text === ""

diff --git a/src/controller/ui/evento_edit.cpp b/src/controller/ui/evento_edit.cpp
@@ -36,16 +36,22 @@ void EventoEditController::createEvento(const QString& title, const QString& des
 }
 
 void EventoEditController::update(const DTO_Evento& event) {
-    setProperty("eventStart", event.gmtEventStart.toString("yyyy年M月d日 hh:mm:ss"));
-    setProperty("eventEnd", event.gmtEventEnd.toString("yyyy年M月d日 hh:mm:ss"));
-    setProperty("registerStart", event.gmtRegistrationStart.toString("yyyy年M月d日 hh:mm:ss"));
-    setProperty("registerEnd", event.gmtRegistrationEnd.toString("yyyy年M月d日 hh:mm:ss"));
     QString departmentIds = u"["_qs;
     for (const auto& department : event.departments) {
         departmentIds += QString::number(department.id) + ",";
     }
     *(departmentIds.end() - 1) = u']';
-    setProperty("departmentIds", departmentIds);
+    QMetaObject::invokeMethod(
+        this,
+        [&]() {
+            setProperty("eventStart", event.gmtEventStart.toString("yyyy-MM-ddThh:mm:ss"));
+            setProperty("eventEnd", event.gmtEventEnd.toString("yyyy-MM-ddThh:mm:ss"));
+            setProperty("registerStart",
+                        event.gmtRegistrationStart.toString("yyyy-MM-ddThh:mm:ss"));
+            setProperty("registerEnd", event.gmtRegistrationEnd.toString("yyyy-MM-ddThh:mm:ss"));
+            setProperty("departmentIds", departmentIds);
+        },
+        Qt::BlockingQueuedConnection);
 }
 
 void EventoEditController::loadEditInfo() {