Skip to content

Commit

Permalink
Merge pull request #227 from yk1ax/update-timetable
Browse files Browse the repository at this point in the history 
Updated timetable for it1sem, cs1sem, csai1sem
  • Loading branch information
@GOVINDDIXIT
GOVINDDIXIT authored Dec 12, 2020
2 parents 9475545 + bff5795 commit 577ddbd
Show file tree
Hide file tree
Showing 12 changed files with 503 additions and 81 deletions.
107 changes: 73 additions & 34 deletions app/src/main/assets/timetable/cs1sem.json
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,86 @@
{
"Monday": {
"9:00-10:00": "SM130",
"10:00-11:00": "FEE132",
"11:00-11:15": "Break",
"11:15-12:15": "LA130",
"12:15-1:15": "IITP132",
"1:15-3:00": "Lunch",
"3:00-6:00": "FEE132 LAB"
"08:00-09:00": "-",
"09:00-10:00": "PC130",
"10:00-11:00": "-",
"11:00-12:00": "Calc",
"12:00-12:15": "Break",
"12:15-13:15": "IITP132",
"14:00-15:00": "IITP132 LAB",
"15:00-16:00": "IITP132 LAB",
"16:00-17:00": "-",
"17:00-18:00": "-"
},
"Tuesday": {
"9:00-10:00": "SM130",
"10:00-11:00": "LA130",
"11:00-11:15": "Break",
"11:15-12:15": "FEE132",
"12:15-1:15": "IITP132",
"1:15-3:00": "Lunch",
"3:00-6:00": "IITP132 LAB"
"08:00-09:00": "-",
"09:00-10:00": "IITP132",
"10:00-11:00": "-",
"11:00-12:00": "Calc",
"12:00-12:15": "Break",
"12:15-13:15": "",
"14:00-15:00": "",
"15:00-16:00": "IITP132 LAB",
"16:00-17:00": "IITP132 LAB",
"17:00-18:00": ""
},
"Wednesday": {
"9:00-10:00": "IITP132",
"10:00-11:00": "PC130",
"11:00-11:15": "Break",
"11:15-12:15": "LA130",
"12:15-1:15": "FEE132",
"1:15-3:00": "Lunch",
"3:00-6:00": "-"
"08:00-09:00": "Sports-1",
"09:00-10:00": "FEE132",
"10:00-11:00": "IITP132",
"11:00-12:00": "Calc",
"12:00-12:15": "Break",
"12:15-13:15": "",
"14:00-15:00": "",
"15:00-16:00": "FEE132 LAB",
"16:00-17:00": "FEE132 LAB",
"17:00-18:00": ""
},
"Thursday": {
"9:00-10:00": "PC130",
"10:00-11:00": "SM130",
"11:00-11:15": "Break",
"11:15-12:15": "-",
"12:15-1:15": "-",
"1:15-3:00": "Lunch",
"3:00-6:00": "-"
"08:00-09:00": "Sports-1",
"09:00-10:00": "FEE132",
"10:00-11:00": "-",
"11:00-12:00": "PC130",
"12:00-12:15": "Break",
"12:15-13:15": "-",
"14:00-15:00": "-",
"15:00-16:00": "-",
"16:00-17:00": "-",
"17:00-18:00": "-"
},
"Friday": {
"9:00-10:00": "PC130",
"08:00-09:00": "Sports-1",
"09:00-10:00": "FEE132",
"10:00-11:00": "-",
"11:00-12:00": "PC130",
"12:00-12:15": "Break",
"12:15-13:15": "FEE132 LAB",
"14:00-15:00": "FEE132 LAB",
"15:00-16:00": "-",
"16:00-17:00": "-",
"17:00-18:00": "-"
},
"Saturday": {
"08:00-09:00": "-",
"09:00-10:00": "SM130",
"10:00-11:00": "-",
"11:00-12:00": "-",
"12:00-12:15": "Break",
"12:15-13:15": "-",
"14:00-15:00": "SM130 LAB",
"15:00-16:00": "SM130 LAB",
"16:00-17:00": "-",
"17:00-18:00": "-"
},
"Sunday": {
"08:00-09:00": "-",
"09:00-10:00": "-",
"10:00-11:00": "-",
"11:00-11:15": "Break",
"11:15-12:15": "-",
"12:15-1:15": "-",
"1:15-3:00": "Lunch",
"3:00-6:00": "-"
"11:00-12:00": "SM130",
"12:00-12:15": "Break",
"12:15-13:15": "SM130",
"14:00-15:00": "SM130 LAB",
"15:00-16:00": "SM130 LAB",
"16:00-17:00": "-",
"17:00-18:00": "-"
}
}
86 changes: 86 additions & 0 deletions app/src/main/assets/timetable/csai1sem.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
{
"Monday": {
"08:00-09:00": "-",
"09:00-10:00": "PC130",
"10:00-11:00": "-",
"11:00-12:00": "Calc",
"12:00-12:15": "Break",
"12:15-13:15": "IITP132",
"14:00-15:00": "IITP132 LAB",
"15:00-16:00": "IITP132 LAB",
"16:00-17:00": "-",
"17:00-18:00": "-"
},
"Tuesday": {
"08:00-09:00": "-",
"09:00-10:00": "IITP132",
"10:00-11:00": "-",
"11:00-12:00": "Calc",
"12:00-12:15": "Break",
"12:15-13:15": "",
"14:00-15:00": "",
"15:00-16:00": "IITP132 LAB",
"16:00-17:00": "IITP132 LAB",
"17:00-18:00": ""
},
"Wednesday": {
"08:00-09:00": "Sports-1",
"09:00-10:00": "FEE132",
"10:00-11:00": "IITP132",
"11:00-12:00": "Calc",
"12:00-12:15": "Break",
"12:15-13:15": "",
"14:00-15:00": "",
"15:00-16:00": "FEE132 LAB",
"16:00-17:00": "FEE132 LAB",
"17:00-18:00": ""
},
"Thursday": {
"08:00-09:00": "Sports-1",
"09:00-10:00": "FEE132",
"10:00-11:00": "-",
"11:00-12:00": "PC130",
"12:00-12:15": "Break",
"12:15-13:15": "-",
"14:00-15:00": "-",
"15:00-16:00": "-",
"16:00-17:00": "-",
"17:00-18:00": "-"
},
"Friday": {
"08:00-09:00": "Sports-1",
"09:00-10:00": "FEE132",
"10:00-11:00": "-",
"11:00-12:00": "PC130",
"12:00-12:15": "Break",
"12:15-13:15": "FEE132 LAB",
"14:00-15:00": "FEE132 LAB",
"15:00-16:00": "-",
"16:00-17:00": "-",
"17:00-18:00": "-"
},
"Saturday": {
"08:00-09:00": "-",
"09:00-10:00": "SM130",
"10:00-11:00": "-",
"11:00-12:00": "-",
"12:00-12:15": "Break",
"12:15-13:15": "-",
"14:00-15:00": "SM130 LAB",
"15:00-16:00": "SM130 LAB",
"16:00-17:00": "-",
"17:00-18:00": "-"
},
"Sunday": {
"08:00-09:00": "-",
"09:00-10:00": "-",
"10:00-11:00": "-",
"11:00-12:00": "SM130",
"12:00-12:15": "Break",
"12:15-13:15": "SM130",
"14:00-15:00": "SM130 LAB",
"15:00-16:00": "SM130 LAB",
"16:00-17:00": "-",
"17:00-18:00": "-"
}
}
105 changes: 72 additions & 33 deletions app/src/main/assets/timetable/it1sem.json
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,86 @@
{
"Monday": {
"9:00-10:00": "LA132",
"08:00-09:00": "Sports-1",
"09:00-10:00": "Calc",
"10:00-11:00": "IITP132",
"11:00-11:15": "Break",
"11:15-12:15": "SM130",
"12:15-1:15": "FEE132",
"1:15-3:00": "Lunch",
"3:00-6:00": "-"
"11:00-12:00": "-",
"12:00-12:15": "Break",
"12:15-13:15": "-",
"14:00-15:00": "FEE132",
"15:00-16:00": "-",
"16:30-17:30": "IITP132 LAB",
"17:30-18:30": "IITP132 LAB"
},
"Tuesday": {
"9:00-10:00": "FEE132",
"08:00-09:00": "Sports-1",
"09:00-10:00": "Calc",
"10:00-11:00": "PC130",
"11:00-11:15": "Break",
"11:15-12:15": "IITP132",
"12:15-1:15": "SM130",
"1:15-3:00": "Lunch",
"3:00-6:00": "IITP132 LAB"
"11:00-12:00": "IITP132",
"12:00-12:15": "Break",
"12:15-13:15": "-",
"14:00-15:00": "-",
"15:00-16:00": "-",
"16:30-17:30": "-",
"17:30-18:30": "-"
},
"Wednesday": {
"9:00-10:00": "LA130",
"10:00-11:00": "FEE132",
"11:00-11:15": "Break",
"11:15-12:15": "SM130",
"12:15-1:15": "IITP132",
"1:15-3:00": "Lunch",
"3:00-6:00": "FEE132 LAB"
"08:00-09:00": "Sports-1",
"09:00-10:00": "Calc",
"10:00-11:00": "-",
"11:00-12:00": "-",
"12:00-12:15": "Break",
"12:15-13:15": "IITP132",
"14:00-15:00": "-",
"15:00-16:00": "FEE132 LAB",
"16:30-17:30": "FEE132 LAB",
"17:30-18:30": "-"
},
"Thursday": {
"9:00-10:00": "LA130",
"10:00-11:00": "PC130",
"11:00-11:15": "Break",
"11:15-12:15": "-",
"12:15-1:15": "-",
"1:15-3:00": "Lunch",
"3:00-6:00": "-"
"08:00-09:00": "-",
"09:00-10:00": "PC130",
"10:00-11:00": "-",
"11:00-12:00": "FEE132",
"12:00-12:15": "Break",
"12:15-13:15": "-",
"14:00-15:00": "-",
"15:00-16:00": "-",
"16:30-17:30": "FEE132 LAB",
"17:30-18:30": "FEE132 LAB"
},
"Friday": {
"9:00-10:00": "-",
"10:00-11:00": "PC130",
"11:00-11:15": "Break",
"11:15-12:15": "-",
"12:15-1:15": "-",
"1:15-3:00": "Lunch",
"3:00-6:00": "-"
"08:00-09:00": "-",
"09:00-10:00": "PC130",
"10:00-11:00": "-",
"11:00-12:00": "FEE132",
"12:00-12:15": "Break",
"12:15-13:15": "-",
"14:00-15:00": "-",
"15:00-16:00": "-",
"16:30-17:30": "FEE132 LAB",
"17:30-18:30": "FEE132 LAB"
},
"Saturday": {
"08:00-09:00": "-",
"09:00-10:00": "-",
"10:00-11:00": "SM130",
"11:00-12:00": "-",
"12:00-12:15": "Break",
"12:15-13:15": "-",
"14:00-15:00": "-",
"15:00-16:00": "-",
"16:30-17:30": "SM130 LAB",
"17:30-18:30": "SM130 LAB"
},
"Sunday": {
"08:00-09:00": "-",
"09:00-10:00": "SM130",
"10:00-11:00": "SM130",
"11:00-12:00": "-",
"12:00-12:15": "Break",
"12:15-13:15": "-",
"14:00-15:00": "-",
"15:00-16:00": "-",
"16:30-17:30": "SM130 LAB",
"17:30-18:30": "SM130 LAB"
}
}
29 changes: 28 additions & 1 deletion app/src/main/java/govind/iiitl/app/activities/AskDetailActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,34 @@ public void onClick(View view) {
conc = "it8sem.json";
break;
}
}else {
}else if(course.equals("CSAI (B.Tech)")){
switch (yearse) {
case "1":
conc = "csai1sem.json";
break;
// case "2":
// conc = "csai2sem.json";
// break;
// case "3":
// conc = "csai3sem.json";
// break;
// case "4":
// conc = "csai4sem.json";
// break;
// case "5":
// conc = "csai5sem.json";
// break;
// case "6":
// conc = "csai6sem.json";
// break;
// case "7":
// conc = "csai7sem.json";
// break;
default:
conc = "cs2sem.json";
break;
}
} else{
switch (yearse) {
case "1":
conc = "mcs1sem.json";
Expand Down
Loading

0 comments on commit 577ddbd

Please sign in to comment.