Mensa Bild angepasst & links auf dem Dashboard hinzugefügt

[DHBWCampusApp.git] / app / src / main / java / de / dhbwloe / campusapp / fragments / DashboardMensa.java

diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardMensa.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardMensa.java
index ccc2589de39d9e6f7c4b650f02223d5252341565..fdfea3d8b63bdb9cc13bb07ef49e0100e168a614 100644 (file)
--- a/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardMensa.java
+++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardMensa.java
@@ -36,6 +36,14 @@ public class DashboardMensa extends CampusAppFragment {
                              Bundle savedInstanceState) {
         view = inflater.inflate(R.layout.fragment_dashboard_mensa, container, false);
         refreshMensaMenue();
+
+        LinearLayout linearcontainer = (LinearLayout)view.findViewById(R.id.menuList);
+        linearcontainer.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                AppContext.getNavigationManager().navigatePage("Mensa");
+            }
+        });
         return view;
     }
 
@@ -72,15 +80,19 @@ public class DashboardMensa extends CampusAppFragment {
         int i = 0;
         LayoutInflater li = LayoutInflater.from(AppContext.getMainActivity());
         do {
-            RelativeLayout menu = (RelativeLayout) li.inflate(R.layout.fragment_dashboard_mensa_menu, null, false);
+            String menuTitle = cmenue.getMenuName();
+            if(menuTitle == null || menuTitle.matches("^Buffet"))
+                continue;
+
+            LinearLayout menu = (LinearLayout) li.inflate(R.layout.fragment_dashboard_mensa_menu, null, false);
             menueContainer.addView(menu);
 
             TextView menuName = (TextView) menu.findViewById(R.id.menuName);
             TextView menuPrice = (TextView) menu.findViewById(R.id.menuPrice);
 
             menuName.setText(cmenue.getName());
-            double price = cmenue.getStudentPrice();
-            menuPrice.setText(Double.toString(price));
+            String priceStr = cmenue.getFormatedRolePrice();
+            menuPrice.setText(priceStr);
         } while(i < dayplans.length && (cmenue = dayplans[++i]) != null && cmenue.getPlanDate() == dayplan.getPlanDate());
     }