Skip to content

Commit

Permalink
Merge pull request #342 from senior-knights/test/merge-feature-into-d…
Browse files Browse the repository at this point in the history
…evelop

Merge updated-evening-schedule into develop
  • Loading branch information
SophiaSun18 authored Nov 16, 2023
2 parents caaf577 + c21fe49 commit e939042
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
14 changes: 9 additions & 5 deletions client-course-schedulizer/src/data/times.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"duration": [50, 65]},

{"day": ["M", "T", "TH"],
"time": ["18:30", "19:45"],
"time": ["19:00", "20:15"],
"duration": [65]},

{"day": ["T", "TH"],
Expand All @@ -20,22 +20,26 @@

{"day": ["M", "T", "TH"],
"time": ["18:30"],
"duration": [210, 100, 90, 65, 50]},
"duration": [210]},

{"day": ["M", "T", "TH"],
"time": ["19:00"],
"duration": [100, 90, 65, 50]},

{"day": ["M", "T", "TH"],
"time": ["20:20"],
"duration": [100]},

{"day": ["M", "W", "F"],
"time": ["8:00", "11:00", "13:30", "18:30"],
"time": ["8:00", "11:00", "13:30", "19:00"],
"duration": [120]},

{"day": ["M", "T", "W", "TH"],
"time": ["8:00", "12:30", "18:30"],
"duration": [180]},

{"day": ["M", "T", "W", "TH"],
"time": ["8:00", "11:15", "14:30", "18:30"],
"time": ["8:00", "11:15", "14:30", "19:00"],
"duration": [170]},

{"day": ["F"],
Expand All @@ -47,7 +51,7 @@
"duration": [80]},

{"day": ["M", "T", "W", "TH", "F"],
"time": ["8:00", "9:30", "11:00", "13:00", "14:30", "16:00", "18:30"],
"time": ["8:00", "9:30", "11:00", "13:00", "14:30", "16:00", "19:00"],
"duration": [80]},

{"day": ["T", "W", "TH"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ export const getTimes = (schedule: Schedule): string[] => {
"15:30",
"16:30",
"18:30",
"19:00",
];
};

0 comments on commit e939042

Please sign in to comment.