From 897a1772ec1c9d8574ec170c1ada820b39c12e0a Mon Sep 17 00:00:00 2001 From: murraydr Date: Wed, 18 Oct 2023 11:51:27 -0400 Subject: [PATCH] Finished weekly kudos feature --- archivedSubRequests.csv | 7 +++++++ lastUpdatedToken.txt | 2 +- sectionsDatabase.csv | 18 +++++++++--------- staffDatabase.csv | 22 +++++++++++----------- substitutionHistoryWindow.py | 12 ++++++++---- substitutionRequestForm.csv | 7 ------- 6 files changed, 36 insertions(+), 32 deletions(-) diff --git a/archivedSubRequests.csv b/archivedSubRequests.csv index 74b255c..67f1a8f 100644 --- a/archivedSubRequests.csv +++ b/archivedSubRequests.csv @@ -1 +1,8 @@ Timestamp,Requestor,Section,Dates,Replacement,Reason,Result,InstructorReason +2023-10-09 17:51:15.406000,austi143,Sec 11,10/09,bhardw41,I’m sick,APP,INST. REASON +2023-10-11 01:06:38.157000,pittend2,Sec 25,10/11,kumararn,Sick,APP,INST. REASON +2023-10-11 16:50:11.365000,murraydr,M_HR1,10/02;10/09,,test2,APP,INST. REASON +2023-10-11 17:24:59.666000,austi143,Sec 11,10/11,lnumehak,I’m sick,APP,INST. REASON +2023-10-15 20:46:29.883000,allarde2,S_HR1;S_HR2,10/15,,Family emergency ,APP,INST. REASON +2023-10-16 00:52:26.038000,tagaychr,Sec 36,10/26,sonarsoh,out of town,APP,INST. REASON +2023-10-18 14:56:06.049000,sipahiog,Sec 30,10/18,wadhwan5,Need to be out of town for family situation ,APP,INST. REASON diff --git a/lastUpdatedToken.txt b/lastUpdatedToken.txt index d57425d..ec2a5ef 100644 --- a/lastUpdatedToken.txt +++ b/lastUpdatedToken.txt @@ -1 +1 @@ -2023-10-18 11:32:03.163171 \ No newline at end of file +2023-10-18 11:49:59.337384 \ No newline at end of file diff --git a/sectionsDatabase.csv b/sectionsDatabase.csv index 1b8b36b..ae5b5a2 100644 --- a/sectionsDatabase.csv +++ b/sectionsDatabase.csv @@ -49,7 +49,7 @@ R_HR1,5,09/28,07:00 PM-08:00 PM,Zoom,byungho,leduy2,strumban,fahimmir,mcgui186,v R_HR2,5,09/28,08:00 PM-09:00 PM,Zoom,byungho,leduy2,strumban,fahimmir,mcgui186,veerella,,,,,,,,,,,,,, S_HR1,6,10/01,07:00 PM-08:00 PM,Zoom,bashyalb,allarde2,burgejae,carlier1,fahimmir,sipahiog,john7531,,,,,,,,,,,,, S_HR2,6,10/01,08:00 PM-09:00 PM,Zoom,bashyalb,allarde2,burgejae,carlier1,fahimmir,sipahiog,john7531,,,,,,,,,,,,, -M_HR1,6,10/02,07:00 PM-08:00 PM,Zoom,murraydr,goginen8,anhdao,kumararn,nguy1104,veerella,fahimmir,anindhos,,,,,,,,,,,, +M_HR1,6,10/02,07:00 PM-08:00 PM,Zoom,,goginen8,anhdao,kumararn,nguy1104,veerella,fahimmir,anindhos,,,,,,,,,,,, M_HR2,6,10/02,08:00 PM-09:00 PM,Zoom,murraydr,goginen8,kumararn,veerella,fahimmir,anindhos,,,,,,,,,,,,,, T_HR1,6,10/03,07:00 PM-08:00 PM,Zoom,mengjoey,rachama2,kumararn,strumban,fahimmir,sipahiog,mcgui186,sonarsoh,,,,,,,,,,,, T_HR2,6,10/03,08:00 PM-09:00 PM,Zoom,mengjoey,rachama2,kumararn,strumban,fahimmir,sipahiog,mcgui186,sonarsoh,,,,,,,,,,,, @@ -59,7 +59,7 @@ R_HR1,6,10/05,07:00 PM-08:00 PM,Zoom,byungho,leduy2,strumban,fahimmir,mcgui186,v R_HR2,6,10/05,08:00 PM-09:00 PM,Zoom,byungho,leduy2,strumban,fahimmir,mcgui186,veerella,,,,,,,,,,,,,, S_HR1,7,10/08,07:00 PM-08:00 PM,Zoom,bashyalb,allarde2,burgejae,carlier1,fahimmir,sipahiog,john7531,,,,,,,,,,,,, S_HR2,7,10/08,08:00 PM-09:00 PM,Zoom,bashyalb,allarde2,burgejae,carlier1,fahimmir,sipahiog,john7531,,,,,,,,,,,,, -M_HR1,7,10/09,07:00 PM-08:00 PM,Zoom,murraydr,goginen8,anhdao,kumararn,nguy1104,veerella,fahimmir,anindhos,,,,,,,,,,,, +M_HR1,7,10/09,07:00 PM-08:00 PM,Zoom,,goginen8,anhdao,kumararn,nguy1104,veerella,fahimmir,anindhos,,,,,,,,,,,, M_HR2,7,10/09,08:00 PM-09:00 PM,Zoom,murraydr,goginen8,kumararn,veerella,fahimmir,anindhos,,,,,,,,,,,,,, T_HR1,7,10/10,07:00 PM-08:00 PM,Zoom,mengjoey,rachama2,kumararn,strumban,fahimmir,sipahiog,mcgui186,sonarsoh,,,,,,,,,,,, T_HR2,7,10/10,08:00 PM-09:00 PM,Zoom,mengjoey,rachama2,kumararn,strumban,fahimmir,sipahiog,mcgui186,sonarsoh,,,,,,,,,,,, @@ -67,8 +67,8 @@ W_HR1,7,10/11,07:00 PM-08:00 PM,Zoom,zhengyil,nguy1104,veerella,fahimmir,sipahio W_HR2,7,10/11,08:00 PM-09:00 PM,Zoom,zhengyil,nguy1104,veerella,fahimmir,sipahiog,mcgui186,,,,,,,,,,,,,, R_HR1,7,10/12,07:00 PM-08:00 PM,Zoom,byungho,leduy2,strumban,fahimmir,mcgui186,veerella,,,,,,,,,,,,,, R_HR2,7,10/12,08:00 PM-09:00 PM,Zoom,byungho,leduy2,strumban,fahimmir,mcgui186,veerella,,,,,,,,,,,,,, -S_HR1,8,10/15,07:00 PM-08:00 PM,Zoom,bashyalb,allarde2,burgejae,carlier1,fahimmir,sipahiog,john7531,,,,,,,,,,,,, -S_HR2,8,10/15,08:00 PM-09:00 PM,Zoom,bashyalb,allarde2,burgejae,carlier1,fahimmir,sipahiog,john7531,,,,,,,,,,,,, +S_HR1,8,10/15,07:00 PM-08:00 PM,Zoom,bashyalb,,burgejae,carlier1,fahimmir,sipahiog,john7531,,,,,,,,,,,,, +S_HR2,8,10/15,08:00 PM-09:00 PM,Zoom,bashyalb,,burgejae,carlier1,fahimmir,sipahiog,john7531,,,,,,,,,,,,, M_HR1,8,10/16,07:00 PM-08:00 PM,Zoom,murraydr,goginen8,anhdao,kumararn,nguy1104,veerella,fahimmir,anindhos,,,,,,,,,,,, M_HR2,8,10/16,08:00 PM-09:00 PM,Zoom,murraydr,goginen8,kumararn,veerella,fahimmir,anindhos,,,,,,,,,,,,,, T_HR1,8,10/17,07:00 PM-08:00 PM,Zoom,mengjoey,rachama2,kumararn,strumban,fahimmir,sipahiog,mcgui186,sonarsoh,,,,,,,,,,,, @@ -439,8 +439,8 @@ Sec 11,5,09/25,5:00 PM-6:50 PM,211 Ernst Bessey Hall,austi143,aggarw75,,,,,,,,,, Sec 11,5,09/27,5:00 PM-6:50 PM,211 Ernst Bessey Hall,austi143,aggarw75,,,,,,,,,,,,,,,,,, Sec 11,6,10/02,5:00 PM-6:50 PM,211 Ernst Bessey Hall,austi143,aggarw75,,,,,,,,,,,,,,,,,, Sec 11,6,10/04,5:00 PM-6:50 PM,211 Ernst Bessey Hall,austi143,aggarw75,,,,,,,,,,,,,,,,,, -Sec 11,7,10/09,5:00 PM-6:50 PM,211 Ernst Bessey Hall,austi143,aggarw75,,,,,,,,,,,,,,,,,, -Sec 11,7,10/11,5:00 PM-6:50 PM,211 Ernst Bessey Hall,austi143,aggarw75,,,,,,,,,,,,,,,,,, +Sec 11,7,10/09,5:00 PM-6:50 PM,211 Ernst Bessey Hall,bhardw41,aggarw75,,,,,,,,,,,,,,,,,, +Sec 11,7,10/11,5:00 PM-6:50 PM,211 Ernst Bessey Hall,lnumehak,aggarw75,,,,,,,,,,,,,,,,,, Sec 11,8,10/16,5:00 PM-6:50 PM,211 Ernst Bessey Hall,austi143,aggarw75,,,,,,,,,,,,,,,,,, Sec 11,8,10/18,5:00 PM-6:50 PM,211 Ernst Bessey Hall,austi143,aggarw75,,,,,,,,,,,,,,,,,, Sec 11,9,10/25,5:00 PM-6:50 PM,211 Ernst Bessey Hall,austi143,aggarw75,,,,,,,,,,,,,,,,,, @@ -832,7 +832,7 @@ Sec 25,5,09/27,12:40 PM-2:30 PM,S222 South Kedzie,pittend2,schmiesi,,,,,,,,,,,,, Sec 25,6,10/02,12:40 PM-2:30 PM,S222 South Kedzie,pittend2,schmiesi,,,,,,,,,,,,,,,,,, Sec 25,6,10/04,12:40 PM-2:30 PM,S222 South Kedzie,pittend2,schmiesi,,,,,,,,,,,,,,,,,, Sec 25,7,10/09,12:40 PM-2:30 PM,S222 South Kedzie,pittend2,schmiesi,,,,,,,,,,,,,,,,,, -Sec 25,7,10/11,12:40 PM-2:30 PM,S222 South Kedzie,pittend2,schmiesi,,,,,,,,,,,,,,,,,, +Sec 25,7,10/11,12:40 PM-2:30 PM,S222 South Kedzie,kumararn,schmiesi,,,,,,,,,,,,,,,,,, Sec 25,8,10/16,12:40 PM-2:30 PM,S222 South Kedzie,pittend2,schmiesi,,,,,,,,,,,,,,,,,, Sec 25,8,10/18,12:40 PM-2:30 PM,S222 South Kedzie,pittend2,schmiesi,,,,,,,,,,,,,,,,,, Sec 25,9,10/25,12:40 PM-2:30 PM,S222 South Kedzie,pittend2,schmiesi,,,,,,,,,,,,,,,,,, @@ -918,7 +918,7 @@ Sec 30,6,10/04,10:20 AM-12:10 PM,403 Computer Center,sipahiog,carlier1,,,,,,,,,, Sec 30,7,10/09,10:20 AM-12:10 PM,403 Computer Center,sipahiog,carlier1,,,,,,,,,,,,,,,,,, Sec 30,7,10/11,10:20 AM-12:10 PM,403 Computer Center,sipahiog,carlier1,,,,,,,,,,,,,,,,,, Sec 30,8,10/16,10:20 AM-12:10 PM,403 Computer Center,sipahiog,carlier1,,,,,,,,,,,,,,,,,, -Sec 30,8,10/18,10:20 AM-12:10 PM,403 Computer Center,sipahiog,carlier1,,,,,,,,,,,,,,,,,, +Sec 30,8,10/18,10:20 AM-12:10 PM,403 Computer Center,wadhwan5,carlier1,,,,,,,,,,,,,,,,,, Sec 30,9,10/25,10:20 AM-12:10 PM,403 Computer Center,sipahiog,carlier1,,,,,,,,,,,,,,,,,, Sec 30,10,10/30,10:20 AM-12:10 PM,403 Computer Center,sipahiog,carlier1,,,,,,,,,,,,,,,,,, Sec 30,10,11/01,10:20 AM-12:10 PM,403 Computer Center,sipahiog,carlier1,,,,,,,,,,,,,,,,,, @@ -1059,7 +1059,7 @@ Sec 36,7,10/10,12:40 PM-2:30 PM,415 Computer Center,tagaychr,mackeyb3,,,,,,,,,,, Sec 36,7,10/12,12:40 PM-2:30 PM,415 Computer Center,tagaychr,mackeyb3,,,,,,,,,,,,,,,,,, Sec 36,8,10/17,12:40 PM-2:30 PM,415 Computer Center,tagaychr,mackeyb3,,,,,,,,,,,,,,,,,, Sec 36,8,10/19,12:40 PM-2:30 PM,415 Computer Center,tagaychr,mackeyb3,,,,,,,,,,,,,,,,,, -Sec 36,9,10/26,12:40 PM-2:30 PM,415 Computer Center,tagaychr,mackeyb3,,,,,,,,,,,,,,,,,, +Sec 36,9,10/26,12:40 PM-2:30 PM,415 Computer Center,sonarsoh,mackeyb3,,,,,,,,,,,,,,,,,, Sec 36,10,10/31,12:40 PM-2:30 PM,415 Computer Center,tagaychr,mackeyb3,,,,,,,,,,,,,,,,,, Sec 36,10,11/02,12:40 PM-2:30 PM,415 Computer Center,tagaychr,mackeyb3,,,,,,,,,,,,,,,,,, Sec 36,11,11/07,12:40 PM-2:30 PM,415 Computer Center,tagaychr,mackeyb3,,,,,,,,,,,,,,,,,, diff --git a/staffDatabase.csv b/staffDatabase.csv index cd3e4e5..5876ffb 100644 --- a/staffDatabase.csv +++ b/staffDatabase.csv @@ -3,12 +3,12 @@ Aditya Aggarwal,ula,aggarw75,0,0,0,0,0,0 Jonas Ahonen,ula,ahonenj1,0,0,0,0,0,0 Neha Aigalikar,ula,aigalik1,0,0,0,0,0,0 Ethan Alexander,ula,alexa571,1,0,0,0,0,0 -Elizabeth Allard,ula,allarde2,0,0,0,0,0,0 +Elizabeth Allard,ula,allarde2,0,1.0,0,0,0,0 Anh Dao,ula,anhdao,0,0,0,0,0,0 Sifatul Anindho,ula,anindhos,1,0,0,0,0,0 -Alexander Austin,ula,austi143,1,0,0,0,0,0 +Alexander Austin,ula,austi143,1,2.0,0,0,0,0 Bidhan Bashyal,ga,bashyalb,0,0,0,0,0,0 -Navya Bhardwaj,ula,bhardw41,1,0,0,0,0,0 +Navya Bhardwaj,ula,bhardw41,1,0,0,0,0,1.0 Michal Borek,ula,borekmi1,1,0,0,0,0,0 Jaelin Burge,ula,burgejae,0,0,0,0,0,0 Byungho,ga,byungho,0,0,0,0,0,0 @@ -34,9 +34,9 @@ Kara Kerzel,ula,kerzelka,0,0,0,0,0,0 Prijam Khanal,ula,khanalpr,0,0,0,0,0,0 Benjamin Kim,ula,kimbenj3,0,0,0,0,0,0 Michael Kleinbriel,ula,kleinb14,0,0,0,0,0,0 -Arnas Kumar,ula,kumararn,0,0,0,0,0,0 +Arnas Kumar,ula,kumararn,0,0,0,0,0,1.0 Duy Le,ula,leduy2,1,0,0,0,0,0 -Mehak,ula,lnumehak,0,0,0,0,0,0 +Mehak,ula,lnumehak,0,0,0,0,0,1.0 Julieta Lopez,ula,lopezj35,0,0,0,0,0,0 Brendan Mackey,ula,mackeyb3,0,0,0,0,0,0 Hassan Maklai,ula,maklaiha,1,0,0,0,0,0 @@ -47,7 +47,7 @@ Palmer Mcguire,ula,mcgui186,1,0,0,0,0,0 Joey Meng,ga,mengjoey,0,0,0,0,0,0 Sophia Mick,ula,micksoph,0,0,0,0,0,0 Sujoy Mondol,ula,mondolsu,0,0,0,0,0,0 -Drew Murray,ga,murraydr,1,0,0,0,0,0 +Drew Murray,ga,murraydr,1,1.0,0,0,0,0 Tawsif Imam Nadif,ula,nadiftaw,0,0,0,0,0,0 Achint Nagra,ula,nagraach,0,0,0,0,0,0 David Neidecker,ula,neidecke,1,0,0,0,0,0 @@ -56,7 +56,7 @@ Vivian Ng,ula,ngvivian,0,0,0,0,0,0 Peter Oatney,ula,oatneype,1,0,0,0,0,0 Mike Paterala,ula,paterala,1,0,0,0,0,0 Sofia Perez Rodriguez,ula,perezso1,0,0,0,0,0,0 -Natalia Pittendrigh,ula,pittend2,1,0,0,0,0,0 +Natalia Pittendrigh,ula,pittend2,1,1.0,0,0,0,0 Yashashvini,ga,rachama2,1,0,0,0,0,0 Tasmia Rahman,ula,rahman64,0,0,0,0,0,0 Alfredo Sanchez,ula,sanch488,1,0,0,0,0,0 @@ -67,19 +67,19 @@ Jordan Sebagh,ula,sebaghjo,0,0,0,0,0,0 Matthew Sebaly,ula,sebalyma,1,0,0,0,0,0 Tejas Singhal,ula,singhalt,0,0,0,0,0,0 Shashank Singh,ula,singhs65,0,0,0,0,0,0 -Omer Salih Sipahioglu,ula,sipahiog,1,0,0,0,0,0 -Soham Sonar,ula,sonarsoh,1,0,0,0,0,0 +Omer Salih Sipahioglu,ula,sipahiog,1,1.0,0,0,0,0 +Soham Sonar,ula,sonarsoh,1,0,0,0,0,1.0 Zach Stebbins,ula,stebbi43,1,0,0,0,0,0 Jaylynn Stefanski,ula,stefan69,1,0,0,0,0,0 Mila Straskraba,ula,straskra,1,0,0,0,0,0 Efim Strumban,ula,strumban,0,0,0,0,0,0 -Christina Tagay,ula,tagaychr,0,0,0,0,0,0 +Christina Tagay,ula,tagaychr,0,1.0,0,0,0,0 Shreyas Tenkayala,ula,tenkayal,0,0,0,0,0,0 Ece Ugurlu,ula,ugurluec,0,0,0,0,0,0 Aanshik Upadhyay,ula,upadhy19,0,0,0,0,0,0 Noel Vazquez,ula,vazque72,0,0,0,0,0,0 Koushik Sai Veerella,ula,veerella,1,0,0,0,0,0 -Krish Wadhwani,ula,wadhwan5,0,0,0,0,0,0 +Krish Wadhwani,ula,wadhwan5,0,0,0,0,0,1.0 Julian Whittaker,ula,whitta49,1,0,0,0,0,0 Sophie Xu,ula,xusophie,0,0,0,0,0,0 Blenda Yan,ula,yanblend,0,0,0,0,0,0 diff --git a/substitutionHistoryWindow.py b/substitutionHistoryWindow.py index c080d44..945e687 100644 --- a/substitutionHistoryWindow.py +++ b/substitutionHistoryWindow.py @@ -2,6 +2,7 @@ import PySimpleGUI as sg import csv import pandas as pd import helperFunctions as HF +from datetime import datetime, timedelta def subHisWin(subRequestsArchiveFilename,defaultFont): @@ -113,14 +114,17 @@ def subHisWin(subRequestsArchiveFilename,defaultFont): window['-CAN'].Update(disabled=True) window['+FUL'].Update(disabled=True) window['-FUL'].Update(disabled=True) + + timeStr=datetime.now() + currDate=timeStr-timedelta(hours=4,minutes=0) + pastDate=timeStr-timedelta(hours=4+24*7,minutes=0) + currDate=currDate.strftime('%m')+"/"+currDate.strftime('%d') + pastDate=pastDate.strftime('%m')+"/"+pastDate.strftime('%d') - #Printing options for Pandas - pd.set_option('display.expand_frame_repr', False) - pd.set_option('max_colwidth', 30) output=f'Name : Hours subbed\n' output+='------------------------------\n' - kudosList=HF.getNumFulfilledInDateRange(subRequestsArchiveFilename,'10/05','10/10') + kudosList=HF.getNumFulfilledInDateRange(subRequestsArchiveFilename,pastDate,currDate) kudosList=sorted(kudosList.items(), key=lambda x:x[1], reverse=True) for person in kudosList: output+=f'{HF.IDToName(person[0])[:15]:15} : {person[1]*2.0}\n' diff --git a/substitutionRequestForm.csv b/substitutionRequestForm.csv index 6b8cb72..f0e3bfc 100644 --- a/substitutionRequestForm.csv +++ b/substitutionRequestForm.csv @@ -20,11 +20,4 @@ Timestamp,Requestor,Section,Dates,Replacement,Reason 2023-10-04 19:47:39.642000,schne542,Sec 19,10/09,aggarw75,I have a doctors appointment on 10/9 back home. 2023-10-04 20:02:13.852000,mcgui186,R_HR1;R_HR2,10/05,haggart3,I need to go to helproom for a project of mine 2023-10-04 20:07:34.501000,sipahiog,Sec 46,10/10,haggart3,Out of town -2023-10-09 17:51:15.406000,austi143,Sec 11,10/09,bhardw41,I’m sick -2023-10-11 01:06:38.157000,pittend2,Sec 25,10/11,kumararn,Sick 2023-10-11 16:49:39.541000,murraydr,M_HR1;M_HR2,10/09,,test1 -2023-10-11 16:50:11.365000,murraydr,M_HR1,10/02;10/09,,test2 -2023-10-11 17:24:59.666000,austi143,Sec 11,10/11,lnumehak,I’m sick -2023-10-15 20:46:29.883000,allarde2,S_HR1;S_HR2,10/15,,Family emergency -2023-10-16 00:52:26.038000,tagaychr,Sec 36,10/26,sonarsoh,out of town -2023-10-18 14:56:06.049000,sipahiog,Sec 30,10/18,wadhwan5,Need to be out of town for family situation