From 2255d58a5459a481743868070496ea76fe8b758b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Tue, 1 Oct 2019 17:30:07 +0800 Subject: Ticket history created time real data --- TicketHistory.qml | 4 ++-- controller.cxx | 7 ++++--- main.qml | 4 ++-- qrtclient | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/TicketHistory.qml b/TicketHistory.qml index 7fe07a5..8970da1 100644 --- a/TicketHistory.qml +++ b/TicketHistory.qml @@ -5,9 +5,9 @@ import "larva/features" TaskDetailForm { property string subject - property string description property string content property string creator + property string created backButton.onClicked: pageView.pop() @@ -28,7 +28,6 @@ TaskDetailForm { anchors.leftMargin: 0 ticketSubject.text: subject ticketCreator.text: creator - ticketCreatedText.text: description } Label { @@ -53,6 +52,7 @@ TaskDetailForm { anchors.topMargin: 8 creatorText.text: creator ticketDescription.text: content + ticketDate.text: created } } } diff --git a/controller.cxx b/controller.cxx index 5c59906..e7395d3 100644 --- a/controller.cxx +++ b/controller.cxx @@ -82,12 +82,13 @@ Controller::Controller(QObject* parent) auto history = list->histories[list->length - 1]; QMetaObject::invokeMethod(appWindow, "ticketHistory" , Q_ARG(QVariant, m_ticketSubject) - , Q_ARG(QVariant - , QString{history->description}) , Q_ARG(QVariant , QString{history->content}) , Q_ARG(QVariant - , QString{history->creator})); + , QString{history->creator}) + , Q_ARG(QVariant + , QString{asctime(history + ->created)})); }); connect(appWindow, SIGNAL(ticketNew(QString, QString)) diff --git a/main.qml b/main.qml index 26010e2..9412cb4 100644 --- a/main.qml +++ b/main.qml @@ -7,12 +7,12 @@ ApplicationWindow { signal ticketId(int id) signal ticketSubject(string subject) signal ticketNew(string queue, string requestor) - function ticketHistory(subject, description, content, creator) { + function ticketHistory(subject, content, creator, created) { pageView.push("TicketHistory.qml", { "subject": subject - , "description": description , "content": content , "creator": creator + , "created": created }) } diff --git a/qrtclient b/qrtclient index 1a6909e..fbc2420 160000 --- a/qrtclient +++ b/qrtclient @@ -1 +1 @@ -Subproject commit 1a6909e02a93f5a72b234741403ad25f3da50489 +Subproject commit fbc2420e802b6fc522c8c440b18e74599cd69ca0 -- cgit v1.2.3