Skip to content

Commit 89e2ead

Browse files
cqoverly-uwcqoverly-uw
committed
updated i&s and vis_perf_arts to new names, added rsn and nat. sci
1 parent 0bb9d31 commit 89e2ead

File tree

6 files changed

+223
-79
lines changed

6 files changed

+223
-79
lines changed

‎alchemy_test.py

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
from sqlalchemy import create_engine, MetaData, Table
2+
from sqlalchemy.orm import Session
3+
from sqlalchemy.sql import select, and_
4+
from sqlalchemy.sql.expression import or_, or_
5+
6+
7+
engine = create_engine("mssql+pyodbc://cqoverly:12rover12@EDW")
8+
meta = MetaData(bind=engine)
9+
student_1 = Table("student_1", meta, schema='sec', autoload=True, autoload_with=engine)
10+
time_schedule = Table("time_schedule", meta, schema='sec', autoload=True, autoload_with=engine)
11+
12+
13+
def get_ts(year, quarter, dept):
14+
s = select(
15+
time_schedule.c.ts_year,
16+
time_schedule.c.ts_quarter,
17+
time_schedule.c.dept_abbrev,
18+
time_schedule.c.course_no,
19+
time_schedule.c.section_id).where(
20+
and_(
21+
time_schedule.c.ts_year == year,
22+
time_schedule.c.ts_quarter == quarter,
23+
time_schedule.c.dept_abbrev == dept
24+
)
25+
).order_by(time_schedule.c.course_no, time_schedule.c.section_id)
26+
27+
conn = engine.connect()
28+
result = conn.execute(s)
29+
print(result)
30+
return result
31+
32+
33+
def get_student(sid):
34+
s = select(student_1.c.system_key, student_1.c.student_no, student_1.c.student_name_lowc).where(
35+
student_1.c.student_no == sid
36+
)
37+
con = engine.connect()
38+
result = con.execute(s)
39+
return result
40+
41+
42+
if __name__ == '__main__':
43+
r = get_ts(2021, 1, 'E E')
44+
# r = get_student(1834009)
45+
46+
for row in r:
47+
print(row)
48+
49+
# for c in time_schedule.columns:
50+
# print(c)

‎control/courses.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,12 @@ def get_single_course_info(sql: str, params: tuple) -> dict:
4545
"long_title": data[7],
4646
"resp_crs": data[8],
4747
"diversity": data[9],
48-
"i_and_s": data[10],
49-
"vis_lit_perf_arts": data[11],
50-
"eng_comp": data[12],
51-
"writing": data[13],
48+
"nat_sci": data[10],
49+
"soc_sci": data[11],
50+
"arts_hum": data[12],
51+
"rsn": data[13],
52+
"eng_comp": data[14],
53+
"writing": data[15],
5254
}
5355
except IndexError:
5456
return {}

‎images/favicon.ico

11.7 KB
Binary file not shown.

‎sql_scripts.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -517,8 +517,10 @@
517517
ELSE CONCAT(ct.resp_curric_abbr, resp_course_no)
518518
END resp_course,
519519
ct.diversity_crs,
520-
ct.indiv_society,
521-
ct.vis_lit_perf_arts,
520+
ct.natural_science,
521+
ct.social_science,
522+
ct.arts_hum,
523+
ct.rsn,
522524
ct.english_comp,
523525
ct.writing_crs
524526

‎templates/shared/base.html

+163-73
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,170 @@
11
<html>
2-
<head>
2+
<head>
33
<title>{% block title %}{% endblock %}</title>
4-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
5-
</head>
6-
<style>
4+
<link
5+
rel="stylesheet"
6+
href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
7+
integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm"
8+
crossorigin="anonymous"
9+
/>
10+
<link rel="icon" type="image/x-icon" href="/favicon.ico" />
11+
</head>
12+
<style>
713
#uw_nav_link {
8-
color: gold;
14+
color: gold;
915
}
10-
</style>
11-
<body>
12-
<nav class="navbar navbar-expand-lg" style="background-color: indigo;">
13-
<a class="navbar-brand" id="uw_nav_link" href="#">ECE Advisor</a>
14-
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
15-
<span class="navbar-toggler-icon"></span>
16-
</button>
17-
18-
<div class="collapse navbar-collapse" id="navbarSupportedContent">
19-
<ul class="navbar-nav mr-auto">
20-
<li class="nav-item active">
21-
<a class="nav-link" id="uw_nav_link" href="/">Home <span class="sr-only">(current)</span></a>
22-
</li>
23-
<!-- STUDENTS MENU-->
24-
<li class="nav-item dropdown">
25-
<a class="nav-link dropdown-toggle" id="uw_nav_link" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
26-
Students
27-
</a>
28-
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
29-
<a class="dropdown-item" href="/student_info/">Student Info</a>
30-
<a class="dropdown-item" href="/#">Future Placeholder</a>
31-
<div class="dropdown-divider"></div>
32-
<a class="dropdown-item" href="/current_ee_undergrads/">All EE Undergrads</a>
33-
</div>
34-
</li>
35-
<!-- FACULTY MENU-->
36-
<li class="nav-item dropdown">
37-
<a class="nav-link dropdown-toggle" id="uw_nav_link" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
38-
Faculty
39-
</a>
40-
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
41-
<a class="dropdown-item" href="/fac_crs_history/">Faculty Course History</a>
42-
<a class="dropdown-item" href="/faculty_code/">Faculty Code Search</a>
16+
</style>
17+
<body>
18+
<nav class="navbar navbar-expand-lg" style="background-color: indigo">
19+
<a class="navbar-brand" id="uw_nav_link" href="#">ECE Advisor</a>
20+
<button
21+
class="navbar-toggler"
22+
type="button"
23+
data-toggle="collapse"
24+
data-target="#navbarSupportedContent"
25+
aria-controls="navbarSupportedContent"
26+
aria-expanded="false"
27+
aria-label="Toggle navigation"
28+
>
29+
<span class="navbar-toggler-icon"></span>
30+
</button>
31+
32+
<div class="collapse navbar-collapse" id="navbarSupportedContent">
33+
<ul class="navbar-nav mr-auto">
34+
<li class="nav-item active">
35+
<a class="nav-link" id="uw_nav_link" href="/"
36+
>Home <span class="sr-only">(current)</span></a
37+
>
38+
</li>
39+
<!-- STUDENTS MENU-->
40+
<li class="nav-item dropdown">
41+
<a
42+
class="nav-link dropdown-toggle"
43+
id="uw_nav_link"
44+
href="#"
45+
id="navbarDropdown"
46+
role="button"
47+
data-toggle="dropdown"
48+
aria-haspopup="true"
49+
aria-expanded="false"
50+
>
51+
Students
52+
</a>
53+
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
54+
<a class="dropdown-item" href="/student_info/">Student Info</a>
55+
<a class="dropdown-item" href="/#">Future Placeholder</a>
56+
<div class="dropdown-divider"></div>
57+
<a class="dropdown-item" href="/current_ee_undergrads/"
58+
>All EE Undergrads</a
59+
>
60+
</div>
61+
</li>
62+
<!-- FACULTY MENU-->
63+
<li class="nav-item dropdown">
64+
<a
65+
class="nav-link dropdown-toggle"
66+
id="uw_nav_link"
67+
href="#"
68+
id="navbarDropdown"
69+
role="button"
70+
data-toggle="dropdown"
71+
aria-haspopup="true"
72+
aria-expanded="false"
73+
>
74+
Faculty
75+
</a>
76+
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
77+
<a class="dropdown-item" href="/fac_crs_history/"
78+
>Faculty Course History</a
79+
>
80+
<a class="dropdown-item" href="/faculty_code/"
81+
>Faculty Code Search</a
82+
>
4383
<div class="dropdown-divider"></div>
4484
<a class="dropdown-item" href="/faculty_list/">Faculty List</a>
45-
</div>
46-
</li>
47-
<!-- COURSES MENU-->
48-
<li class="nav-item dropdown">
49-
<a class="nav-link dropdown-toggle" id="uw_nav_link" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
50-
Courses
51-
</a>
52-
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
53-
<a class="dropdown-item" href="/course_info/">Single Course Information</a>
54-
<a class="dropdown-item" href="/course_history/">Course History</a>
85+
</div>
86+
</li>
87+
<!-- COURSES MENU-->
88+
<li class="nav-item dropdown">
89+
<a
90+
class="nav-link dropdown-toggle"
91+
id="uw_nav_link"
92+
href="#"
93+
id="navbarDropdown"
94+
role="button"
95+
data-toggle="dropdown"
96+
aria-haspopup="true"
97+
aria-expanded="false"
98+
>
99+
Courses
100+
</a>
101+
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
102+
<a class="dropdown-item" href="/course_info/"
103+
>Single Course Information</a
104+
>
105+
<a class="dropdown-item" href="/course_history/"
106+
>Course History</a
107+
>
55108
<div class="dropdown-divider"></div>
56-
<a class="dropdown-item" href="/joint_courses/">Joint Courses Information</a>
57-
<a class="dropdown-item" href="https://docs.google.com/spreadsheets/d/1dZSb9V977hEZJcDBGMMfYigskvfT-h7EOpa7lqlmkjg/edit?usp=sharing">Shared Graduate Controls Courses Sheet</a>
58-
<a class="dropdown-item" href="https://docs.google.com/spreadsheets/d/10jmuvcsF0VRj008C3CCY4ImOicnbI2nwteR5yql_jDE/edit?usp=sharing">Stephanie's Historical Enrollment Sheet</a>
59-
<a class="dropdown-item" href="https://www.ece.uw.edu/wp-content/uploads/2022/05/Concentration-Areas-Chart-SUM2022.pdf">Concentrations Chart</a>
60-
<a class="dropdown-item" href="https://vannevar.ece.uw.edu/operations/advising/advising_tools/EE_Courses_Prereq_Tree.drawio.html">Prerequisite Flowchart</a>
61-
</div>
62-
</li>
63-
<li class="nav-item">
64-
<a class="nav-link disabled" href="#">Disabled</a>
65-
</li>
66-
</ul>
67-
<form class="form-inline my-2 my-lg-0" action="/student_info/">
68-
<input class="form-control mr-sm-2" id="sid" name="sid" aria-label="Search" placeholder="SID or Email">
69-
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
70-
</form>
71-
</div>
72-
</nav>
73-
<hr size="6" color="gold">
74-
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
75-
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
76-
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
77-
</body>
78-
{% block body %}
79-
{% endblock %}
80-
</html>
109+
<a class="dropdown-item" href="/joint_courses/"
110+
>Joint Courses Information</a
111+
>
112+
<a
113+
class="dropdown-item"
114+
href="https://docs.google.com/spreadsheets/d/1dZSb9V977hEZJcDBGMMfYigskvfT-h7EOpa7lqlmkjg/edit?usp=sharing"
115+
>Shared Graduate Controls Courses Sheet</a
116+
>
117+
<a
118+
class="dropdown-item"
119+
href="https://docs.google.com/spreadsheets/d/10jmuvcsF0VRj008C3CCY4ImOicnbI2nwteR5yql_jDE/edit?usp=sharing"
120+
>Stephanie's Historical Enrollment Sheet</a
121+
>
122+
<a
123+
class="dropdown-item"
124+
href="https://www.ece.uw.edu/wp-content/uploads/2022/05/Concentration-Areas-Chart-SUM2022.pdf"
125+
>Concentrations Chart</a
126+
>
127+
<a
128+
class="dropdown-item"
129+
href="https://vannevar.ece.uw.edu/operations/advising/advising_tools/EE_Courses_Prereq_Tree.drawio.html"
130+
>Prerequisite Flowchart</a
131+
>
132+
</div>
133+
</li>
134+
<li class="nav-item">
135+
<a class="nav-link disabled" href="#">Disabled</a>
136+
</li>
137+
</ul>
138+
<form class="form-inline my-2 my-lg-0" action="/student_info/">
139+
<input
140+
class="form-control mr-sm-2"
141+
id="sid"
142+
name="sid"
143+
aria-label="Search"
144+
placeholder="SID or Email"
145+
/>
146+
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">
147+
Search
148+
</button>
149+
</form>
150+
</div>
151+
</nav>
152+
<hr size="6" color="gold" />
153+
<script
154+
src="https://code.jquery.com/jquery-3.2.1.slim.min.js"
155+
integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
156+
crossorigin="anonymous"
157+
></script>
158+
<script
159+
src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js"
160+
integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
161+
crossorigin="anonymous"
162+
></script>
163+
<script
164+
src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"
165+
integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl"
166+
crossorigin="anonymous"
167+
></script>
168+
</body>
169+
{% block body %} {% endblock %}
170+
</html>

‎templates/shared/favicon.ico

11.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)