Removed a bug for an empty calendar

virtUOS · Jun 27, 2024 · 6bd45ca · 6bd45ca
1 parent e96aaa7
commit 6bd45ca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/assets/index.js b/assets/index.js
@@ -80,8 +80,8 @@ function parseCalendar(active){
 	// Do we want 'Startet/Endet in' or 'Startet/Endet um'?
 	let diff = 0;
 	let t = 0;
-
-	console.debug('Lenght ', calendar.length);
+	
+	console.debug('Calendar ', calendar);
 
 	now = Date.now();
 	if (calendar.length > 0){
@@ -90,6 +90,7 @@ function parseCalendar(active){
 		console.debug('Diff ', diff, t, now);
 	} else {
 		console.debug('Calendar is empty');
+
 	}
 
 	hours = (diff > 0) ? Math.floor(diff / (1000 * 60 * 60)) : 0;
@@ -101,7 +102,8 @@ function parseCalendar(active){
 	seconds = (seconds < 10) ? '0' + seconds : seconds;
 
 	console.debug('Remaining ', diff/1000);
-	return calendar.length == 0 && !is_active ? 'Keine Aufzeichnung geplant' : active.info + ' ' + hours + ':' + minutes + ':' + seconds;
+	console.log(diff, calendar.length, is_active);
+	return (calendar.length == 0 && !is_active) ? 'Keine Aufzeichnung geplant' : active.info + ' ' + hours + ':' + minutes + ':' + seconds;
 }
 
 function updateCalendar() {

diff --git a/main.go b/main.go
@@ -200,7 +200,7 @@ func setupRouter() *gin.Engine {
 			c.JSON(http.StatusOK, events)
 		} else {
 			fmt.Println("No Events")
-			c.JSON(http.StatusNoContent, "[]")
+			c.JSON(http.StatusOK, "")
 		}
 	})