From edf7edbfc93071e90b001f36b730e31cb027a54f 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: Wed, 25 Sep 2019 16:25:02 +0800 Subject: Ticket ID class member --- librtclient | 2 +- qrtclient/ticket.hxx | 11 +++++++++-- ticket.cxx | 6 ++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/librtclient b/librtclient index a266783..e39fa22 160000 --- a/librtclient +++ b/librtclient @@ -1 +1 @@ -Subproject commit a2667831d91ca18b9b8d41ad1d52a721103f8750 +Subproject commit e39fa22f6896b7b7200229ffba95c56074a17535 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) diff --git a/ticket.cxx b/ticket.cxx index cd984c5..9518c74 100644 --- a/ticket.cxx +++ b/ticket.cxx @@ -1,5 +1,4 @@ #include -#include #include "qrtclient/ticket.hxx" namespace RTClient { @@ -18,6 +17,8 @@ namespace RTClient { auto ticket = tickets[row]; switch (role) { + case IdRole: + return ticket.id(); case SubjectRole: return ticket.subject(); default: @@ -28,7 +29,8 @@ namespace RTClient { QHash TicketList::roleNames() const { return QHash{ - {SubjectRole, "subject"} + {IdRole, "subject"} + , {SubjectRole, "subject"} }; } -- cgit v1.2.3 From ed7fe27a36a3f241d7cde6f8ccc2d283f3d69f46 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: Wed, 25 Sep 2019 16:55:10 +0800 Subject: Fix ticket ID role name --- ticket.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ticket.cxx b/ticket.cxx index 9518c74..93eb066 100644 --- a/ticket.cxx +++ b/ticket.cxx @@ -29,7 +29,7 @@ namespace RTClient { QHash TicketList::roleNames() const { return QHash{ - {IdRole, "subject"} + {IdRole, "id"} , {SubjectRole, "subject"} }; } -- cgit v1.2.3 From e97f17a6cb95fb8a10a40ce6b94fc3ab591747c0 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: 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(-) 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.2.3 From cb7242bea8ea6ecf0bdb45a2654e3d24d83eb593 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: Wed, 25 Sep 2019 18:26:31 +0800 Subject: librtclient fix --- librtclient | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/librtclient b/librtclient index 63bf675..0aff874 160000 --- a/librtclient +++ b/librtclient @@ -1 +1 @@ -Subproject commit 63bf675b212affab4960b26324288b2fc2b57b21 +Subproject commit 0aff874caec82d8188057d9566e1292678d7a78b -- cgit v1.2.3 From 5cf059304cbae2b0af4a2a8f5ea6196fc01b1588 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: Wed, 25 Sep 2019 21:06:03 +0800 Subject: Simplify project file --- qrtclient.pro | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/qrtclient.pro b/qrtclient.pro index 67047cb..1e53e4f 100644 --- a/qrtclient.pro +++ b/qrtclient.pro @@ -12,18 +12,6 @@ SOURCES += \ client.cxx INCLUDEPATH += $$PWD/librtclient -LIBS += \ - $$PWD/librtclient/librtclient.a \ - -lcurl - -contains(ANDROID_TARGET_ARCH,arm64-v8a) { - QMAKE_CFLAGS += -I/usr/local/aarch64-linux-android/sysroot/usr/include - LIBS += -L/usr/local/aarch64-linux-android/sysroot/usr/lib -} - -contains(ANDROID_TARGET_ARCH,armeabi-v7a) { - QMAKE_CFLAGS += -I/usr/local/arm-linux-androideabi/sysroot/usr/include - LIBS += -L/usr/local/arm-linux-androideabi/sysroot/usr/lib -} +LIBS += $$PWD/librtclient/librtclient.a debug: DEFINES += DEBUG -- cgit v1.2.3 From 7ef14e5bc66b46113dd50dc5ea62c8fcd8627dbc 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: 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(-) 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.2.3 From 7fd21b77656f091d61528ff237a9eb6ccda79cdd 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: Thu, 26 Sep 2019 21:36:58 +0800 Subject: More specific on ignored files --- .gitignore | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 7e40417..71d9e03 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,7 @@ -*.a -*.pro.user -*.o -*.qmake.stash -*.so* -*.swp +libqrtclient.a Makefile moc_* +*.o +.qmake.stash +qrtclient.pro.user +*.swp -- cgit v1.2.3