Skip to content

Commit

Permalink
Merge branch 'develop' into IEEE-259-add-description-box-on-teams-hom…
Browse files Browse the repository at this point in the history 
…epage
  • Loading branch information
@Mustaballer
Mustaballer authored Feb 1, 2024
2 parents 7d20e6e + 1dc1d95 commit c3eff7b
Show file tree
Hide file tree
Showing 8 changed files with 1,490 additions and 6 deletions.
7 changes: 6 additions & 1 deletion hackathon_site/registration/analytics/data_manipulation.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@
from pandasql import sqldf
import pandas as pd

REGISTRATION_OPEN_DATES = {"newhacks_2021": "2021-09-03", "makeuoft_2022": "2022-01-03"}
REGISTRATION_OPEN_DATES = {
"newhacks_2021": "2021-09-03",
"makeuoft_2022": "2022-01-03",
"makeuoft_2023": "2023-01-17",
"newhacks_2023": "2023-09-18",
}

parent_folder = pathlib.Path(__file__).parent.resolve()
target_folder = f"{pathlib.Path(__file__).parents[1]}/static/registration/assets"
Expand Down
9 changes: 9 additions & 0 deletions hackathon_site/registration/analytics/documentation.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ Make sure the file name starts with `{hackathon name}_{year}_<...>.csv`.
#### Dependencies
Ensure you have `pandas` and `pandasql` installed in your local environment.

### Additional Tasks
1. Add the date that registration opened for the new event to the top of `data_manipulation.py` in the REGISTRATION_OPEN_DATES variable in the given format:
`"{hackathon}_{year}": "YYYY-MM-DD"`

2. Add hackathon year and line color to `hackathon_site/registration/static/registration/js/loadCharts.js` at the top of the file in the DATA_AVAILABLE variable in the given format: `{year}: "#{Color in HEX}"`

3. Add the new hackathons to the dropdown options in `hackathon_site/registration/templates/application/change_list.html` in the select element in the given format: `<option value="{hackathon}-{year}">{Hackathon} {Year}</option>`


### Running the Code

`python data_manipulation.py <type> <hackathon name> <year>`
Expand Down
360 changes: 360 additions & 0 deletions hackathon_site/registration/static/registration/assets/makeuoft/2023/categorized.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,360 @@
{
"school": {
"num_applicants": [
1,
3,
1,
5,
1,
3,
1,
1,
28,
1,
1,
1,
1,
15,
1,
1,
1,
8,
336,
19,
10,
43,
3,
1,
1,
1,
1,
9,
1,
3,
4,
24
],
"applicant_school": [
"21st century cyber charter school",
"aalto university",
"abraham lincoln high school - philadelphia",
"carleton university",
"centennial college",
"concordia university",
"independent learning centre",
"mcgill university",
"mcmaster university",
"other",
"others",
"queen's university",
"riverdale ci",
"ryerson university",
"seneca college",
"shenendehowa high school",
"the university of ontario institute of technology",
"the university of ottawa",
"the university of toronto",
"the university of toronto mississauga",
"the university of toronto scarborough",
"the university of waterloo",
"the university of western ontario",
"trent university",
"univerisity of toronto",
"university cesar vallejor",
"university of toron",
"university of toronto",
"uoft",
"western university",
"wilfrid laurier university",
"york university"
]
},
"program": {
"num_applicants": [
1,
3,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
6,
1,
3,
1,
1,
1,
1,
1,
2,
1,
3,
117,
2,
83,
2,
1,
1,
2,
1,
2,
1,
1,
3,
1,
1,
1,
16,
1,
1,
1,
4,
1,
13,
1,
1,
1,
42,
1,
1,
10,
1,
1,
1,
1,
46,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
4,
1,
2,
1,
1,
1,
2,
1,
1,
1,
1,
1,
1,
1,
1,
1,
2,
3,
1,
1,
1,
1,
1,
1,
24,
1,
13,
1,
3,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
6,
1,
1,
1,
1,
1,
1,
1,
6,
1,
1
],
"applicant_program": [
"2t6ece + pey",
"aerospace engineering",
"aerospace engineering - space systems design stream",
"alskdmflksd",
"automation engineering technology",
"automotive and vehicle engineering technology (bachelor of technology (b.tech. co-op)))",
"b.technology, automotive",
"bachelor of technology: automotive & vehicle engineering technology",
"bachelors in chemical engineering and applied science",
"basc in nanotechnology engineering",
"bba & financial math",
"biomedical engineering",
"biomedical mechanical engineering",
"business",
"business administration and computer science",
"business and computer science",
"ccit",
"chemical engineering",
"civil engineer",
"civil engineering",
"cognitive science",
"cognitive science, psychology and computer science",
"commerce",
"comp sci",
"computational math",
"computer and electrical engineering",
"computer eng",
"computer engineer",
"computer engineering",
"computer engineering + pey",
"computer science",
"computer science and economics",
"computer science and mathematics",
"computer science and statistics",
"computer science co-op",
"computer science major; physics & mathematics specialist;",
"computer science specialist",
"computer science, specialising in digital hardware",
"computer science/ busienss",
"cs",
"cs and business",
"digital enterprise management",
"double major english history",
"ece",
"ece (computer engineering)",
"economics and political science",
"egnsci",
"electrical & computer engineering",
"electrical and computer engineer",
"electrical and computer engineering",
"electrical and computer engineering (ece)",
"electrical computer engineering",
"electrical engineer",
"electrical engineering",
"electrical engineering and society",
"electrical mechanical enginner",
"engineering",
"engineering (compeng/software)",
"engineering 1",
"engineering design",
"engineering physics",
"engineering science",
"engineering science (basc.)",
"engineering science (robotics)",
"engineering science - aerospace and robotics engineering",
"engineering science - aerospace option",
"engineering science - robotics major",
"engineering science machine intelligence",
"engineering science, robotics major",
"engineering(ece)",
"engsci",
"engsci ece",
"exchange program (engineering)",
"financial analysis and risk management",
"fundamental applied genetics",
"geometric information systems",
"health sciences",
"honours math",
"honours software engineering",
"industrial",
"industrial engineering",
"information security",
"information technology",
"life sciences",
"linguistics and mathematics",
"m.eng electrical & computer engineering",
"machine intelligence (engineering science)",
"masc civil engineering first year",
"masc computer engineering",
"masc mechanical engineering",
"master's of applied science in computer engineering",
"material science and engineering",
"material science engineering",
"math",
"math and computer science",
"math and cs",
"mathematical applications in economics and finance",
"mathematics",
"mathematics and its applications - computer science",
"mcss",
"mech eng",
"mechanical",
"mechanical and industrial engineering",
"mechanical and materials engineering",
"mechanical engineering",
"mechanical engineering and computing technology",
"mechatronics engineering",
"mineral engineering",
"nanotechnology engineering",
"ossd",
"phd",
"phd in biomedical engineering",
"phd, civmin department",
"philosophy",
"physics",
"physics and comp sci",
"physics and mathematics",
"psychology",
"quality system",
"robotics engineering (eng sci)",
"rotman commerce",
"science stream",
"software development",
"software engineering",
"software engineering technology",
"statistics bsc",
"systems design engineering",
"test profile",
"track one",
"track one engineering",
"trackone - undeclared engineering",
"trackone engineering",
"trackone undeclared engineering",
"undeclared"
]
},
"study_level": {
"num_applicants": [
18,
8,
1,
503
],
"applicant_study_level": [
"gradschool",
"highschool",
"other",
"undergraduate"
]
}
}
Loading

0 comments on commit c3eff7b

Please sign in to comment.