core update, schedule router update, schedule populator update, collective update, other

This commit is contained in:
tmshv committed 2016-02-25 03:29:03 +03:00
1 parent 7d97953877
commit f3aaf5a547
8 files changed
+113 -178

No files matched your search

+6 -33
View File
@@ -1,36 +1,9 @@
//getPersonByID
export function person(collective, id){
for(var i=0; i<collective.length; i++){
var p = collective[i];
if(p.id == id){
return p;
}
}
return null;
export function shortifyName(name) {
let $ = i => i.replace(/^(.).+/, '$1');
let [_, first, middle, last] = splitName(name);
return `${$(first)}. ${$(middle)}. ${last}`;
}
//getNameByID
export function name(collective, id){
var p = person(collective, id);
if(p) return p.name;
else return null;
}
//getShortNameByID
export function short(collective, id){
var n = name(collective, id);
if(n) return shortifyName(n);
else return null;
}
export function shortifyName(name){
var m = splitName(name);
var n = m[1].replace(/^(.).+/, "$1. ") +
m[2].replace(/^(.).+/, "$1. ") +
m[3];
return n;
}
export function splitName(name){
return /(.+)\s(.+)\s(.+)/.exec(name);
export function splitName(name) {
return /(.+)\s(.+)\s(.+)/.exec(name);
}
+9 -30
View File
@@ -1,33 +1,12 @@
export const courses = [
{
"id": "painting",
"name": "Живопись"
},
{
"id": "drawing",
"name": "Рисунок"
},
{
"id": "sculpting",
"name": "Скульптура"
},
{
"id": "ceramic",
"name": "Керамика"
},
{
"id": "composition",
"name": "Композиция"
},
{
"id": "history",
"name": "История искусства"
},
{
"id": "cg",
"name": "Комп. графика"
}
];
export const courses = {
painting: "Живопись",
drawing: "Рисунок",
sculpting: "Скульптура",
ceramic: "Керамика",
composition: "Композиция",
history: "История искусства",
cg: "Комп. графика"
};
export function getCourseByID(id){
for(var i=0; i<courses.length; i++){
+4 -61
View File
@@ -1,62 +1,5 @@
var pop = require("../utils/populate").pop;
let tryReplace = (dict, record, map = i=>i) =>
record in dict ? map(dict[record]) : record;
const WEEK = ["monday", "tuesday", "wednesday", "thursday", "friday", "saturday"];
module.exports = {
populate: populateSchedule
};
function populateSchedule(s, pops) {
var days = function (group) {
var result = [];
WEEK.forEach(function (i) {
var lesson = group[i];
if (lesson) {
result.push(
pop(lesson)
.populate(time())
.populate(pops)
.result()
)
} else {
result.push(null);
}
});
return result;
};
var time = function () {
return function (lesson) {
for (var i = 0; i < lesson.time.length; i++) {
lesson.time[i] = lesson.time[i].replace(" ", "—");
}
return lesson;
}
};
var mondayTime = function (group) {
var day;
for (var i = 0; i < WEEK.length; i++) {
if (group[WEEK[i]]) {
day = WEEK[i];
break;
}
}
if (day) {
return group[day].time[0].substr(0, 5);
} else {
return "00:00"
}
};
var result = [];
s.forEach(function (group) {
result.push({
name: group.name,
days: days(group),
time: mondayTime(group)
});
});
return result;
}
export const populate = (dict, map) =>
id => tryReplace(dict, id, map);