diff --git a/myems-api/reports/ticket.py b/myems-api/reports/ticket.py
index 32716f14..664eebff 100644
--- a/myems-api/reports/ticket.py
+++ b/myems-api/reports/ticket.py
@@ -41,6 +41,7 @@ class TicketTypeCollection:
resp.text = json.dumps(result)
+
class TicketListCollection:
@staticmethod
def __init__():
@@ -67,8 +68,19 @@ class TicketListCollection:
for row in workflow_rows:
workflow_result[row[0]] = row[1]
+ query = (" SELECT id, name "
+ " FROM workflow_state "
+ " ORDER BY id ")
+ cursor.execute(query)
+ workflow_state_rows = cursor.fetchall()
+
+ workflow_state_result = {}
+ if workflow_state_rows is not None and len(workflow_state_rows) > 0:
+ for row in workflow_state_rows:
+ workflow_state_result[row[0]] = row[1]
+
query = (" SELECT id, title, workflow_id, sn, state_id, creator, gmt_created, gmt_modified "
- " FROM ticketed_ticketrecord "
+ " FROM ticket_ticketrecord "
" ORDER BY id ")
cursor.execute(query)
rows = cursor.fetchall()
@@ -80,12 +92,12 @@ class TicketListCollection:
for row in rows:
meta_result = {"id": row[0],
"title": row[1],
- "workflow_name": workflow_result.get(row[2]),
+ "ticket_type": workflow_result.get(row[2]),
"sn": row[3],
- "state_id": row[4],
+ "state": workflow_state_result.get(row[4]),
"creator": row[5],
- "gmt_created": row[6],
- "gmt_modified": row[7]
+ "gmt_created": str(row[6]),
+ "gmt_modified": str(row[7])
}
result.append(meta_result)
diff --git a/myems-web/src/components/MyEMS/Ticket/TicketApplication.js b/myems-web/src/components/MyEMS/Ticket/TicketApplication.js
index 963e0536..cef3b8d4 100644
--- a/myems-web/src/components/MyEMS/Ticket/TicketApplication.js
+++ b/myems-web/src/components/MyEMS/Ticket/TicketApplication.js
@@ -117,8 +117,7 @@ const TicketApplication = ({ setRedirect, setRedirectUrl, t }) => {
})
.then(json => {
if (isResponseOK) {
- console.log('000', json);
- // console.log('111', typeof(json),json);
+ console.log('/ticket/list', json);
setTicketList(json);
} else {
toast.error(json.description);
@@ -154,18 +153,25 @@ const TicketApplication = ({ setRedirect, setRedirectUrl, t }) => {
);
const columns = [
+ {
+ key: 'a00',
+ dataField: 'id',
+ headerClasses: 'border-0',
+ text: t('ID'),
+ classes: 'border-0 py-2 align-middle',
+ sort: true
+ },
{
key: 'a0',
dataField: 'title',
headerClasses: 'border-0',
text: t('Title'),
classes: 'border-0 py-2 align-middle',
- formatter: nameFormatter,
sort: true
},
{
key: 'a1',
- dataField: 'workflow_id',
+ dataField: 'ticket_type',
headerClasses: 'border-0',
text: t('Ticket Type'),
classes: 'border-0 py-2 align-middle',
@@ -213,7 +219,7 @@ const TicketApplication = ({ setRedirect, setRedirectUrl, t }) => {
},
{
- key: 'a00',
+ key: 'a000',
dataField: '',
headerClasses: 'border-0',
text: '',
@@ -273,7 +279,7 @@ const TicketApplication = ({ setRedirect, setRedirectUrl, t }) => {
-
+
);
};