projects
/
DHBWCampusApp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
alpha 0.0.1
[DHBWCampusApp.git]
/
app
/
src
/
main
/
java
/
de
/
dhbwloe
/
campusapp
/
fragments
/
MensaTagesplan.java
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 1d1022a0856e8c39de4eed028e2f99e2f7093306..0a6f53ce55705d4c2ceee6b9e736ae71dd9b706c 100644
(file)
--- a/
app/src/main/java/de/dhbwloe/campusapp/fragments/MensaTagesplan.java
+++ b/
app/src/main/java/de/dhbwloe/campusapp/fragments/MensaTagesplan.java
@@
-16,6
+16,7
@@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.Calendar;
import java.util.Date;
+import de.dhbwloe.campusapp.CampusAppContext;
import de.dhbwloe.campusapp.CampusAppFragment;
import de.dhbwloe.campusapp.R;
import de.dhbwloe.campusapp.CampusAppFragment;
import de.dhbwloe.campusapp.R;
@@
-26,9
+27,13
@@
public class MensaTagesplan extends CampusAppFragment {
private ArrayList<de.dhbwloe.campusapp.mensaplan.MensaTagesplan> tagesplanMenueItems = new ArrayList<>();
private Date viewPlanDate;
private boolean setActiveOnLoad = false;
private ArrayList<de.dhbwloe.campusapp.mensaplan.MensaTagesplan> tagesplanMenueItems = new ArrayList<>();
private Date viewPlanDate;
private boolean setActiveOnLoad = false;
+ private boolean redirectPage = true;
public void onSetActive() {
public void onSetActive() {
+ if(AppContext == null)
+ AppContext = CampusAppContext.getInstance();
if(viewPlanDate == null) {
if(viewPlanDate == null) {
+ AppContext.setTitle("");
setActiveOnLoad = true;
return;
}
setActiveOnLoad = true;
return;
}
@@
-40,6
+45,9
@@
public class MensaTagesplan extends CampusAppFragment {
Bundle args = getArguments();
Date planDay = null;
if(args != null) {
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);
long plandate = args.getLong("date");
if(plandate > 0) {
planDay = new Date(plandate * 1000);
@@
-70,7
+78,11
@@
public class MensaTagesplan extends CampusAppFragment {
View view = inflater.inflate(R.layout.fragment_mensa_tagesplan, container, false);
if(viewPlanDate == null) {
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) {
return null;
}
if(setActiveOnLoad) {