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

diff --git a/src/ro/ieval/unical/DisplayEventActivity.java b/src/ro/ieval/unical/DisplayEventActivity.java
index 8055ec1..af4fe15 100644
--- a/src/ro/ieval/unical/DisplayEventActivity.java
+++ b/src/ro/ieval/unical/DisplayEventActivity.java
@@ -2,7 +2,7 @@ package ro.ieval.unical;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.GregorianCalendar;
+import java.util.Locale;
 
 import android.app.Activity;
 import android.content.Context;
@@ -15,69 +15,77 @@ import android.widget.TextView;
 
 public class DisplayEventActivity extends Activity {
 	public static final String EXTRA_EVENT = "event";
+	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);
-		final Event 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);
-		
-	    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()));
+		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 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("EEEEEEE", Locale.UK);
+
+		startDay.setText(dayOfWeekFormat.format(start));
+		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(event.description);
 	}
-	
+
 	@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);
-				startActivity(i);
-	            return true;
-	        case R.id.deleteevent:
-	        	final DeleteEventDialog d=new DeleteEventDialog();
-	        	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;
-	    }
+		// Handle item selection
+		switch (item. getItemId()) {
+		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;
+		}
 	}
 }