X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fde%2Fdhbwloe%2Fcampusapp%2Ffragments%2FDashboardMensa.java;h=5a9c41ba137db3b5d245172647a21ed46e5d4011;hb=783024077bd38c4bede07ca8310fb2daf67751b5;hp=2d473a54a88c58254bde4bae59fdf8db18b2408d;hpb=9a28e7b4c1520f629721693a04b4978fec9692e7;p=DHBWCampusApp.git

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 2d473a5..5a9c41b 100644
--- a/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardMensa.java
+++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardMensa.java
@@ -17,6 +17,7 @@ import java.util.Date;
 import de.dhbwloe.campusapp.CampusAppContext;
 import de.dhbwloe.campusapp.CampusAppFragment;
 import de.dhbwloe.campusapp.R;
+import de.dhbwloe.campusapp.Tools;
 import de.dhbwloe.campusapp.mensaplan.MensaTagesplan;
 
 /**
@@ -71,15 +72,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());
     }
 
@@ -90,13 +95,11 @@ public class DashboardMensa extends CampusAppFragment {
         else if(now < date + (86400*2))
             datetext = AppContext.getResString(R.string.dashboard_calendar_tomorrow);
         else {
-            int weekdayResIds[] = new int[] { R.string.week_sunday, R.string.week_monday, R.string.week_tuesday, R.string.week_wednesday, R.string.week_thursday, R.string.week_friday, R.string.week_saturday };
-            Calendar cal = Calendar.getInstance();
-            cal.setTime(new Date(date * 1000));
-            int dow = cal.get(Calendar.DAY_OF_WEEK);
-            SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM");
+            Date dateObj = new Date(date * 1000);
+            String dayStr = Tools.getWeekdayString(dateObj);
+            SimpleDateFormat dateFormat = new SimpleDateFormat(AppContext.getResString(R.string.timeformat_dashboard_mensa));
 
-            datetext = AppContext.getResString(weekdayResIds[dow]) + ", " + dateFormat.format(cal.getTime());
+            datetext = dayStr + ", " + dateFormat.format(dateObj);
         }
         return datetext;
     }