From 9688240132e4bb0358af782bebf2dd206b1e9adb Mon Sep 17 00:00:00 2001 From: joewadk Date: Fri, 6 Sep 2024 00:15:27 -0400 Subject: [PATCH 1/2] fixed csv_dataproc --- csv_dataproc.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/csv_dataproc.py b/csv_dataproc.py index 8a0f9b2..b1410a6 100644 --- a/csv_dataproc.py +++ b/csv_dataproc.py @@ -23,10 +23,10 @@ name_arr[-1], row['What is your CityMail?'], row['if you prefer we contact your personal email, please put it here'], - (row['if you prefer we contact your personal email, please put it here']!=None), + pd.notna(row['if you prefer we contact your personal email, please put it here']), #had to use gpt :( False, #active bool. by default is false for all members. - row["What's your discord?"], - row['What is your CityMail?'] + row['What is your EMPLID'], + row["What's your discord?"] ) db.add(new_person) From 74063e696556b31a5fe426c870fd28e7ec468a65 Mon Sep 17 00:00:00 2001 From: joewadk Date: Fri, 6 Sep 2024 00:42:56 -0400 Subject: [PATCH 2/2] added cabinet to db. will look into adding current applicant pool into db --- .gitignore | 3 ++- todo.md | 14 ++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index ababfa2..de6b23f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ B.Y.T.E Club Form (Responses).xlsx firebase.json env/ __pycache__/ -body.html \ No newline at end of file +body.html +add_cabinet.py \ No newline at end of file diff --git a/todo.md b/todo.md index 84190ba..4cdd138 100644 --- a/todo.md +++ b/todo.md @@ -7,23 +7,25 @@ - [x] add database table for cabinet members - [ ] expand server to send selective emails - [x] creat git hook to update req.txt whenever env changes -- [ ] refactor email_client to allow for null body +- [x] refactor email_client to allow for null body - [x] Database.get should only return preferred email - [x] Create wrapper function that sends emails via arguements - [x] Create simple way to store and update email body, subject and candidates - [x] Write tests -- [ ] Fix cascade of deletes and updates. Requires implementation of foreign keys for cabinet and blacklist tables +- [x] Fix cascade of deletes and updates. Requires implementation of foreign keys for cabinet and blacklist tables +- [ ] add project to the byte ccny website project db +- [ ] expand current db to fall 2024 applicants ## Jawad - [x] test the delete operation (why is it not working) -- [ ] add current alumni to db -- [ ] add blacklist to db +- [x] add current alumni to db +- [x] add blacklist to db ## Fahad - [x] CLI arguments - [x] subject taken from CLI - [x] add the HTML functionality (grab the body.html file as the main body) -- [ ] update readme +- [x] update readme - [ ] expand tests - [ ] fix github action -- [ ] add database function to mark everyone/ specific persion as inactive \ No newline at end of file +- [ ] add database function to mark everyone/ specific persion as inactive