X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Funical%2FDisplayEventActivity.java;h=bb819b9eb51558facca7f6844b3da8c5fd48b4fe;hb=f580909cce85fcd4edbba928c795abb2e75564be;hp=df885caa7c7afd8885df32589f0a0e03062cd5fd;hpb=8a08d036704efadbfcd4f7c4be1721f915d929c9;p=unical.git

diff --git a/src/ro/ieval/unical/DisplayEventActivity.java b/src/ro/ieval/unical/DisplayEventActivity.java
index df885ca..bb819b9 100644
--- a/src/ro/ieval/unical/DisplayEventActivity.java
+++ b/src/ro/ieval/unical/DisplayEventActivity.java
@@ -15,6 +15,7 @@ import android.widget.TextView;
 
 public class DisplayEventActivity extends Activity {
 	public static final String EXTRA_EVENT = "event";
+	private Event event;
 
 	public static void displayEvent(final Context context, final Event event){
 		final Intent i=new Intent(context,DisplayEventActivity.class);
@@ -25,40 +26,42 @@ public class DisplayEventActivity extends Activity {
 	@Override
 	protected void onCreate(final Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		final Event e=getIntent().getParcelableExtra(EXTRA_EVENT);
+		event=getIntent().getParcelableExtra(EXTRA_EVENT);
 		setContentView(R.layout.event_view);
-		setTitle(e.title);
-		
+		setTitle(event.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 Date start=new Date(e.dtstart);
-		final Date end=new Date(e.dtend);
+		final TextView description= (TextView) findViewById(R.id.event_view_description);
+
+		final Date start=new Date(event.dtstart);
+		final Date end=new Date(event.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("E", Locale.UK);
-		
+		final SimpleDateFormat dayOfWeekFormat = new SimpleDateFormat("EEEEEEE", Locale.UK);
+
 		startDay.setText(dayOfWeekFormat.format(start));
-		if(dayOfWeekFormat.format(start)!=dayOfWeekFormat.format(end))
+		if(dateFormat.format(start)!=dateFormat.format(end)) {
 			endDay.setText(dayOfWeekFormat.format(end));
-		startDate.setText(dateFormat.format(start));
-		if(dateFormat.format(start)!=dateFormat.format(end))
 			endDate.setText(dateFormat.format(end));
+		}
+		startDate.setText(dateFormat.format(start));
 		startTime.setText(timeFormat.format(start));
 		endTime.setText(timeFormat.format(end));
+		description.setText(event.description);
 	}
-	
+
 	@Override
 	public boolean onCreateOptionsMenu(final Menu menu) {
 		final MenuInflater inflater = getMenuInflater();
 		inflater.inflate(R.menu.event, menu);
 		return true;
 	}
-	
+
 	@Override
 	public boolean onOptionsItemSelected(final MenuItem item) {
 		// Handle item selection
@@ -68,7 +71,7 @@ public class DisplayEventActivity extends Activity {
 				startActivity(i);
 				return true;
 			case R.id.deleteevent:
-				final DeleteEventDialog d=new DeleteEventDialog();
+				final DeleteEventDialog d=new DeleteEventDialog(event,this);
 				d.show(getFragmentManager(), "Delete");
 				return true;
 			case R.id.eventlist: