Skip to content

Commit

Permalink
Merge pull request #3 from BYTE-Club-CCNY/jawad-push-test
Browse files Browse the repository at this point in the history
fixed cabinet. fixed db entries being out of order. added cabinet.
  • Loading branch information
joewadk authored Sep 6, 2024
2 parents d94aa36 + a72a7b8 commit c268859
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ B.Y.T.E Club Form (Responses).xlsx
firebase.json
env/
__pycache__/
body.html
body.html
add_cabinet.py
6 changes: 3 additions & 3 deletions csv_dataproc.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 7 additions & 5 deletions todo.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
- [x] add database function to mark everyone/ specific persion as inactive

0 comments on commit c268859

Please sign in to comment.