X-Git-Url: http://git.pk910.de/?p=DHBWCampusApp.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fde%2Fdhbwloe%2Fcampusapp%2Ffragments%2FVorlesungsplanGroupsListItem.java;h=73c5053c02ec451a95bd4559d6b985175ea62cf4;hp=01d6ee755eccb7cd7d9b78075814ae923d3ad1d8;hb=cea4ee15ef92f521ae962404bd1b3c25042219fa;hpb=9a28e7b4c1520f629721693a04b4978fec9692e7

diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/VorlesungsplanGroupsListItem.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/VorlesungsplanGroupsListItem.java
index 01d6ee7..73c5053 100644
--- a/app/src/main/java/de/dhbwloe/campusapp/fragments/VorlesungsplanGroupsListItem.java
+++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/VorlesungsplanGroupsListItem.java
@@ -3,6 +3,9 @@ package de.dhbwloe.campusapp.fragments;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import de.dhbwloe.campusapp.CampusAppContext;
+import de.dhbwloe.campusapp.R;
+
 /**
  * Created by pk910 on 20.02.2016.
  */
@@ -37,19 +40,25 @@ public class VorlesungsplanGroupsListItem {
     }
 
     public String getFirstEvent() {
-        SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy HH:mm");
+        if(firstEvent == 0)
+            return null;
+        SimpleDateFormat dateFormat = new SimpleDateFormat(CampusAppContext.getInstance().getResString(R.string.timeformat_vorlesungsplan_fulldate));
         Date date = new Date(firstEvent*1000);
         return dateFormat.format(date);
     }
 
     public String getLastEvent() {
-        SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy HH:mm");
+        if(lastEvent == 0)
+            return null;
+        SimpleDateFormat dateFormat = new SimpleDateFormat(CampusAppContext.getInstance().getResString(R.string.timeformat_vorlesungsplan_fulldate));
         Date date = new Date(lastEvent*1000);
         return dateFormat.format(date);
     }
 
     public String getNextEvent() {
-        SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy HH:mm");
+        if(nextEvent == 0)
+            return null;
+        SimpleDateFormat dateFormat = new SimpleDateFormat(CampusAppContext.getInstance().getResString(R.string.timeformat_vorlesungsplan_fulldate));
         Date date = new Date(nextEvent*1000);
         return dateFormat.format(date);
     }
@@ -57,7 +66,7 @@ public class VorlesungsplanGroupsListItem {
     public String getNextKlausurEvent() {
         if(nextKlausurEvent == 0)
             return null;
-        SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy HH:mm");
+        SimpleDateFormat dateFormat = new SimpleDateFormat(CampusAppContext.getInstance().getResString(R.string.timeformat_vorlesungsplan_fulldate));
         Date date = new Date(nextKlausurEvent*1000);
         return dateFormat.format(date);
     }