Skip to content
This repository has been archived by the owner on Sep 1, 2022. It is now read-only.

Add additional bus schedule from shuttlecock_o to subway #10

Merged
merged 6 commits into from
Apr 22, 2020
Merged

Add additional bus schedule from shuttlecock_o to subway #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
56aab55
change semester date due to corona-19
CXZ7720 Mar 27, 2020
a7ff6da
Add to json current timetable info field
CXZ7720 Mar 27, 2020
0dea304
Merge branch 'master' into DEV
CXZ7720 Apr 21, 2020
afce73d
Change timetable data - COVID19
CXZ7720 Apr 21, 2020
9cd8cec
Fix testscript error due to modified server structure
CXZ7720 Apr 21, 2020
d1216ad
Change timetable data - COVID19
CXZ7720 Apr 22, 2020
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
2 changes: 1 addition & 1 deletion index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const request = require('supertest');
const { expect } = require("chai");
const server = request.agent('http://localhost:8080');
const { app } = require("./index");
const { app } = require("./bin/www");



Expand Down
21 changes: 21 additions & 0 deletions timetable/vacation/week/Residence_week.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,47 @@
{
"residence_week": [
{ "time": "07:45", "type": "C" },
{ "time": "08:00", "type": "DH" },
{ "time": "08:15", "type": "C" },
{ "time": "08:30", "type": "DH" },
{ "time": "08:45", "type": "C" },
{ "time": "09:00", "type": "DH" },
{ "time": "09:15", "type": "C" },
{ "time": "09:30", "type": "DH" },
{ "time": "09:45", "type": "C" },
{ "time": "10:00", "type": "DH" },
{ "time": "10:15", "type": "C" },
{ "time": "10:30", "type": "DH" },
{ "time": "10:45", "type": "C" },
{ "time": "11:00", "type": "DH" },
{ "time": "11:15", "type": "C" },
{ "time": "11:30", "type": "DH" },
{ "time": "11:45", "type": "C" },
{ "time": "12:00", "type": "DH" },
{ "time": "12:15", "type": "C" },
{ "time": "12:30", "type": "DH" },
{ "time": "12:45", "type": "C" },
{ "time": "13:00", "type": "DH" },
{ "time": "13:15", "type": "C" },
{ "time": "13:30", "type": "DH" },
{ "time": "13:45", "type": "C" },
{ "time": "14:00", "type": "DH" },
{ "time": "14:15", "type": "C" },
{ "time": "14:30", "type": "DH" },
{ "time": "14:45", "type": "C" },
{ "time": "15:00", "type": "DH" },
{ "time": "15:15", "type": "C" },
{ "time": "15:30", "type": "DH" },
{ "time": "15:45", "type": "C" },
{ "time": "16:00", "type": "DH" },
{ "time": "16:15", "type": "C" },
{ "time": "16:30", "type": "DH" },
{ "time": "16:45", "type": "C" },
{ "time": "17:00", "type": "DH" },
{ "time": "17:15", "type": "C" },
{ "time": "17:30", "type": "DH" },
{ "time": "17:45", "type": "C" },
{ "time": "18:00", "type": "DH" },
{ "time": "18:15", "type": "C" },
{ "time": "18:45", "type": "C" },
{ "time": "19:15", "type": "C" },
Expand Down
22 changes: 22 additions & 0 deletions timetable/vacation/week/Shuttlecock_I_week.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,49 @@
{
"shuttlecock_i_week": [
{ "time": "08:15", "type": "NA" },
{ "time": "08:25", "type": "NA" },
{ "time": "08:45", "type": "NA" },
{ "time": "08:55", "type": "NA" },
{ "time": "09:15", "type": "NA" },
{ "time": "09:25", "type": "NA" },
{ "time": "09:45", "type": "NA" },
{ "time": "09:55", "type": "NA" },
{ "time": "10:15", "type": "R" },
{ "time": "10:25", "type": "R" },
{ "time": "10:45", "type": "R" },
{ "time": "10:55", "type": "R" },
{ "time": "11:15", "type": "R" },
{ "time": "11:25", "type": "R" },
{ "time": "11:45", "type": "R" },
{ "time": "11:55", "type": "R" },
{ "time": "12:15", "type": "R" },
{ "time": "12:25", "type": "R" },
{ "time": "12:45", "type": "R" },
{ "time": "12:55", "type": "R" },
{ "time": "13:15", "type": "R" },
{ "time": "13:25", "type": "R" },
{ "time": "13:45", "type": "R" },
{ "time": "13:55", "type": "R" },
{ "time": "14:15", "type": "R" },
{ "time": "14:25", "type": "R" },
{ "time": "14:45", "type": "R" },
{ "time": "14:55", "type": "R" },
{ "time": "15:15", "type": "R" },
{ "time": "15:25", "type": "R" },
{ "time": "15:45", "type": "R" },
{ "time": "15:55", "type": "R" },
{ "time": "16:15", "type": "R" },
{ "time": "16:25", "type": "R" },
{ "time": "16:45", "type": "R" },
{ "time": "16:55", "type": "R" },
{ "time": "17:15", "type": "R" },
{ "time": "17:25", "type": "R" },
{ "time": "17:45", "type": "R" },
{ "time": "17:55", "type": "R" },
{ "time": "18:15", "type": "R" },
{ "time": "18:25", "type": "R" },
{ "time": "18:45", "type": "R" },
{ "time": "18:55", "type": "R" },
{ "time": "19:15", "type": "R" },
{ "time": "19:45", "type": "R" },
{ "time": "20:15", "type": "R" },
Expand Down
22 changes: 22 additions & 0 deletions timetable/vacation/week/Shuttlecock_O_week.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,49 @@
{
"shuttlecock_o_week": [
{ "time": "07:50", "type": "C" },
{ "time": "08:05", "type": "DH" },
{ "time": "08:20", "type": "C" },
{ "time": "08:35", "type": "DH" },
{ "time": "08:50", "type": "C" },
{ "time": "09:05", "type": "DH" },
{ "time": "09:20", "type": "C" },
{ "time": "09:35", "type": "DH" },
{ "time": "09:50", "type": "C" },
{ "time": "10:05", "type": "DH" },
{ "time": "10:20", "type": "C" },
{ "time": "10:35", "type": "DH" },
{ "time": "10:50", "type": "C" },
{ "time": "11:05", "type": "DH" },
{ "time": "11:20", "type": "C" },
{ "time": "11:35", "type": "DH" },
{ "time": "11:50", "type": "C" },
{ "time": "12:05", "type": "DH" },
{ "time": "12:20", "type": "C" },
{ "time": "12:35", "type": "DH" },
{ "time": "12:50", "type": "C" },
{ "time": "13:05", "type": "DH" },
{ "time": "13:20", "type": "C" },
{ "time": "13:35", "type": "DH" },
{ "time": "13:50", "type": "C" },
{ "time": "14:05", "type": "DH" },
{ "time": "14:20", "type": "C" },
{ "time": "14:35", "type": "DH" },
{ "time": "14:50", "type": "C" },
{ "time": "15:05", "type": "DH" },
{ "time": "15:20", "type": "C" },
{ "time": "15:35", "type": "DH" },
{ "time": "15:50", "type": "C" },
{ "time": "16:05", "type": "DH" },
{ "time": "16:20", "type": "C" },
{ "time": "16:35", "type": "DH" },
{ "time": "16:50", "type": "C" },
{ "time": "17:05", "type": "DH" },
{ "time": "17:20", "type": "C" },
{ "time": "17:35", "type": "DH" },
{ "time": "17:50", "type": "C" },
{ "time": "18:05", "type": "DH" },
{ "time": "18:20", "type": "C" },
{ "time": "18:35", "type": "DH" },
{ "time": "18:50", "type": "C" },
{ "time": "19:20", "type": "C" },
{ "time": "19:50", "type": "C" },
Expand Down
20 changes: 20 additions & 0 deletions timetable/vacation/week/Subway_week.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,45 @@
{
"subway_week": [
{ "time": "08:00", "type": "C" },
{ "time": "08:15", "type": "" },
{ "time": "08:30", "type": "C" },
{ "time": "08:45", "type": "" },
{ "time": "09:00", "type": "C" },
{ "time": "09:15", "type": "" },
{ "time": "09:30", "type": "C" },
{ "time": "09:45", "type": "" },
{ "time": "10:00", "type": "C" },
{ "time": "10:15", "type": "" },
{ "time": "10:30", "type": "C" },
{ "time": "10:45", "type": "" },
{ "time": "11:00", "type": "C" },
{ "time": "11:15", "type": "" },
{ "time": "11:30", "type": "C" },
{ "time": "11:45", "type": "" },
{ "time": "12:00", "type": "C" },
{ "time": "12:15", "type": "" },
{ "time": "12:30", "type": "C" },
{ "time": "12:45", "type": "" },
{ "time": "13:00", "type": "C" },
{ "time": "13:15", "type": "" },
{ "time": "13:30", "type": "C" },
{ "time": "13:45", "type": "" },
{ "time": "14:00", "type": "C" },
{ "time": "14:15", "type": "" },
{ "time": "14:30", "type": "C" },
{ "time": "14:45", "type": "" },
{ "time": "15:00", "type": "C" },
{ "time": "15:15", "type": "" },
{ "time": "15:30", "type": "C" },
{ "time": "15:45", "type": "" },
{ "time": "16:00", "type": "C" },
{ "time": "16:15", "type": "" },
{ "time": "16:30", "type": "C" },
{ "time": "16:45", "type": "" },
{ "time": "17:00", "type": "C" },
{ "time": "17:15", "type": "" },
{ "time": "17:30", "type": "C" },
{ "time": "17:45", "type": "" },
{ "time": "18:00", "type": "C" },
{ "time": "18:30", "type": "C" },
{ "time": "19:00", "type": "C" },
Expand Down