Skip to content

Commit 555f461

Browse files
ScriptPupScriptPup
authored andcommitted
Altered schedules folder structures
1 parent 721fcb7 commit 555f461

File tree

4 files changed

+51
-19
lines changed

4 files changed

+51
-19
lines changed

files/schedules/test/test.json

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"selected_schedule": "Example",
3+
"class_info": {
4+
"name": "Example",
5+
"days": "4",
6+
"hours_in_day": 9
7+
},
8+
"scheduled": {
9+
"test": {
10+
"class_type": "Instructor Lead",
11+
"updated": 1495121337251,
12+
"entries": [{
13+
"title": "Day 1",
14+
"start_time": "08:00",
15+
"items": []
16+
}, {
17+
"title": "Day 2",
18+
"start_time": "08:00",
19+
"items": []
20+
}, {
21+
"title": "Day 3",
22+
"start_time": "08:00",
23+
"items": []
24+
}, {
25+
"title": "Day 4",
26+
"start_time": "08:00",
27+
"items": []
28+
}
29+
]
30+
}
31+
}
32+
}
File renamed without changes.

js/main.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,22 @@ $(function(){
2626
}
2727

2828
if(schedules_exist){
29-
fs.readdir(schedules_path,function(err,file_list){
30-
for(var i=0; i<file_list.length; i++){
31-
var li = $('<li class="tile"><img /><a></a></li>'),
32-
baseName = path.basename(file_list[i],'.json'),
33-
imgPath = path.join(cwd,"schedules",path.basename(file_list[i],'.json')+".png"),
34-
imgTest = fs.existsSync(imgPath);
35-
if(path.extname(file_list[i]) !== '.json'){ continue; }
36-
li.find('a')
37-
.attr('href', "#"+baseName)
38-
.text(baseName);
39-
li.appendTo(ul);
40-
if(imgTest){
41-
li.find('img').attr('src', imgPath);
42-
} else {
43-
li.find('img').attr('src','./css/img/default_tile.png');
44-
}
29+
fs.readdir(schedules_path,function(err,folder_list){
30+
for(var i=0; i<folder_list.length; i++){
31+
if(!folder_list || folder_list === "undefined" || folder_list == null){ continue; }
32+
var li = $('<li class="tile"><img /><a></a></li>'),
33+
baseName = folder_list[i],
34+
imgPath = path.join(cwd,"schedules",folder_list[i],baseName+".png"),
35+
imgTest = fs.existsSync(imgPath);
36+
li.find('a')
37+
.attr('href', "#"+baseName)
38+
.text(baseName);
39+
li.appendTo(ul);
40+
if(imgTest){
41+
li.find('img').attr('src', imgPath);
42+
} else {
43+
li.find('img').attr('src','./css/img/default_tile.png');
44+
}
4545
}
4646
$('.list').on('click', function(e){
4747
if(e.target.tagName === 'A'){

js/schedule.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ Schedule = function(){
3030
Schedule.prototype = {
3131
load: function(file,cb){
3232
var Self = this;
33-
Self.path = path.join(cwd,"schedules",file+".json");
33+
Self.path = path.join(cwd,"schedules",file,file+".json");
3434
fs.readFile(path.join(Self.path), 'utf8', function(err,data){
3535
Self.data = JSON.parse(data);
3636
Self.schedule = null;
3737
if(Self.data.class_info.hasOwnProperty('icon')){
38-
fs.lstat(path.join(cwd,"schedules",Self.data.class_info.icon), function(err,pic){
38+
fs.lstat(path.join(cwd,"schedules",file,Self.data.class_info.icon), function(err,pic){
3939
Self.img = pic;
40-
Self.imgPath = path.join(cwd,"schedules",Self.data.class_info.icon);
40+
Self.imgPath = path.join(cwd,"schedules",file,Self.data.class_info.icon);
4141
cb();
4242
});
4343
}

0 commit comments

Comments
 (0)