From 905626f6f9ffdda80fc759f8ebacaf9c7deb9bdd Mon Sep 17 00:00:00 2001 From: Parv17k Date: Sat, 5 Dec 2020 22:51:47 -0500 Subject: [PATCH] table bugs fixed --- main.py | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/main.py b/main.py index 8d33cc9..5c49f30 100644 --- a/main.py +++ b/main.py @@ -160,10 +160,7 @@ def createticket(user_id): def updatestatus(user): st.write("I am in") - sql = f"""select et.ticket_id,et.status, et.title - from (select * from (select * from tickets,ticket_status where tickets.status_id = ticket_status.id) t - left join employees e on t.assigned_to_id = e.id) - et , issue_reporter i where i.id = et.issuer_id and i.id={str(user['id'][0])} ;""" + sql = f"""select tickets.ticket_id,ticket_status.status, tickets.title from tickets,ticket_status where tickets.status_id = ticket_status.id and assigned_to_id = {str(user['id'][0])};""" data = query_db(sql) tickets=[] @@ -205,21 +202,11 @@ def dashboard_employee(user_data): head.title("Employee Dashboard") st.success("Hello '"+user_data['name'][0]+"', Please scroll down and access your dashboard") show_tickets(user_data) -<<<<<<< HEAD - st.write("I am up") - updatestatus(user_data) st.write("I am down") if st.button('show feedback table for the user'): showFeedback(user_data) -======= - if st.button('show feedback table for the user'): - showFeedback(user_data) - if st.button('update any ticket status'): - updatestatus(user_data) - ->>>>>>> fa7f8d1e17db1133d200ca563e6972653816517f def dashboard_management(user_data): head.title("Management Dashboard") st.success("Hello '"+user_data['name'][0]+"', Please scroll down and access your dashboard") @@ -274,8 +261,6 @@ def auth(id,password,domain): -<<<<<<< HEAD -======= '## Read tables' sql_all_table_names = "select relname from pg_class where relkind='r' and relname !~ '^(pg_|sql_)';" @@ -287,4 +272,3 @@ def auth(id,password,domain): sql_table = f'select * from {table_name};' df = query_db(sql_table) st.dataframe(df) ->>>>>>> fa7f8d1e17db1133d200ca563e6972653816517f