Skip to content
This repository has been archived by the owner on May 29, 2024. It is now read-only.

Update courses to spring 2022 #11

Merged
merged 4 commits into from
Nov 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 4 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,19 @@ TODO

## Updating for a new semester

Make a new branch, e.g. `sp16` , then make the following changes to `settings/common.py` , landing, and status pages:
Make a new branch, e.g. `sp-22` , then make the following changes to `settings/common.py` , landing, and status pages:

https://github.com/maximz/recal/commit/4dbc0684c132051cc4ed72dc7efae92a8b9949cd
https://github.com/recalapp/recal/commit/1464d5922f3a1fcc0d756565a3a0e8689e9e154d

Test out on test-recal:


git remote add dev https://git.heroku.com/test-recal.git
git push dev sp16:master
git push dev sp-22:master
heroku run python manage.py course_selection_courses_init --app=test-recal
# heroku run python manage.py clear_cache --app=test-recal # not needed but may help

Test at test-recal.herokuapp.com.

If good, then add a message to the main page: https://github.com/maximz/recal/commit/8bc566f7b8cd45f351b90d4294bbebf883c22baa

Then merge `sp16` into `master` , and deploy as follows:


git push origin master
git remote add prod https://git.heroku.com/newice.git
git push prod master
heroku run python manage.py course_selection_courses_init --app=newice
Test at test-recal.herokuapp.com. If good, merge `sp-22` into `master`, which will auto-deploy to recal.io.

Then, test on recal.io.
And bump number of dynos.
Expand Down
4 changes: 2 additions & 2 deletions course_selection/templates/landing/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Pick your Princeton Fall 2021 courses on ReCal.">
<meta name="description" content="Pick your Princeton Spring 2022 courses on ReCal.">
<meta name="author" content="ReCal">
<meta name="apple-itunes-app" content="app-id=946948041, app-argument=recalCourseSelection://launch">

<title>Fall 2021 Course Selection | ReCal</title>
<title>Spring 2022 Course Selection | ReCal</title>

<!-- Bootstrap core CSS -->
<link rel="stylesheet" href="{% static 'landing/css/bootstrap.css' %}">
Expand Down
2 changes: 1 addition & 1 deletion course_selection/templates/main/semester-tabs.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="container" style="position: fixed; width: 25%; z-index: 1000; bottom: 100px; left: 20px; margin-bottom: 10px">
<div class="alert alert-success alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<b>2021 Fall Courses Updated!</b> We have added the 2021 Fall courses to ReCal. Thank you for your patience.
<b>Spring 2022 Courses Updated!</b> We have added the Spring 2022 courses to ReCal. Thank you for your patience.
</div>
</div>
<div ng-controller="SemCtrl as semCtrl" id="semesterContainer">
Expand Down
20 changes: 20 additions & 0 deletions course_selection/templates/status/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,26 @@ <h1>Current Status & Incident Reports</h1>
<div class="timeline">
<div class="content-wrapper">
<div class="moment first">
<div class="row event clearfix">
<div class="col-sm-1">
<div class="status-icon status-4" data-toggle="tooltip" title="Updates!" data-placement="left">
<i class="icon ion-upload"></i>
</div>
</div>
<div class="col-xs-10 col-xs-offset-2 col-sm-11 col-sm-offset-0">
<div class="panel panel-message">
<div class="panel-heading">
<strong>November 4, 2021 - Course Updates</strong>
<br>
</div>
<div class="panel-body">
<p>Spring 2022 courses are here!</p>
</div>
</div>
</div>
</div>
</div>
<div class="moment">
<div class="row event clearfix">
<div class="col-sm-1">
<div class="status-icon status-4" data-toggle="tooltip" title="Updates!" data-placement="left">
Expand Down
4 changes: 2 additions & 2 deletions settings/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,9 @@
# Similarly, the Spring 2017 term is 1174 - the ending year is 2017.
# Note: generally, limit this to three terms. This defines the terms that are
# scraped and the default terms displayed on schedules.
ACTIVE_TERMS = [1212, 1214, 1222]
ACTIVE_TERMS = [1214, 1222, 1224]

# TODO: is this still used? if not, we can remove it
# Use helper method nice.models.get_cur_semester() to get current Semester
# object.
CURR_TERM = 1222
CURR_TERM = 1224