X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Funical%2FDisplayEventActivity.java;h=8055ec131fa3040bc9cc76c31888c9f2eee68607;hb=99658f577dd666fd3b558d5346a5aadb0d9d3a06;hp=8b8a767afdb805c586d7bac200378fa9e14c7b5e;hpb=0c5f3a9bca6621c3341ee2076ec8dad9ab556b72;p=unical.git

diff --git a/src/ro/ieval/unical/DisplayEventActivity.java b/src/ro/ieval/unical/DisplayEventActivity.java
index 8b8a767..8055ec1 100644
--- a/src/ro/ieval/unical/DisplayEventActivity.java
+++ b/src/ro/ieval/unical/DisplayEventActivity.java
@@ -1,6 +1,8 @@
 package ro.ieval.unical;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.GregorianCalendar;
 
 import android.app.Activity;
 import android.content.Context;
@@ -15,7 +17,6 @@ public class DisplayEventActivity extends Activity {
 	public static final String EXTRA_EVENT = "event";
 
 	public static void displayEvent(final Context context, final Event event){
-		System.out.println("Muie");
 		final Intent i=new Intent(context,DisplayEventActivity.class);
 		i.putExtra(DisplayEventActivity.EXTRA_EVENT, event);
 		context.startActivity(i);
@@ -26,16 +27,30 @@ public class DisplayEventActivity extends Activity {
 		super.onCreate(savedInstanceState);
 		final Event e=getIntent().getParcelableExtra(EXTRA_EVENT);
 		setContentView(R.layout.event_view);
+		setTitle(e.title);
 		
-	    final TextView eventTitle= (TextView) findViewById(R.id.eventTitle);
-		final TextView date=(TextView) findViewById(R.id.date);
-		final TextView description=(TextView) findViewById(R.id.description);
-		final TextView location= (TextView) findViewById(R.id.location);
-		
-		eventTitle.setText(e.title);
-		date.setText(new Date(e.dtstart).toString());
-		description.setText(e.description);
-		location.setText(e.eventLocation);
+	    final TextView startday= (TextView) findViewById(R.id.startday);
+	    final TextView endday= (TextView) findViewById(R.id.endday);
+	    final TextView startdate= (TextView) findViewById(R.id.startdate);
+	    final TextView enddate= (TextView) findViewById(R.id.enddate);
+	    final TextView starttime= (TextView) findViewById(R.id.starttime);
+	    final TextView endtime= (TextView) findViewById(R.id.endtime);
+	    
+	    GregorianCalendar cstart = new GregorianCalendar();
+	    cstart.setTime(new Date(e.dtstart));
+	    GregorianCalendar cend = new GregorianCalendar();
+	    cend.setTime(new Date(e.dtend));
+	    SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy");
+	    SimpleDateFormat stf = new SimpleDateFormat("kk:mm:ss");
+	    
+	    startday.setText(CalendarUtils.DayToString(this,cstart));
+	    if(CalendarUtils.DayToString(this,cstart)!=CalendarUtils.DayToString(this, cend))
+	    	endday.setText(CalendarUtils.DayToString(this, cend));
+	    startdate.setText(sdf.format(cstart.getTime()));
+	    if(sdf.format(cstart.getTime())!=sdf.format(cend.getTime()))
+	    	enddate.setText(sdf.format(cend.getTime()));
+	    starttime.setText(stf.format(cstart.getTime()));
+	    endtime.setText(stf.format(cend.getTime()));
 	}
 	
 	@Override