Skip to content

Update cs1101s claims script for AY18/19 #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yangshun merged 8 commits into from
Nov 20, 2018
Merged

Update cs1101s claims script for AY18/19 #23

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c402da0
Update cs1101s for AY17/18
yyc Nov 24, 2017
904f821
Updated claims to check for DG Number
yyc Nov 24, 2017
6d46dd7
Merge branch 'master' of github.com:nusmodifications/nus-scripts
yyc Nov 19, 2018
5a482e1
Amend cs1101s script to account for variable hours
yyc Nov 19, 2018
04c43cc
add in default 12 hours
yyc Nov 19, 2018
f555f58
off by one erros
yyc Nov 19, 2018
994f27e
JS MONTHS ARE 0-INDEXED
yyc Nov 19, 2018
a6d9d0f
Add variable studio timing and better documentation
yyc Nov 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
off by one erros
  • Loading branch information
@yyc
yyc committed Nov 19, 2018
commit f555f580c88a1d22de3324436f2d4131d1132cd4
12 changes: 6 additions & 6 deletions claims/module-claims/claim-cs1101s.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,34 +102,34 @@ var config = {
var consultation_hours_division = split_hours(consultation_hours, 12);

for (var week = 1; week <= 13; week++) {
if (mission_hours_division[week] > 0) {
if (mission_hours_division[week - 1] > 0) {
activities_list.push({
activity_type: Claim.COURSE_MATERIAL_PREPARATION,
week: week,
day: 'SUNDAY',
start_time: '1000',
end_time: `1${mission_hours_division[week]}00`,
end_time: `1${mission_hours_division[week - 1]}00`,
});
}

if (week > 1) {
// Only have grading and consultations for 12 weeks
if (grading_hours_division[week - 1] > 0) {
if (grading_hours_division[week - 2] > 0) {
activities_list.push({
activity_type: Claim.ASSIGNMENT_MARKING,
week: week,
day: 'SATURDAY',
start_time: '1000',
end_time: `1${grading_hours_division[week - 1]}00`,
end_time: `1${grading_hours_division[week - 2]}00`,
});
}
if (consultation_hours_division[week - 1] > 0) {
if (consultation_hours_division[week - 2] > 0) {
activities_list.push({
activity_type: Claim.CONSULTATION,
week: week,
day: 'TUESDAY',
start_time: '1000',
end_time: `1${consultation_hours_division[week - 1]}00`,
end_time: `1${consultation_hours_division[week - 2]}00`,
});
}
activities_list.push({
Expand Down