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

diff --git a/src/ro/ieval/unical/DisplayEventActivity.java b/src/ro/ieval/unical/DisplayEventActivity.java
index f5bb146..af4fe15 100644
--- a/src/ro/ieval/unical/DisplayEventActivity.java
+++ b/src/ro/ieval/unical/DisplayEventActivity.java
@@ -15,20 +15,21 @@ import android.widget.TextView;
 
 public class DisplayEventActivity extends Activity {
 	public static final String EXTRA_EVENT = "event";
-	Event e;
+	private Event event;
+    private final DeleteEventDialog d=new DeleteEventDialog();
 
-	public static void displayEvent(final Context context, final Event event){
+	public static void displayEvent(final Context context, final long id){
 		final Intent i=new Intent(context,DisplayEventActivity.class);
-		i.putExtra(DisplayEventActivity.EXTRA_EVENT, event);
+		i.putExtra(DisplayEventActivity.EXTRA_EVENT, id);
 		context.startActivity(i);
 	}
 
 	@Override
-	protected void onCreate(final Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		e=getIntent().getParcelableExtra(EXTRA_EVENT);
+	protected void onStart() {
+		super.onStart();
+		event=getIntent().hasExtra(EXTRA_EVENT) ? Event.getEventById(this, getIntent().getLongExtra(EXTRA_EVENT, 0)) : new 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);
@@ -38,21 +39,21 @@ public class DisplayEventActivity extends Activity {
 		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 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("EEEEEEE", Locale.UK);
 
 		startDay.setText(dayOfWeekFormat.format(start));
-		if(dateFormat.format(start)!=dateFormat.format(end)) {
+		if(!dateFormat.format(start).equals(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);
+		description.setText(event.description);
 	}
 
 	@Override
@@ -66,20 +67,25 @@ public class DisplayEventActivity extends Activity {
 	public boolean onOptionsItemSelected(final MenuItem item) {
 		// 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(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;
+		case R.id.deleteevent:
+            final Bundle b=new Bundle();
+            b.putParcelable("Event",event);
+            d.setArguments(b);
+			d.show(getFragmentManager(), "Delete");
+
+			return true;
+		case R.id.eventlist:
+			final Intent it=new Intent(this,EventListActivity.class);
+			startActivity(it);
+			return true;
+		case R.id.edit_event:
+			AddEventActivity.editEvent(DisplayEventActivity.this,event);
+			return true;
+		case R.id.add_alarm:
+
+			return true;
+		default:
+			return true;
 		}
 	}
 }