FUCKING BIG UPDATE: server, parallax, apis, new data models, style, layout, other
This commit is contained in:
1 parent
e0f54171a9
commit
359cc430f5
78 files changed
+1063
-445
No files matched your search
+19
-7
@@ -1,7 +1,8 @@
|
||||
import co from 'co';
|
||||
import {c} from '../core/db';
|
||||
import {getCollective} from './collective';
|
||||
|
||||
import {populate} from '../models/schedule';
|
||||
import {populate, scheduleDate} from '../models/schedule';
|
||||
import {shortifyName} from '../models/collective';
|
||||
import {courses} from '../models/course';
|
||||
|
||||
@@ -15,9 +16,16 @@ export function* getSchedule(period, semester) {
|
||||
}
|
||||
|
||||
export function* getScheduleList() {
|
||||
return yield c('schedules')
|
||||
let list = yield c('schedules')
|
||||
.find({}, {period: 1, semester: 1})
|
||||
.toArray();
|
||||
return list
|
||||
.sort((a, b) => {
|
||||
let ad = scheduleDate(a);
|
||||
let bd = scheduleDate(b);
|
||||
|
||||
return ad.getTime() - bd.getTime();
|
||||
});
|
||||
}
|
||||
|
||||
export function* populateSchedule(schedule) {
|
||||
@@ -30,11 +38,11 @@ export function* populateSchedule(schedule) {
|
||||
let populateLesson = populate(courses);
|
||||
let populateTeacher = populate(collective_dict, i => shortifyName(i));
|
||||
|
||||
return schedule.map(group => {
|
||||
return schedule.map(i => {
|
||||
return {
|
||||
name: group.name,
|
||||
time: group.time,
|
||||
days: group.days.map(record => {
|
||||
group: i.group,
|
||||
time: i.time,
|
||||
week: i.week.map(record => {
|
||||
if (!record) return record;
|
||||
|
||||
let lesson = record.lesson;
|
||||
@@ -44,7 +52,11 @@ export function* populateSchedule(schedule) {
|
||||
return {
|
||||
time: time,
|
||||
lesson: populateLesson(lesson),
|
||||
teacher: populateTeacher(teacher)
|
||||
teacher: {
|
||||
id: teacher,
|
||||
url: `/teacher/${teacher}`,
|
||||
name: populateTeacher(teacher)
|
||||
}
|
||||
};
|
||||
})
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user