Merge branch 'dev' of bitbucket.org:FsInformatikDortmund/infoscreen into dev

css/jquery.ui.css

@@ -831,7 +831,7 @@ body .ui-tooltip {
 ----------------------------------*/
 .ui-widget {
 	font-family: Verdana,Arial,sans-serif;
-	font-size: 2.5em;
+	font-size: 2em;
 }
 .ui-widget .ui-widget {
 	font-size: 1em;

panels/mensaPlan/gericht.php

@@ -314,7 +314,11 @@ class GERICHT {
 			$json .= ',';
 		}
 		if ($inc_counter) {
-			$json .= '"counter": "' . $this->getCounter() . '"';
+			if ($this->getCounter () == "") {
+				$json .= '"counter": ' . 0;
+			} else {
+				$json .= '"counter": ' . $this->getCounter ();
+			}
 		}
 		if ($inc_counter && ($inc_stoffe || $inc_date)) {
 			$json .= ',';

panels/mensaPlan/helper.php

@@ -20,7 +20,7 @@ function toJson($tage, $name, $inc_nr, $inc_original, $inc_short, $inc_art, $inc
 	$json .= "}";
 	file_put_contents ( $name, $json );
 }
-function toSql($tage, $server, $user, $pw, $db) { // TODO NR
+function toSql($tage, $server, $user, $pw, $db) {
 	$mysqli = new mysqli ( $server, $user, $pw, $db );
 	
 	if ($mysqli->connect_errno) {

panels/mensaPlan/script.js

@@ -7,9 +7,17 @@ this.loaded = function(panel, config) {
 	// switch tabs
 	setInterval(function() {
 		var currentTab = $("#tabs").tabs('option', 'active');
-		if (currentTab == 0) {
+		switch (currentTab) {
+		case 0:
 			currentTab = 1;
-		} else {
+			break;
+		case 1:
+			currentTab = 2;
+			break;
+		case 2:
+			currentTab = 0;
+			break;
+		default:
 			currentTab = 0;
 		}
 		$("#tabs").tabs({
@@ -59,7 +67,7 @@ this.loaded = function(panel, config) {
 			break;
 		}
 		if (next) {
-				document.getElementById("mensaPlanTitleBar").innerHTML = "Mensaplan von MORGEN dem  "
+			document.getElementById("mensaPlanTitleBar").innerHTML = "Mensaplan von MORGEN dem  "
 					+ day[0].date;
 		} else {
 			document.getElementById("mensaPlanTitleBar").innerHTML = "Mensaplan von HEUTE dem  "
@@ -67,19 +75,52 @@ this.loaded = function(panel, config) {
 		}
 		var tableBody1 = document.getElementById("mensaPlanTable1Body");
 		var tableBody2 = document.getElementById("mensaPlanTable2Body");
-		tableBody1.innerHTML = "";
-		tableBody2.innerHTML = "";
+		var tableBody3 = document.getElementById("mensaPlanTable3Body");
+		tableBody1.innerHTML = ""; // clear
+		tableBody2.innerHTML = ""; // clear
+		tableBody3.innerHTML = ""; // clear
 		var a = 0;
 		var b = 0;
+		var c = 0;
 		for (var i = 0; i < day.length; i++) {
 			var gericht = day[i];
-			if (gericht.counter != 8 && gericht.counter != 6
-					&& gericht.counter != 4) {
+			var row = "";
+			switch (gericht.counter) {
+			case 1:
+				var row = tableBody1.insertRow(a);
+				a++;
+				break;
+			case 2:
 				var row = tableBody1.insertRow(a);
 				a++;
-			} else {
+				break;
+			case 3:
+				var row = tableBody1.insertRow(a);
+				a++;
+				break;
+			case 4:
+				var row = tableBody3.insertRow(c);
+				c++;
+				break;
+			case 5:
+				var row = tableBody1.insertRow(a);
+				a++;
+				break;
+			case 6:
 				var row = tableBody2.insertRow(b);
 				b++;
+				break;
+			case 7:
+				var row = tableBody3.insertRow(c);
+				c++;
+				break;
+			case 8:
+				var row = tableBody3.insertRow(c);
+				c++;
+				break;
+			default:
+				var row = tableBody3.insertRow(c);
+				c++;
 			}
 			var cell1 = row.insertCell(0);
 			var cell2 = row.insertCell(1);
@@ -87,69 +128,69 @@ this.loaded = function(panel, config) {
 			cell1.innerHTML = gericht.shortText;
 			var art = "";
 			var first = true;
-			if(gericht.rind){
+			if (gericht.rind) {
 				art += "R";
 			}
-			if(!first) {
+			if (!first) {
 				art += " ";
 				first = false;
 			}
-			if(gericht.schwein){
+			if (gericht.schwein) {
 				art += "S";
 			}
-			if(!first) {
+			if (!first) {
 				art += " ";
 				first = false;
 			}
-			if(gericht.gefluegel){
+			if (gericht.gefluegel) {
 				art += "G";
 			}
-			if(!first) {
+			if (!first) {
 				art += " ";
 				first = false;
 			}
-			if(gericht.fisch){
+			if (gericht.fisch) {
 				art += "F";
 			}
-			if(!first) {
+			if (!first) {
 				art += " ";
 				first = false;
 			}
-			if(gericht.vegetarisch){
+			if (gericht.vegetarisch) {
 				art += "V";
 			}
-			if(!first) {
+			if (!first) {
 				art += " ";
 				first = false;
 			}
-			if(gericht.vegan){
+			if (gericht.vegan) {
 				art += "N";
 			}
 			cell2.innerHTML = art;
 			var img = "";
 			switch (gericht.counter) {
-			case "1":
+			case 1:
 				img = "icon-menue-1.png";
 				break;
-			case "2":
+			case 2:
 				img = "icon-menue-2.png";
 				break;
-			case "3":
+			case 3:
 				img = "icon-tagesgericht.png";
 				break;
-			case "4":
+			case 4:
 				img = "icon-vegetarisch.png";
 				break;
-			case "5":
+			case 5:
 				img = "icon-aktionsteller.png";
 				break;
-			case "6":
+			case 6:
 				img = "icon-grillstation.png";
 				break;
-			case "7":
+			case 7:
 				img = "icon-fisch.png";
 				break;
-			case "8":
+			case 8:
 				img = "icon-vegan.png";
 				break;
 			default:
@@ -167,4 +208,4 @@ this.loaded = function(panel, config) {
 	$(function() {
 		$("#tabs").tabs();
 	});
-}
+}
\ No newline at end of file

panels/mensaPlan/template.html

 <div id="tabs">
 	<div id="mensaPlanTitleBar"></div>
 	<ul>
-		<li><a href="#tabs-1">Normale Counter</a></li>
-		<li><a href="#tabs-2">Grill etc. Counter</a></li>
+		<li><a href="#tab-1">Normale Counter</a></li>
+		<li><a href="#tab-2">Grill Counter</a></li>
+		<li><a href="#tab-3">Sonstige Counter</a></li>
 	</ul>
-	<div id="tabs-1">
+	<div id="tab-1">
 		<table id="mensaPlanTable1" style="width:100%;height:100%">
 			<tbody id="mensaPlanTable1Body">
 			</tbody>
 		</table>
 	</div>
-	<div id="tabs-2">
+	<div id="tab-2">
 		<table id="mensaPlanTable2" style="width:100%;height:100%">
 			<tbody id="mensaPlanTable2Body">
 			</tbody>
 		</table>
 	</div>
+	<div id="tab-3">
+		<table id="mensaPlanTable3" style="width:100%;height:100%">
+			<tbody id="mensaPlanTable3Body">
+			</tbody>
+		</table>
+	</div>
 </div>