X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fde%2Fdhbwloe%2Fcampusapp%2Ffragments%2FMensaTagesplan.java;h=1b72744efeff26b99da17da1668f909ba806b42e;hb=48e758721a39298a85c69ecc7267f3daf6993e78;hp=1d1022a0856e8c39de4eed028e2f99e2f7093306;hpb=a0f644715b43af1e4acf2513b972c3f980efdaca;p=DHBWCampusApp.git

diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/MensaTagesplan.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/MensaTagesplan.java
index 1d1022a..1b72744 100644
--- a/app/src/main/java/de/dhbwloe/campusapp/fragments/MensaTagesplan.java
+++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/MensaTagesplan.java
@@ -1,6 +1,19 @@
+/* MensaTagesplan.java
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package de.dhbwloe.campusapp.fragments;
-
-
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
@@ -16,6 +29,7 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 
+import de.dhbwloe.campusapp.CampusAppContext;
 import de.dhbwloe.campusapp.CampusAppFragment;
 import de.dhbwloe.campusapp.R;
 
@@ -26,20 +40,27 @@ public class MensaTagesplan extends CampusAppFragment {
     private ArrayList<de.dhbwloe.campusapp.mensaplan.MensaTagesplan> tagesplanMenueItems = new ArrayList<>();
     private Date viewPlanDate;
     private boolean setActiveOnLoad = false;
+    private boolean redirectPage = true;
 
     public void onSetActive() {
+        if(AppContext == null)
+            AppContext = CampusAppContext.getInstance();
         if(viewPlanDate == null) {
+            AppContext.setTitle("");
             setActiveOnLoad = true;
             return;
         }
-        SimpleDateFormat titleDateFormater = new SimpleDateFormat("dd.MM.yyyy");
-        AppContext.setTitle("Mensa: " + titleDateFormater.format(viewPlanDate));
+        SimpleDateFormat titleDateFormater = new SimpleDateFormat(AppContext.getResString(R.string.timeformat_mensa_titledate));
+        AppContext.setTitle(AppContext.getResString(R.string.mensa_dayplan_title, titleDateFormater.format(viewPlanDate)));
     }
 
     private void setupPlanDate() {
         Bundle args = getArguments();
         Date planDay = null;
         if(args != null) {
+            boolean mensaparent = args.getBoolean("parentIsMensaFragment");
+            if(mensaparent)
+                redirectPage = false;
             long plandate = args.getLong("date");
             if(plandate > 0) {
                 planDay = new Date(plandate * 1000);
@@ -70,7 +91,11 @@ public class MensaTagesplan extends CampusAppFragment {
         View view = inflater.inflate(R.layout.fragment_mensa_tagesplan, container, false);
 
         if(viewPlanDate == null) {
-            AppContext.getNavigationManager().navigatePage("Mensa", null, false); // silent redirect
+            if(redirectPage)
+                AppContext.getNavigationManager().navigatePage("Mensa", null, false); // silent redirect
+            else {
+                return inflater.inflate(R.layout.fragment_mensa_weekend, container, false);
+            }
             return null;
         }
         if(setActiveOnLoad) {