Merge pull request #3 from hft-app/ljans

Add lecture time sanity check, show empty days

scripts/module/lectures.js

@@ -8,6 +8,7 @@ class Lectures {
 	async process(request) {
 		const lectures = await this.handler.controller.idb.lectures.all(lecture => lecture.start >= this.handler.today);
 		this.days = [];
+		this.hasLectures = false;
 
 		// Set and get color seed
 		if(request.GET.has('repaint')) await this.handler.controller.idb.state.put(Math.floor(Math.random() * 101), 'seed');
@@ -41,7 +42,8 @@ class Lectures {
 			});
 
 			// Add day to timetable
-			if(today.length > 0) this.days.push({
+			if(today.length > 0) this.hasLectures = true;
+			this.days.push({
 				table: new Table(today).render(),
 				date: start,
 			});

scripts/table.js

@@ -90,7 +90,7 @@ class Table {
 		// Only check lectures starting in the current time segment
 		var y = (lecture.start - morning) / (60 * 15 * 1000);
 		lecture.rowspan = (lecture.end - lecture.start) / (60 * 15 * 1000);
-		if(!Number.isInteger(y) || y < 0 || y > 48) return false; // OPTIONAL: check for malformed input
+		if(lecture.rowspan < 0 || !Number.isInteger(y) || y < 0 || y > 48) return false; // OPTIONAL: check for malformed input
 
 		// Col traversal (overlap buffer)
 		for(var x=0; x<12; x++) {

styles/main.scss

@@ -302,6 +302,7 @@ nav {
 		height: (44*$height) + 50px;
 		display: flex;
 		flex-direction: column;
+		min-width: 120px;
 
 		.head {
 			height: 54px;

templates/_lectures.html

@@ -1,4 +1,4 @@
-{{^days.length}}
+{{^hasLectures}}
 	<div class="wrapper">
 		<div class="screen">
 			<div class="container">
@@ -12,8 +12,8 @@
 			</div>
 		</div>
 	</div>
-{{/days.length}}
-{{#days.length}}
+{{/hasLectures}}
+{{#hasLectures}}
 	<div class="wrapper">
 		<div class="timetable">
 			{{#days}}
@@ -33,4 +33,4 @@
 			{{/days}}
 		</div>
 	</div>
-{{/days.length}}
+{{/hasLectures}}