From edf7edbfc93071e90b001f36b730e31cb027a54f Mon Sep 17 00:00:00 2001 From: ꦌ ꦫꦶ ꦏ꧀ꦦꦿ ꦧ ꦮ ꦑ ꦩ ꦭ꧀ Date: Wed, 25 Sep 2019 16:25:02 +0800 Subject: Ticket ID class member --- qrtclient/ticket.hxx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'qrtclient') diff --git a/qrtclient/ticket.hxx b/qrtclient/ticket.hxx index 2ad8008..26e5643 100644 --- a/qrtclient/ticket.hxx +++ b/qrtclient/ticket.hxx @@ -2,6 +2,7 @@ #define QRTCLIENT_TICKET_HXX #include +#include struct rtclient_ticketlist; @@ -10,10 +11,15 @@ namespace RTClient { class Ticket { public: - Ticket(QString subject) : m_subject{subject} {} + Ticket(rtclient_ticket* ticket) + : m_id{ticket->id} + , m_subject{ticket->subject} + {} + unsigned int id() const { return m_id; } QString const& subject() const { return m_subject; } private: + unsigned int m_id; QString m_subject; }; @@ -24,7 +30,8 @@ namespace RTClient { public: enum TicketRoles { - SubjectRole = Qt::UserRole + 1, + IdRole = Qt::UserRole + 1, + SubjectRole }; explicit TicketList(QObject* parent = nullptr) -- cgit v1.3 From e97f17a6cb95fb8a10a40ce6b94fc3ab591747c0 Mon Sep 17 00:00:00 2001 From: ꦌ ꦫꦶ ꦏ꧀ꦦꦿ ꦧ ꦮ ꦑ ꦩ ꦭ꧀ Date: Wed, 25 Sep 2019 17:05:14 +0800 Subject: Ticket history function --- client.cxx | 5 +++++ librtclient | 2 +- qrtclient/client.hxx | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'qrtclient') diff --git a/client.cxx b/client.cxx index 1e34666..fab3195 100644 --- a/client.cxx +++ b/client.cxx @@ -120,6 +120,11 @@ namespace RTClient { emit ticketSearched(ticketList); } + void Client::ticketHistory(int id) + { + rtclient_ticket_history(id); + } + Client::~Client() { rtclient_cleanup(); diff --git a/librtclient b/librtclient index e39fa22..63bf675 160000 --- a/librtclient +++ b/librtclient @@ -1 +1 @@ -Subproject commit e39fa22f6896b7b7200229ffba95c56074a17535 +Subproject commit 63bf675b212affab4960b26324288b2fc2b57b21 diff --git a/qrtclient/client.hxx b/qrtclient/client.hxx index 75477d7..cf7cba9 100644 --- a/qrtclient/client.hxx +++ b/qrtclient/client.hxx @@ -60,6 +60,7 @@ namespace RTClient { , QString const& due = nullptr , QString const& text = nullptr); void ticketSearch(QString const& owner); + void ticketHistory(int id); signals: void loggedIn(QString const& name); -- cgit v1.3 From 7ef14e5bc66b46113dd50dc5ea62c8fcd8627dbc Mon Sep 17 00:00:00 2001 From: ꦌ ꦫꦶ ꦏ꧀ꦦꦿ ꦧ ꦮ ꦑ ꦩ ꦭ꧀ Date: Thu, 26 Sep 2019 21:10:06 +0800 Subject: Make the private slots public --- qrtclient/ticket.hxx | 6 +++--- qrtclient/user.hxx | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'qrtclient') diff --git a/qrtclient/ticket.hxx b/qrtclient/ticket.hxx index 26e5643..25c067f 100644 --- a/qrtclient/ticket.hxx +++ b/qrtclient/ticket.hxx @@ -43,6 +43,9 @@ namespace RTClient { , int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE; + public slots: + void update(rtclient_ticketlist* ticketList); + protected: QHash roleNames() const Q_DECL_OVERRIDE; @@ -50,9 +53,6 @@ namespace RTClient { void updated(); void rowCountChanged(); - private slots: - void update(rtclient_ticketlist* ticketList); - private: QList tickets; void addTicket(Ticket const& ticket); diff --git a/qrtclient/user.hxx b/qrtclient/user.hxx index 0d2b6ac..5b692a6 100644 --- a/qrtclient/user.hxx +++ b/qrtclient/user.hxx @@ -120,6 +120,9 @@ namespace RTClient { void setPrivileged(bool privileged); void setDisabled(bool disabled); + public slots: + void update(rtclient_user* user); + signals: void idChanged(); void nameChanged(); @@ -147,9 +150,6 @@ namespace RTClient { void privilegedChanged(); void disabledChanged(); - private slots: - void update(rtclient_user* user); - private: unsigned int m_id; QString m_name; -- cgit v1.3