diff --git a/panels/mensaPlan/config.php b/panels/mensaPlan/config.php
index 217ea420c71078c40aecedeea88e474af6e34d55..efbb100db238ce6a979ecd107d1d7db6f3ab9e73 100644
--- a/panels/mensaPlan/config.php
+++ b/panels/mensaPlan/config.php
@@ -18,11 +18,13 @@ $SQL_PW = "XAHQTZeGbqsnt8K6";
$SQL_DB = "infoscreen";
// JSON
+$JSON_NAME = "mensaPlan.json";
+$JSON_INC_NR = true;
$JSON_INC_ORIGINAL = false;
$JSON_INC_SHORT = true;
$JSON_INC_ART = true;
$JSON_INC_KIND = false;
-$JSON_INC_IMG = true;
+$JSON_INC_COUNTER = true;
$JSON_INC_STOFFE = false;
$JSON_INC_DATE = true;
?>
\ No newline at end of file
diff --git a/panels/mensaPlan/gericht.php b/panels/mensaPlan/gericht.php
index d020b7b72a886088fb38e0e5e8557b7b659b925b..80b50e012868c976dc1c29c0206d066048b28b8c 100644
--- a/panels/mensaPlan/gericht.php
+++ b/panels/mensaPlan/gericht.php
@@ -1,5 +1,6 @@
<?php
class GERICHT {
+ private $nr = 0;
private $originalText = "";
private $shortText = "";
private $rind = false;
@@ -9,7 +10,7 @@ class GERICHT {
private $vegetarisch = false;
private $vegan = false;
private $kinderteller = false;
- private $image = "";
+ private $counter = "";
private $zusatzStoffe = array (
0,
0,
@@ -47,6 +48,9 @@ class GERICHT {
0
);
private $date = "";
+ public function getNr() {
+ return $this->nr;
+ }
public function getOriginalText() {
return $this->originalText;
}
@@ -125,8 +129,8 @@ class GERICHT {
}
return $art;
}
- public function getImage() {
- return $this->image;
+ public function getCounter() {
+ return $this->counter;
}
public function isZusatzstoff($id) {
return $this->zusatzStoffe [$id];
@@ -152,6 +156,9 @@ class GERICHT {
public function getDate() {
return $this->date;
}
+ public function setNr($nr) {
+ $this->nr = $nr;
+ }
public function setOriginalText($originalText) {
$this->originalText = $originalText;
}
@@ -206,8 +213,8 @@ class GERICHT {
echo "Angegebene Art '" . $in . "' nicht bekannt.";
}
}
- public function setImage($image) {
- $this->image = $image;
+ public function setCounter($counter) {
+ $this->counter = $counter;
}
public function setZusatzstoff($in, $val) {
$this->zusatzStoffe [$in] = $val;
@@ -269,46 +276,47 @@ class GERICHT {
public function toggleZusatzstoff($in) {
$this->zusatzStoffe [$in] = ! $this->zusatzStoffe [$in];
}
- public function toJson($inc_original = true, $inc_short = true, $inc_art = true, $inc_kind = true, $inc_img = true, $inc_stoffe = true, $inc_date = true) {
+ public function toJson($inc_nr = true, $inc_original = true, $inc_short = true, $inc_art = true, $inc_kind = true, $inc_counter = true, $inc_stoffe = true, $inc_date = true) {
$json = "{";
+ if ($inc_nr) {
+ $json .= '"nr": "' . $this->nr . '"';
+ }
+ if ($inc_nr && ($inc_original || $inc_short || $inc_art || $inc_kind || $inc_counter || $inc_stoffe || $inc_date)) {
+ $json .= ',';
+ }
if ($inc_original) {
$json .= '"originalText": "' . $this->originalText . '"';
}
- if ($inc_original && ($inc_short || $inc_art || $inc_kind || $inc_img || $inc_stoffe || $inc_date)) {
+ if ($inc_original && ($inc_short || $inc_art || $inc_kind || $inc_counter || $inc_stoffe || $inc_date)) {
$json .= ',';
}
if ($inc_short) {
$json .= '"shortText": "' . $this->shortText . '"';
}
- if ($inc_short && ($inc_art || $inc_kind || $inc_img || $inc_stoffe || $inc_date)) {
+ if ($inc_short && ($inc_art || $inc_kind || $inc_counter || $inc_stoffe || $inc_date)) {
$json .= ',';
}
if ($inc_art) {
- $json .= '"rind":' . $this->rind;
- $json .= '",';
- $json .= '"schwein":' . $this->schwein;
- $json .= '",';
- $json .= '"gefluegel":' . $this->gefluegel;
- $json .= '",';
- $json .= '"fisch":' . $this->fisch;
- $json .= '",';
- $json .= '"vegetarisch":' . $this->vegetarisch;
- $json .= '",';
- $json .= '"vegan":' . $this->vegan . '"';
+ $json .= '"rind": "' . $this->rind . '",';
+ $json .= '"schwein": "' . $this->schwein . '",';
+ $json .= '"gefluegel": "' . $this->gefluegel . '",';
+ $json .= '"fisch": "' . $this->fisch . '",';
+ $json .= '"vegetarisch": "' . $this->vegetarisch . '",';
+ $json .= '"vegan": "' . $this->vegan . '"';
}
- if ($inc_art && ($inc_kind || $inc_img || $inc_stoffe || $inc_date)) {
+ if ($inc_art && ($inc_kind || $inc_counter || $inc_stoffe || $inc_date)) {
$json .= ',';
}
if ($inc_kind) {
$json .= '"kinderteller":' . $this->kinderteller . '"';
}
- if ($inc_kind && ($inc_img || $inc_stoffe || $inc_date)) {
+ if ($inc_kind && ($inc_counter || $inc_stoffe || $inc_date)) {
$json .= ',';
}
- if ($inc_img) {
- $json .= '"image": "' . $this->image . '"';
+ if ($inc_counter) {
+ $json .= '"counter": "' . $this->getCounter() . '"';
}
- if ($inc_img && ($inc_stoffe || $inc_date)) {
+ if ($inc_counter && ($inc_stoffe || $inc_date)) {
$json .= ',';
}
if ($inc_stoffe) {
@@ -330,7 +338,7 @@ class GERICHT {
}
}
- return "Original Text: " . $this->originalText . ",\n" . "Short Text: " . $this->shortText . ",\n" . "Rind: " . booleanToString ( $this->rind ) . ",\n" . "Schwein: " . booleanToString ( $this->schwein ) . ",\n" . "Fisch: " . booleanToString ( $this->fisch ) . ",\n" . "Vegetarisch: " . booleanToString ( $this->vegetarisch ) . ",\n" . "Vegan: " . booleanToString ( $this->vegan ) . ",\n" . "Kinderteller: " . booleanToString ( $this->kinderteller ) . ",\n" . "Image: " . $this->image . ",\n" . "Zusatzstoffe: " . $stoffe . ",\n";
+ return "Nr: " . $this->nr . ", Original Text: " . $this->originalText . ",\n" . "Short Text: " . $this->shortText . ",\n" . "Rind: " . booleanToString ( $this->rind ) . ",\n" . "Schwein: " . booleanToString ( $this->schwein ) . ",\n" . "Fisch: " . booleanToString ( $this->fisch ) . ",\n" . "Vegetarisch: " . booleanToString ( $this->vegetarisch ) . ",\n" . "Vegan: " . booleanToString ( $this->vegan ) . ",\n" . "Kinderteller: " . booleanToString ( $this->kinderteller ) . ",\n" . "Counter: " . $this->counter . ",\n" . "Zusatzstoffe: " . $stoffe . ",\n";
}
}
?>
\ No newline at end of file
diff --git a/panels/mensaPlan/helper.php b/panels/mensaPlan/helper.php
index e4b68cf1cc0b5bfa95c5bcf5632e87e5442c2837..17994257d45ccfa21985c817756db463eed0fa70 100644
--- a/panels/mensaPlan/helper.php
+++ b/panels/mensaPlan/helper.php
@@ -6,7 +6,7 @@ function booleanToString($bool) {
return "False";
}
}
-function toJson($tage, $inc_original, $inc_short, $inc_art, $inc_kind, $inc_stoffe, $inc_img, $inc_date) {
+function toJson($tage, $name, $inc_nr, $inc_original, $inc_short, $inc_art, $inc_kind, $inc_stoffe, $inc_counter, $inc_date) {
$kommata = false;
$json = '{';
foreach ( $tage as $tag ) {
@@ -15,12 +15,12 @@ function toJson($tage, $inc_original, $inc_short, $inc_art, $inc_kind, $inc_stof
} else {
$kommata = true;
}
- $json .= $tag->toJson ( $inc_original, $inc_short, $inc_art, $inc_kind, $inc_img, $inc_stoffe, $inc_date );
+ $json .= $tag->toJson ( $inc_nr, $inc_original, $inc_short, $inc_art, $inc_kind, $inc_counter, $inc_stoffe, $inc_date );
}
$json .= "}";
- file_put_contents ( "mensa.json", $json );
+ file_put_contents ( $name, $json );
}
-function toSql($tage, $server, $user, $pw, $db) {
+function toSql($tage, $server, $user, $pw, $db) { // TODO NR
$mysqli = new mysqli ( $server, $user, $pw, $db );
if ($mysqli->connect_errno) {
@@ -28,11 +28,12 @@ function toSql($tage, $server, $user, $pw, $db) {
exit ();
}
- $stmt = mysqli_prepare ( $mysqli, "INSERT INTO gerichte (originalText,shortText,rind,schwein,gefluegel,fisch,vegetarisch,vegan,kinderteller,image,date) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE originalText = ?" );
+ $stmt = mysqli_prepare ( $mysqli, "INSERT INTO gerichte (nr,originalText,shortText,rind,schwein,gefluegel,fisch,vegetarisch,vegan,kinderteller,counter,date) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE originalText = ?,shortText = ?,rind = ?,schwein = ?,gefluegel = ?,fisch = ?,vegetarisch = ?,vegan = ?,kinderteller = ?, counter = ?" );
foreach ( $tage as $tag ) {
- foreach ( $tag->gerichte as $gericht ) {
- echo mysqli_stmt_bind_param ( $stmt, "ssiiiiiiisis", $gericht->getOriginalText (), $gericht->getShortText (), $gericht->isRind (), $gericht->isSchwein (), $gericht->isGefluegel (), $gericht->isFisch (), $gericht->isVegetarisch (), $gericht->isVegan (), $gericht->isKinderteller (), $gericht->getImage (), $gericht->getDate (), $gericht->getOriginalText () );
- $stmt->execute (); // TODO
+ foreach ( $tag->getGerichte () as $gericht ) {
+ echo mysqli_stmt_bind_param ( $stmt, "issiiiiiiiisssiiiiiiii", $gericht->getNr (), $gericht->getOriginalText (), $gericht->getShortText (), $gericht->isRind (), $gericht->isSchwein (), $gericht->isGefluegel (), $gericht->isFisch (), $gericht->isVegetarisch (), $gericht->isVegan (), $gericht->isKinderteller (), $gericht->getCounter (), $gericht->getDate (), $gericht->getOriginalText (), $gericht->getShortText (), $gericht->isRind (), $gericht->isSchwein (), $gericht->isGefluegel (), $gericht->isFisch (), $gericht->isVegetarisch (), $gericht->isVegan (), $gericht->isKinderteller (), $gericht->getCounter () );
+ echo $gericht->getNr ();
+ $stmt->execute ();
}
}
$stmt->close ();
@@ -45,8 +46,11 @@ function parsDay($html, $day) {
$html = $html->find ( 'a.#' . $day, 0 );
$html = $html->first_child ()->children ( 1 );
$tr = $html->first_child ();
+ $nr = 0;
while ( $tr != null ) {
+ $nr ++;
$current = new GERICHT ();
+ $current->setNr ( $nr );
$td0 = $tr->find ( 'td', 0 );
$td1 = $tr->find ( 'td', 1 );
$td2 = $tr->find ( 'td', 2 );
@@ -76,16 +80,43 @@ function parsDay($html, $day) {
$current->setVegan ( substr_count ( $art, "N" ) );
$current->setKinderteller ( substr_count ( $art, "K" ) );
}
- // parse Image
+ // parse Counter
if ($td2 != null) {
$img = $td2->find ( 'img', 0 );
if ($img != null) {
- $current->setImage ( $img->src );
+ $img = $img->src;
+ $img = array_pop ( explode ( "/", $img ) );
+ switch ($img) {
+ case "icon-menue-1.png" :
+ $current->setCounter ( 1 );
+ break;
+ case "icon-menue-2.png" :
+ $current->setCounter ( 2 );
+ break;
+ case "icon-tagesgericht.png" :
+ $current->setCounter ( 3 );
+ break;
+ case "icon-vegetarisch.png" :
+ $current->setCounter ( 4 );
+ break;
+ case "icon-aktionsteller.png" :
+ $current->setCounter ( 5 );
+ break;
+ case "icon-grillstation.png" :
+ $current->setCounter ( 6 );
+ break;
+ case "icon-fisch.png" :
+ $current->setCounter ( 7 );
+ break;
+ case "icon-vegan.png" :
+ $current->setCounter ( 8 );
+ break;
+ }
}
}
if ($current->getOriginalText () != "") { // remove empty Fields
- $current->setDate ( $tag->date );
- array_push ( $tag->gerichte, $current );
+ $current->setDate ( $tag->getDate () );
+ $tag->addGericht ( $current );
}
$tr = $tr->next_sibling ();
}
diff --git a/panels/mensaPlan/mensa.json b/panels/mensaPlan/mensa.json
deleted file mode 100644
index dbdf0f26f236e5cb79cb27800cc079039346de8c..0000000000000000000000000000000000000000
--- a/panels/mensaPlan/mensa.json
+++ /dev/null
@@ -1 +0,0 @@
-{"montag":[],"dienstag":[],"mittwoch":[],"donnerstag":[],"freitag":[]}
\ No newline at end of file
diff --git a/panels/mensaPlan/mensaParser.php b/panels/mensaPlan/mensaParser.php
index 7c190fa22d15e39ede06de2dc00ae336a2e48e4a..295f169bea7382f49b65665f165141e59de6c359 100644
--- a/panels/mensaPlan/mensaParser.php
+++ b/panels/mensaPlan/mensaParser.php
@@ -7,18 +7,22 @@ require 'tag.php';
// Parse
$html = file_get_html ( $MENSA_URL );
-$tage = array ();
-foreach ( $PARSE_DAYLIST as $DAYNAME ) {
- array_push ( $tage, parsDay ( $html, $DAYNAME ) );
-}
-
-// CREATE JSON
-if ($DO_JSON) {
- toJson ( $tage, $JSON_INC_ORIGINAL, $JSON_INC_SHORT, $JSON_INC_ART, $JSON_INC_KIND, $JSON_INC_STOFFE, $JSON_INC_IMG, $JSON_INC_DATE );
-}
-
-// SAVE
-if ($DO_SQL) {
- toSql ( $tage, $SQL_SERVER, $SQL_USER, $SQL_PW, $SQL_DB );
+if ($html != null) {
+ $tage = array ();
+ foreach ( $PARSE_DAYLIST as $DAYNAME ) {
+ array_push ( $tage, parsDay ( $html, $DAYNAME ) );
+ }
+
+ // CREATE JSON
+ if ($DO_JSON) {
+ toJson ( $tage, $JSON_NAME, $JSON_INC_NR, $JSON_INC_ORIGINAL, $JSON_INC_SHORT, $JSON_INC_ART, $JSON_INC_KIND, $JSON_INC_STOFFE, $JSON_INC_COUNTER, $JSON_INC_DATE );
+ }
+
+ // SAVE
+ if ($DO_SQL) {
+ toSql ( $tage, $SQL_SERVER, $SQL_USER, $SQL_PW, $SQL_DB );
+ }
+} else {
+ echo "Webseite nicht erreichbar.";
}
?>
\ No newline at end of file
diff --git a/panels/mensaPlan/mensaPlan.json b/panels/mensaPlan/mensaPlan.json
index 75f5fba3f66c66c8d358d309a65d28e8b32266c7..ed223ba4a1fd297293ebbe970cdceac5ce95055d 100755
--- a/panels/mensaPlan/mensaPlan.json
+++ b/panels/mensaPlan/mensaPlan.json
@@ -1 +1 @@
-{"montag": {"date": "24.08.2015", "gerichte": [{"kategorie": "icon-menue-1.png", "art": "G", "gericht": "Gefl\u00fcgelbratwurst mit Currysauce"}, {"kategorie": "icon-menue-2.png", "art": "S", "gericht": "Cordon Bleu mit Sauce"}, {"kategorie": "icon-tagesgericht.png", "art": "N", "gericht": "Ravioli Grano Doro in Tomatensauce + Stangenbrot, Salat & Dessert"}, {"kategorie": "icon-vegetarisch.png", "art": "V", "gericht": "Kartoffeltasche mit Mozzarella & Kr\u00e4uterdip"}, {"kategorie": "icon-vegetarisch.png", "art": "V", "gericht": ""}, {"kategorie": "icon-aktionsteller.png", "art": "G", "gericht": "H\u00e4hnchengyros mit Tzatziki + Pommes frites & Krautsalat"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "H\u00e4hnchen D\u00f6ner Tasche mit Tzatziki & Krautsalat"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "Gefl\u00fcgel Grillteller (Pute, H\u00e4hnchen, Cevapcici) + Bratkartoffeln & Prinze\u00dfbohnen"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "H\u00e4hnchenroulade mit Bulgur gef\u00fcllt + Pommes frites & Salat"}, {"kategorie": "icon-grillstation.png", "art": "S", "gericht": "Frisch gebratenes Schweinesteak mit Kr\u00e4uterbutter + Wedges & Pfannengem\u00fcse"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "Tagliatelle mit Gefl\u00fcgel Bolognese & geriebenem Hartk\u00e4se + Salat"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "H\u00e4hnchen D\u00f6ner Teller mit Tzatziki, Pommes frites & Krautsalat"}, {"kategorie": "icon-fisch.png", "art": "F", "gericht": "Kabeljaufilet mit Erdnusskruste + asiatischer Reis & Salat"}, {"kategorie": "icon-vegan.png", "art": "N", "gericht": "Ger\u00e4ucherter Tofu auf Spitzkohlsalat, azu cremige Sauce & Drillinge"}]}, "mittwoch": {"date": "26.08.2015", "gerichte": [{"kategorie": "icon-menue-1.png", "art": "S", "gericht": "Spie\u00dfbraten mit Paprikasauce"}, {"kategorie": "icon-menue-2.png", "art": "G", "gericht": "Knusper Nuggets mit Dip"}, {"kategorie": "icon-tagesgericht.png", "art": "F", "gericht": "Seelachsfilet mit Remoulade + P\u00fcree, Salat & Dessert"}, {"kategorie": "icon-vegetarisch.png", "art": "N", "gericht": "Vollkornspaghetti mit Soja- Bolognese"}, {"kategorie": "icon-aktionsteller.png", "art": "G", "gericht": "H\u00e4hnchengyros mit Tzatziki + Pommes frites & Krautsalat"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "Gefl\u00fcgel Grillteller (Pute, H\u00e4hnchen, Cevapcici) + Bratkartoffeln & Prinze\u00dfbohnen"}, {"kategorie": "icon-grillstation.png", "art": "S", "gericht": "Frisch gebratenes Schweinesteak mit Kr\u00e4uterbutter + Wedges & Pfannengem\u00fcse"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "H\u00e4hnchen D\u00f6ner Teller mit Tzatziki, Pommes frites & Krautsalat"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "H\u00e4hnchen D\u00f6ner Tasche mit Tzatziki & Krautsalat"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "Tagliatelle mit Gefl\u00fcgel Bolognese & geriebenem Hartk\u00e4se + Salat"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "H\u00e4hnchenroulade mit Bulgur gef\u00fcllt + Pommes frites & Salat"}, {"kategorie": "icon-fisch.png", "art": "F", "gericht": "Kabeljaufilet mit Erdnusskruste + asiatischer Reis & Salat"}, {"kategorie": "icon-vegan.png", "art": "N", "gericht": "Ger\u00e4ucherter Tofu gebacken auf Spitzkohlsalat, azu cremige Sauce & Drillinge"}]}, "freitag": {"date": "28.08.2015", "gerichte": [{"kategorie": "icon-menue-1.png", "art": "S", "gericht": "Frikadelle "Hausfrauen Art" mit Sauce"}, {"kategorie": "icon-menue-2.png", "art": "F", "gericht": "Seelachsfilet mit Kartoffelkruste mit Senfsauce"}, {"kategorie": "icon-tagesgericht.png", "art": "V", "gericht": "Frische Schupfnudeln mit Gem\u00fcse + Tomatensauce, Salat & Dessert"}, {"kategorie": "icon-vegetarisch.png", "art": "N", "gericht": "Tortellini mit Gem\u00fcse & Sauce"}, {"kategorie": "icon-aktionsteller.png", "art": "G", "gericht": "H\u00e4hnchengyros mit Tzatziki + Pommes frites & Krautsalat"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "H\u00e4hnchen D\u00f6ner Teller mit Tzatziki, Pommes frites & Krautsalat"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "Gefl\u00fcgel Grillteller (Pute, H\u00e4hnchen, Cevapcici) + Bratkartoffeln & Prinze\u00dfbohnen"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "H\u00e4hnchen D\u00f6ner Tasche mit Tzatziki & Krautsalat"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "Tagliatelle mit Gefl\u00fcgel Bolognese & geriebenem Hartk\u00e4se + Salat"}, {"kategorie": "icon-grillstation.png", "art": "S", "gericht": "Frisch gebratenes Schweinesteak mit Kr\u00e4uterbutter + Wedges & Pfannengem\u00fcse"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "H\u00e4hnchenroulade mit Bulgur gef\u00fcllt + Pommes frites & Salat"}, {"kategorie": "icon-fisch.png", "art": "F", "gericht": "Kabeljaufilet mit Erdnusskruste + asiatischer Reis & Salat"}, {"kategorie": "icon-vegan.png", "art": "N", "gericht": "Ger\u00e4ucherter Tofu gebacken auf Spitzkohlsalat, azu cremige Sauce & Drillinge"}]}, "dienstag": {"date": "25.08.2015", "gerichte": [{"kategorie": "icon-menue-1.png", "art": "V", "gericht": "Kartoffel-R\u00f6sti mit Brokkoli, K\u00e4se & Hollandaise \u00fcberbacken + 3 Beilagen"}, {"kategorie": "icon-menue-2.png", "art": "G", "gericht": "Panierts Putenschnitzel mit Rahmsauce"}, {"kategorie": "icon-tagesgericht.png", "art": "V", "gericht": "Rahmspinat mit R\u00fchreier + Salzkartoffeln & Dessert"}, {"kategorie": "icon-vegetarisch.png", "art": "N", "gericht": "Gr\u00fcnkern- Gem\u00fcsepfanne mit Tomatensauce"}, {"kategorie": "icon-aktionsteller.png", "art": "G", "gericht": "H\u00e4hnchengyros mit Tzatziki + Pommes frites & Krautsalat"}, {"kategorie": "icon-grillstation.png", "art": "S", "gericht": "Frisch gebratenes Schweinesteak mit Kr\u00e4uterbutter + Wedges & Pfannengem\u00fcse"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "Gefl\u00fcgel Grillteller (Pute, H\u00e4hnchen, Cevapcici) + Bratkartoffeln & Prinze\u00dfbohnen"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "H\u00e4hnchenroulade mit Bulgur gef\u00fcllt + Pommes frites & Salat"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "Tagliatelle mit Gefl\u00fcgel Bolognese & geriebenem Hartk\u00e4se + Salat"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "H\u00e4hnchen D\u00f6ner Tasche mit Tzatziki & Krautsalat"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "H\u00e4hnchen D\u00f6ner Teller mit Tzatziki, Pommes frites & Krautsalat"}, {"kategorie": "icon-fisch.png", "art": "F", "gericht": "Kabeljaufilet mit Erdnusskruste + asiatischer Reis & Salat"}, {"kategorie": "icon-vegan.png", "art": "N", "gericht": "Ger\u00e4ucherter Tofu gebacken auf Spitzkohlsalat, azu cremige Sauce & Drillinge"}]}, "donnerstag": {"date": "27.08.2015", "gerichte": [{"kategorie": "icon-menue-1.png", "art": "V", "gericht": "Gebackene Teigrolle mit Koriander- Dip"}, {"kategorie": "icon-menue-2.png", "art": "G", "gericht": "Chicken Wings mit Paprika Dip"}, {"kategorie": "icon-tagesgericht.png", "art": "R", "gericht": "Chili con Carne mit Br\u00f6tchen & Dessert"}, {"kategorie": "icon-vegetarisch.png", "art": "V", "gericht": "Sesam-Karotten-Sticks mit Kr\u00e4uterquark"}, {"kategorie": "icon-aktionsteller.png", "art": "G", "gericht": "H\u00e4hnchengyros mit Tzatziki + Pommes frites & Krautsalat"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "H\u00e4hnchen D\u00f6ner Teller mit Tzatziki, Pommes frites & Krautsalat"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "Gefl\u00fcgel Grillteller (Pute, H\u00e4hnchen, Cevapcici) + Bratkartoffeln & Prinze\u00dfbohnen"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "H\u00e4hnchen D\u00f6ner Tasche mit Tzatziki & Krautsalat"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "Tagliatelle mit Gefl\u00fcgel Bolognese & geriebenem Hartk\u00e4se + Salat"}, {"kategorie": "icon-grillstation.png", "art": "S", "gericht": "Frisch gebratenes Schweinesteak mit Kr\u00e4uterbutter + Wedges & Pfannengem\u00fcse"}, {"kategorie": "icon-grillstation.png", "art": "G", "gericht": "H\u00e4hnchenroulade mit Bulgur gef\u00fcllt + Pommes frites & Salat"}, {"kategorie": "icon-fisch.png", "art": "F", "gericht": "Kabeljaufilet mit Erdnusskruste + asiatischer Reis & Salat"}, {"kategorie": "icon-vegan.png", "art": "N", "gericht": "Ger\u00e4ucherter Tofu gebacken auf Spitzkohlsalat, azu cremige Sauce & Drillinge"}]}}
\ No newline at end of file
+{"montag":[{"nr": "1","shortText": "Geflügelbratwurst mit Currysauce","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "1","date": "05.10.2015"},{"nr": "2","shortText": "Cordon Bleu mit Sauce","rind": "0","schwein": "1","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "0","counter": "2","date": "05.10.2015"},{"nr": "3","shortText": "Ravioli Grano Doro in Tomatensauce + Stangenbrot, Salat & Dessert","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "1","counter": "3","date": "05.10.2015"},{"nr": "4","shortText": "Kartoffeltasche mit Mozzarella & Kräuterdip","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "1","vegan": "0","counter": "4","date": "05.10.2015"},{"nr": "5","shortText": "Hähnchengyros mit Tzatziki + Pommes frites & Krautsalat","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "5","date": "05.10.2015"},{"nr": "6","shortText": "Hähnchen Döner Teller mit Tzatziki, Pommes frites & Krautsalat","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "05.10.2015"},{"nr": "7","shortText": "Tagliatelle mit Geflügel Bolognese & geriebenem Hartkäse + Salat ","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "05.10.2015"},{"nr": "8","shortText": "Gefüllter Wraper mit Hähnchen Döner mit Tzatziki & Krautsalat","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "05.10.2015"},{"nr": "9","shortText": "Frisch gebratenes Schweinesteak mit Kräuterbutter + Wedges & Pfannengemüse","rind": "0","schwein": "1","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "05.10.2015"},{"nr": "10","shortText": "Hähnchenroulade mit Bulgur gefüllt + Pommes frites & Salat ","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "05.10.2015"},{"nr": "11","shortText": "Geflügel Grillteller (Pute, Hähnchen, Cevapcici) + Bratkartoffeln & Prinzeßbohnen","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "05.10.2015"},{"nr": "12","shortText": "Kabeljaufilet gebacken, mit Sauce Remouladensauce + Salzkartoffeln & Salat ","rind": "0","schwein": "0","gefluegel": "0","fisch": "1","vegetarisch": "0","vegan": "0","counter": "7","date": "05.10.2015"},{"nr": "13","shortText": "Couscous mit Gemüse + Saisonsalate","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "1","counter": "8","date": "05.10.2015"},{"nr": "14","shortText": "Pommes ","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "0","counter": "","date": "05.10.2015"},{"nr": "16","shortText": "Tagessuppe","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "0","counter": "","date": "05.10.2015"}],"dienstag":[{"nr": "1","shortText": "Kartoffel-Rösti mit Brokkoli, Käse & Hollandaise überbacken + 3 Beilagen","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "1","vegan": "0","counter": "1","date": "06.10.2015"},{"nr": "2","shortText": "Panierts Putenschnitzel mit Rahmsauce","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "2","date": "06.10.2015"},{"nr": "3","shortText": "Rahmspinat mit Rühreier + Salzkartoffeln & Dessert","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "1","vegan": "0","counter": "3","date": "06.10.2015"},{"nr": "4","shortText": "Grünkern- Gemüsepfanne mit Tomatensauce","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "1","counter": "4","date": "06.10.2015"},{"nr": "5","shortText": "Hähnchengyros mit Tzatziki + Pommes frites & Krautsalat","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "5","date": "06.10.2015"},{"nr": "6","shortText": "Gefüllter Wraper mit Hähnchen Döner mit Tzatziki & Krautsalat","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "06.10.2015"},{"nr": "7","shortText": "Hähnchen Döner Teller mit Tzatziki, Pommes frites & Krautsalat","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "06.10.2015"},{"nr": "8","shortText": "Hähnchenroulade mit Bulgur gefüllt + Pommes frites & Salat ","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "06.10.2015"},{"nr": "9","shortText": "Frisch gebratenes Schweinesteak mit Kräuterbutter + Wedges & Pfannengemüse","rind": "0","schwein": "1","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "06.10.2015"},{"nr": "10","shortText": "Tagliatelle mit Geflügel Bolognese & geriebenem Hartkäse + Salat ","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "06.10.2015"},{"nr": "11","shortText": "Geflügel Grillteller (Pute, Hähnchen, Cevapcici) + Bratkartoffeln & Prinzeßbohnen","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "06.10.2015"},{"nr": "12","shortText": "Kabeljaufilet gebacken, mit Sauce Remouladensauce + Salzkartoffeln & Salat ","rind": "0","schwein": "0","gefluegel": "0","fisch": "1","vegetarisch": "0","vegan": "0","counter": "7","date": "06.10.2015"},{"nr": "13","shortText": "Couscous mit Gemüse + Saisonsalate","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "1","counter": "8","date": "06.10.2015"},{"nr": "15","shortText": "Tagessuppe","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "0","counter": "","date": "06.10.2015"},{"nr": "16","shortText": "Pommes ","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "0","counter": "","date": "06.10.2015"}],"mittwoch":[{"nr": "1","shortText": "Gebackene Teigrolle mit Dip","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "1","vegan": "0","counter": "1","date": "07.10.2015"},{"nr": "2","shortText": "Chicken Wings mit Paprika Dip ","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "2","date": "07.10.2015"},{"nr": "3","shortText": "Seelachsfilet mit Remoulade + Püree, Salat & Dessert","rind": "0","schwein": "0","gefluegel": "0","fisch": "1","vegetarisch": "0","vegan": "0","counter": "3","date": "07.10.2015"},{"nr": "4","shortText": "Vollkornspaghetti mit Soja- Bolognese","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "1","counter": "4","date": "07.10.2015"},{"nr": "5","shortText": "Hähnchengyros mit Tzatziki + Pommes frites & Krautsalat","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "5","date": "07.10.2015"},{"nr": "6","shortText": "Gefüllter Wraper mit Hähnchen Döner mit Tzatziki & Krautsalat","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "07.10.2015"},{"nr": "7","shortText": "Hähnchen Döner Teller mit Tzatziki, Pommes frites & Krautsalat","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "07.10.2015"},{"nr": "8","shortText": "Geflügel Grillteller (Pute, Hähnchen, Cevapcici) + Bratkartoffeln & Prinzeßbohnen","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "07.10.2015"},{"nr": "9","shortText": "Frisch gebratenes Schweinesteak mit Kräuterbutter + Wedges & Pfannengemüse","rind": "0","schwein": "1","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "07.10.2015"},{"nr": "10","shortText": "Tagliatelle mit Geflügel Bolognese & geriebenem Hartkäse + Salat ","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "07.10.2015"},{"nr": "11","shortText": "Hähnchenroulade mit Bulgur gefüllt + Pommes frites & Salat ","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "07.10.2015"},{"nr": "12","shortText": "Kabeljaufilet gebacken, mit Sauce Remouladensauce + Salzkartoffeln & Salat ","rind": "0","schwein": "0","gefluegel": "0","fisch": "1","vegetarisch": "0","vegan": "0","counter": "7","date": "07.10.2015"},{"nr": "13","shortText": "Couscous mit Gemüse + Saisonsalate","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "1","counter": "8","date": "07.10.2015"},{"nr": "14","shortText": "Pommes ","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "0","counter": "","date": "07.10.2015"},{"nr": "16","shortText": "Tagessuppe","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "0","counter": "","date": "07.10.2015"},{"nr": "17","shortText": "Pommes ","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "0","counter": "","date": "07.10.2015"}],"donnerstag":[{"nr": "1","shortText": "Spießbraten mit Paprikasauce","rind": "0","schwein": "1","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "0","counter": "1","date": "08.10.2015"},{"nr": "2","shortText": "Knusper Nuggets mit Dip","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "2","date": "08.10.2015"},{"nr": "3","shortText": "Chili con Carne mit Brötchen & Dessert","rind": "1","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "0","counter": "3","date": "08.10.2015"},{"nr": "4","shortText": "Spinat Käse Taler, mit Pilzsauce ","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "1","vegan": "0","counter": "4","date": "08.10.2015"},{"nr": "5","shortText": "Hähnchengyros mit Tzatziki + Pommes frites & Krautsalat","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "5","date": "08.10.2015"},{"nr": "6","shortText": "Gefüllter Wraper mit Hähnchen Döner mit Tzatziki & Krautsalat","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "08.10.2015"},{"nr": "7","shortText": "Hähnchen Döner Teller mit Tzatziki, Pommes frites & Krautsalat","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "08.10.2015"},{"nr": "8","shortText": "Geflügel Grillteller (Pute, Hähnchen, Cevapcici) + Bratkartoffeln & Prinzeßbohnen","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "08.10.2015"},{"nr": "9","shortText": "Frisch gebratenes Schweinesteak mit Kräuterbutter + Wedges & Pfannengemüse","rind": "0","schwein": "1","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "08.10.2015"},{"nr": "10","shortText": "Tagliatelle mit Geflügel Bolognese & geriebenem Hartkäse + Salat ","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "08.10.2015"},{"nr": "11","shortText": "Hähnchenroulade mit Bulgur gefüllt + Pommes frites & Salat ","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "08.10.2015"},{"nr": "12","shortText": "Kabeljaufilet gebacken, mit Sauce Remouladensauce + Salzkartoffeln & Salat ","rind": "0","schwein": "0","gefluegel": "0","fisch": "1","vegetarisch": "0","vegan": "0","counter": "7","date": "08.10.2015"},{"nr": "13","shortText": "Couscous mit Gemüse + Saisonsalate","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "1","counter": "8","date": "08.10.2015"},{"nr": "14","shortText": "Pommes ","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "0","counter": "","date": "08.10.2015"},{"nr": "16","shortText": "Pommes ","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "0","counter": "","date": "08.10.2015"},{"nr": "18","shortText": "Tagessuppe","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "0","counter": "","date": "08.10.2015"}],"freitag":[{"nr": "1","shortText": "Wirsingroulade, mit Sauce ","rind": "0","schwein": "1","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "0","counter": "1","date": "09.10.2015"},{"nr": "2","shortText": "Seelachsfilet mit Kartoffelkruste mit Senfsauce","rind": "0","schwein": "0","gefluegel": "0","fisch": "1","vegetarisch": "0","vegan": "0","counter": "2","date": "09.10.2015"},{"nr": "3","shortText": "Frische Schupfnudeln mit Zucchini + Tomatensauce, Salat & Dessert","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "1","vegan": "0","counter": "3","date": "09.10.2015"},{"nr": "4","shortText": "Tortellini mit Gemüse & Sauce","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "1","counter": "4","date": "09.10.2015"},{"nr": "5","shortText": "Hähnchengyros mit Tzatziki + Pommes frites & Krautsalat","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "5","date": "09.10.2015"},{"nr": "6","shortText": "Tagliatelle mit Geflügel Bolognese & geriebenem Hartkäse + Salat ","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "09.10.2015"},{"nr": "7","shortText": "Frisch gebratenes Schweinesteak mit Kräuterbutter + Wedges & Pfannengemüse","rind": "0","schwein": "1","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "09.10.2015"},{"nr": "8","shortText": "Gefüllter Wraper mit Hähnchen Döner mit Tzatziki & Krautsalat","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "09.10.2015"},{"nr": "9","shortText": "Hähnchenroulade mit Bulgur gefüllt + Pommes frites & Salat ","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "09.10.2015"},{"nr": "10","shortText": "Geflügel Grillteller (Pute, Hähnchen, Cevapcici) + Bratkartoffeln & Prinzeßbohnen","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "09.10.2015"},{"nr": "11","shortText": "Hähnchen Döner Teller mit Tzatziki, Pommes frites & Krautsalat","rind": "0","schwein": "0","gefluegel": "1","fisch": "0","vegetarisch": "0","vegan": "0","counter": "6","date": "09.10.2015"},{"nr": "12","shortText": "Kabeljaufilet gebacken, mit Sauce Remouladensauce + Salzkartoffeln & Salat ","rind": "0","schwein": "0","gefluegel": "0","fisch": "1","vegetarisch": "0","vegan": "0","counter": "7","date": "09.10.2015"},{"nr": "13","shortText": "Couscous mit Gemüse + Saisonsalate","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "1","counter": "8","date": "09.10.2015"},{"nr": "14","shortText": "Pommes ","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "0","counter": "","date": "09.10.2015"},{"nr": "15","shortText": "Pommes ","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "0","counter": "","date": "09.10.2015"},{"nr": "17","shortText": "Tagessuppe","rind": "0","schwein": "0","gefluegel": "0","fisch": "0","vegetarisch": "0","vegan": "0","counter": "","date": "09.10.2015"}]}
\ No newline at end of file
diff --git a/panels/mensaPlan/setup/gerichte.sql b/panels/mensaPlan/setup/gerichte.sql
index 876df9f7160cd28a7625eda643e579ac132489d7..b1ce28e1a46735045401df41043be49df9a19050 100644
--- a/panels/mensaPlan/setup/gerichte.sql
+++ b/panels/mensaPlan/setup/gerichte.sql
@@ -1,5 +1,6 @@
CREATE TABLE IF NOT EXISTS `gerichte` (
`id` int(255) NOT NULL,
+ `nr` int(11) NOT NULL,
`originalText` text NOT NULL,
`shortText` text NOT NULL,
`rind` tinyint(1) NOT NULL DEFAULT '0',
@@ -9,6 +10,9 @@ CREATE TABLE IF NOT EXISTS `gerichte` (
`vegetarisch` tinyint(1) NOT NULL DEFAULT '0',
`vegan` tinyint(1) NOT NULL DEFAULT '0',
`kinderteller` tinyint(1) NOT NULL DEFAULT '0',
- `image` text,
- `date` varchar(10) NOT NULL PRIMARY KEY UNIQUE KEY
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
\ No newline at end of file
+ `counter` int(11) DEFAULT '0',
+ `date` varchar(10) NOT NULL
+) ENGINE=InnoDB AUTO_INCREMENT=162 DEFAULT CHARSET=latin1;
+
+ALTER TABLE `gerichte`
+ ADD PRIMARY KEY (`nr`,`date`), ADD UNIQUE KEY (`nr`,`date`), ADD KEY `id` (`id`);
\ No newline at end of file
diff --git a/panels/mensaPlan/tag.php b/panels/mensaPlan/tag.php
index 6ed134e16f9745176a45191d9f66670654593772..4bfc63ceae69d2a43475704343f93fc47396ce20 100644
--- a/panels/mensaPlan/tag.php
+++ b/panels/mensaPlan/tag.php
@@ -1,9 +1,9 @@
<?php
class TAG {
- public $nr = 0;
- public $name = 0;
- public $gerichte = array ();
- public $date = "";
+ private $nr = 0;
+ private $name = 0;
+ private $gerichte = array ();
+ private $date = "";
function __construct($name, $date) {
$this->name = $name;
$this->date = $date;
@@ -31,7 +31,39 @@ class TAG {
breakM;
}
}
- public function toJson($inc_original = true, $inc_short = true, $inc_art = true, $inc_kind = true, $inc_img = true, $inc_stoffe = true, $inc_date = true) {
+ public function getNr() {
+ return $this->nr;
+ }
+ public function getName() {
+ return $this->name;
+ }
+ public function getGerichte() {
+ return $this->gerichte;
+ }
+ public function getDate() {
+ return $this->date;
+ }
+ public function setNr($nr) {
+ $this->nr = $nr;
+ }
+ public function setName($name) {
+ $this->name = $name;
+ }
+ public function setGerichte($gerichte) {
+ $this->gerichte = $gerichte;
+ }
+ public function setDate() {
+ $this->date = $date;
+ }
+ public function addGericht($gericht) {
+ array_push ( $this->gerichte, $gericht );
+ }
+ public function addGerichte($gerichte) {
+ foreach ( $gerichte as $gericht ) {
+ array_push ( $this->gerichte, $gericht );
+ }
+ }
+ public function toJson($inc_nr = true, $inc_original = true, $inc_short = true, $inc_art = true, $inc_kind = true, $inc_counter = true, $inc_stoffe = true, $inc_date = true) {
$kommata = false;
$json = '"' . $this->name . '":[';
foreach ( $this->gerichte as $gericht ) {
@@ -40,10 +72,18 @@ class TAG {
} else {
$kommata = true;
}
- $json .= $gericht->toJson ( $inc_original, $inc_short, $inc_art, $inc_kind, $inc_img, $inc_stoffe, $inc_dat );
+ $json .= $gericht->toJson ( $inc_nr,$inc_original, $inc_short, $inc_art, $inc_kind, $inc_counter, $inc_stoffe, $inc_date );
}
$json .= ']';
return $json;
}
+ public function __toString() {
+ $string = "Nr: " . $this->nr . ", Name: " . $this->name . ", Gerichte: ";
+ foreach ( $this->gerichte as $gericht ) {
+ $string .= $gericht;
+ }
+ $string .= ", Date: " . $this->date;
+ return $string;
+ }
}
?>
\ No newline at end of file