beta 0.1.1

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

diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardVorlesungsplan.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardVorlesungsplan.java
index e67b364abc7cc9663cd69aa04b36233250c75285..91e56c435ade80f8e38f3e5fbc1587f4c3226b9b 100644 (file)
--- a/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardVorlesungsplan.java
+++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardVorlesungsplan.java
@@ -44,7 +44,7 @@ public class DashboardVorlesungsplan extends CampusAppFragment {
         view = inflater.inflate(R.layout.fragment_dashboard_timetable, container, false);
         String kursTag = AppContext.getDatabaseManager().getRuntimeCache("CourseName");
         if(kursTag == null || kursTag.isEmpty()) {
-            return null;
+            return view;
         }
         courseName = kursTag;
         return view;
@@ -140,7 +140,7 @@ public class DashboardVorlesungsplan extends CampusAppFragment {
         Date date;
         TextView leftCol, rightCol = null;
         RelativeLayout.LayoutParams params;
-        SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm");
+        SimpleDateFormat dateFormat = new SimpleDateFormat(AppContext.getResString(R.string.timeformat_dashboard_vorlesungsplan_time));
         int firstLeftColId = 0;
 
         if(events.size() > 0) {
@@ -208,13 +208,10 @@ public class DashboardVorlesungsplan extends CampusAppFragment {
         else if(date1DayId == tomorrowDayId)
             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(eventDate);
-            int dow = cal.get(Calendar.DAY_OF_WEEK);
-            SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM");
+            String dayStr = Tools.getWeekdayString(eventDate);
+            SimpleDateFormat dateFormat = new SimpleDateFormat(AppContext.getResString(R.string.timeformat_dashboard_vorlesungsplan_date));
 
-            datetext = AppContext.getResString(weekdayResIds[dow]) + ", " + dateFormat.format(eventDate);
+            datetext = dayStr + ", " + dateFormat.format(eventDate);
         }
         return datetext;
     }