X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Funical%2FDisplayEventActivity.java;h=f5bb14653686068d3f47ec33b3c7439c2ed60a79;hb=dd76f98a4950d7e2ae3dca98eba1579dac4a340a;hp=6208d232378701a6f04227ee93f652449119a767;hpb=5cf4714f0675349ed599707e024cf0e70fe114b2;p=unical.git

diff --git a/src/ro/ieval/unical/DisplayEventActivity.java b/src/ro/ieval/unical/DisplayEventActivity.java
index 6208d23..f5bb146 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.Locale;
 
 import android.app.Activity;
 import android.content.Context;
@@ -13,6 +15,7 @@ import android.widget.TextView;
 
 public class DisplayEventActivity extends Activity {
 	public static final String EXTRA_EVENT = "event";
+	Event e;
 
 	public static void displayEvent(final Context context, final Event event){
 		final Intent i=new Intent(context,DisplayEventActivity.class);
@@ -23,39 +26,60 @@ public class DisplayEventActivity extends Activity {
 	@Override
 	protected void onCreate(final Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		final Event e=getIntent().getParcelableExtra(EXTRA_EVENT);
+		e=getIntent().getParcelableExtra(EXTRA_EVENT);
 		setContentView(R.layout.event_view);
-	    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());
+		setTitle(e.title);
+
+		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);
+		final TextView description= (TextView) findViewById(R.id.event_view_description);
+
+		final Date start=new Date(e.dtstart);
+		final Date end=new Date(e.dtend);
+		final SimpleDateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy", Locale.UK);
+		final SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss", Locale.UK);
+		final SimpleDateFormat dayOfWeekFormat = new SimpleDateFormat("EEEEEEE", Locale.UK);
+
+		startDay.setText(dayOfWeekFormat.format(start));
+		if(dateFormat.format(start)!=dateFormat.format(end)) {
+			endDay.setText(dayOfWeekFormat.format(end));
+			endDate.setText(dateFormat.format(end));
+		}
+		startDate.setText(dateFormat.format(start));
+		startTime.setText(timeFormat.format(start));
+		endTime.setText(timeFormat.format(end));
 		description.setText(e.description);
-		location.setText(e.eventLocation);
 	}
-	
+
 	@Override
 	public boolean onCreateOptionsMenu(final Menu menu) {
 		final MenuInflater inflater = getMenuInflater();
-	    inflater.inflate(R.menu.event, menu);
+		inflater.inflate(R.menu.event, menu);
 		return true;
 	}
-	
+
 	@Override
 	public boolean onOptionsItemSelected(final MenuItem item) {
-	    // Handle item selection
-	    switch (item.getItemId()) {
-	        case R.id.NewEvent:
-	        	final Intent i=new Intent(this,AddEventActivity.class);
+		// Handle item selection
+		switch (item. getItemId()) {
+			case R.id.NewEvent:
+				final Intent i=new Intent(this,AddEventActivity.class);
 				startActivity(i);
-	            return true;
-	        case R.id.deleteevent:
-	        	final DeleteEventDialog d=new DeleteEventDialog();
-	        	d.show(getFragmentManager(), "Delete");
-	        	return true;
-	        default:
-	            return true;
-	    }
+				return true;
+			case R.id.deleteevent:
+				final DeleteEventDialog d=new DeleteEventDialog(e,this);
+				d.show(getFragmentManager(), "Delete");
+				return true;
+			case R.id.eventlist:
+				final Intent it=new Intent(this,EventListActivity.class);
+				startActivity(it);
+				return true;
+			default:
+				return true;
+		}
 	}
 }