summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorꦌ ꦫꦶ ꦏ꧀ꦦꦿ ꦧ ꦮ ꦑ ꦩ ꦭ꧀ <erik@darapsa.co.id>2019-10-01 17:30:07 +0800
committerꦌ ꦫꦶ ꦏ꧀ꦦꦿ ꦧ ꦮ ꦑ ꦩ ꦭ꧀ <erik@darapsa.co.id>2019-10-01 17:30:07 +0800
commit2255d58a5459a481743868070496ea76fe8b758b (patch)
tree81f824e560aa98a52ed6a4956a01ba4e162a5e65
parentd79cec3e7cdaf00f53c0d7c0c3c6b2f039a05a5d (diff)
Ticket history created time real data
-rw-r--r--TicketHistory.qml4
-rw-r--r--controller.cxx7
-rw-r--r--main.qml4
m---------qrtclient0
4 files changed, 8 insertions, 7 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
@@ -83,11 +83,12 @@ Controller::Controller(QObject* parent)
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
-Subproject 1a6909e02a93f5a72b234741403ad25f3da5048
+Subproject fbc2420e802b6fc522c8c440b18e74599cd69ca