Merge branch 'addCreatedToCsv' into 'master'

Add eventuser.created to csv

See merge request !300

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserCartView.java

@@ -22,6 +22,7 @@ import java.io.ByteArrayInputStream;
 import java.nio.charset.Charset;
 import java.nio.charset.Charset;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
 import javax.enterprise.context.ConversationScoped;
 import javax.enterprise.context.ConversationScoped;
@@ -33,6 +34,7 @@ import org.primefaces.model.StreamedContent;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
+import fi.codecrew.moya.beans.EventBeanLocal;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.GroupMembership;
 import fi.codecrew.moya.model.GroupMembership;
 import fi.codecrew.moya.model.LanEvent;
 import fi.codecrew.moya.model.LanEvent;
@@ -94,8 +96,15 @@ public class UserCartView extends GenericCDIView {
 		sb.append("Zip").append(CSV_SEPARATOR);
 		sb.append("Zip").append(CSV_SEPARATOR);
 		sb.append("City").append(CSV_SEPARATOR);
 		sb.append("City").append(CSV_SEPARATOR);
 		sb.append("Places").append(CSV_SEPARATOR);
 		sb.append("Places").append(CSV_SEPARATOR);
+		sb.append("Created").append(CSV_SEPARATOR);
 
 
+		LanEvent event = null;
+		if (usercart != null && !usercart.isEmpty()) {
+			event = usercart.get(0).getEvent();
+		}
 		sb.append("\n");
 		sb.append("\n");
+		SimpleDateFormat createtimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
 		for (EventUser uc : usercart)
 		for (EventUser uc : usercart)
 		{
 		{
 			sb.append(uc.getFirstnames()).append(CSV_SEPARATOR);
 			sb.append(uc.getFirstnames()).append(CSV_SEPARATOR);
@@ -117,11 +126,18 @@ public class UserCartView extends GenericCDIView {
 				}
 				}
 			}
 			}
 			sb.append(CSV_SEPARATOR);
 			sb.append(CSV_SEPARATOR);
+			if (uc.getCreated() != null) {
+				sb.append(createtimeFormat.format(uc.getCreated().getTime()));
+			}
+			sb.append(CSV_SEPARATOR);
 
 
 			sb.append("\n");
 			sb.append("\n");
 		}
 		}
 		DefaultStreamedContent ret = new DefaultStreamedContent(new ByteArrayInputStream(sb.toString().getBytes(UTF8)));
 		DefaultStreamedContent ret = new DefaultStreamedContent(new ByteArrayInputStream(sb.toString().getBytes(UTF8)));
 		ret.setContentType("text/csv");
 		ret.setContentType("text/csv");
+		SimpleDateFormat filenameDateformat = new SimpleDateFormat("yyyy-MM-dd_HH-mm");
+
+		ret.setName(event.getName() + "-userexport-" + filenameDateformat.format(new Date()) + ".csv");
 		return ret;
 		return ret;
 	}
 	}