Index: trunk/excel/showAttendeesHospitalityPostReport.jsp =================================================================== diff -u -r223 -r226 --- trunk/excel/showAttendeesHospitalityPostReport.jsp (.../showAttendeesHospitalityPostReport.jsp) (revision 223) +++ trunk/excel/showAttendeesHospitalityPostReport.jsp (.../showAttendeesHospitalityPostReport.jsp) (revision 226) @@ -10,11 +10,11 @@ PrintWriter pw = response.getWriter(); pw.println("Region,Rep 1,Rep 2,Dealer,Level,Dealer Name,Attendee,Title,Ticket#,Tix,Attendee Email,Day 1, Day 2,Address1,Address2,City,State,Zip,Mega Dealer,Notes"); - AllAttendeesObject[] showAttendees = (AllAttendeesObject[]) request.getAttribute("showattendees"); + List showAttendees = (List) request.getAttribute("showattendees"); - for (int i = 0; i < showAttendees.length; i++) { - AllAttendeesObject showattendee = showAttendees[i]; + for (int i = 0; i < showAttendees.size(); i++) { + AllAttendeesObject showattendee = (AllAttendeesObject)showAttendees.get(i); List dealerEventNoteList = (List) showattendee.getDealerEventNoteList(); String dealerNotes = ""; Index: trunk/excel/showAttendees.jsp =================================================================== diff -u -r223 -r226 --- trunk/excel/showAttendees.jsp (.../showAttendees.jsp) (revision 223) +++ trunk/excel/showAttendees.jsp (.../showAttendees.jsp) (revision 226) @@ -2,6 +2,7 @@ <%@ page import="com.showcase.model.DealerEventNote" %> <%@ page import="java.util.List" %> <%@ page import="java.io.PrintWriter" %> +<%@ page import="java.util.Objects" %> <%@ taglib uri="/WEB-INF/tlds/c.tld" prefix="c" %> <%@ page contentType="application/vnd.ms-excel; charset=UTF-8" %> <% @@ -20,54 +21,29 @@ String dealerNotes = ""; if (dealerEventNoteList != null) { for (int j = 0; j < dealerEventNoteList.size(); j++) { - dealerNotes = dealerNotes + dealerEventNoteList.get(j).getNote() + "\r\n"; + dealerNotes = dealerNotes + Objects.toString(dealerEventNoteList.get(j).getNote(), "") + "\r\n"; } } pw.println( - "\"" + showattendee.getRegionCode() + "\",\"" - + showattendee.getSalesman() + "\",\"" - + showattendee.getSecondSalesman() + "\",\"" - + showattendee.getDealerId() + "\",\"" - + showattendee.getDealerLevel() + "\",\"" - + showattendee.getGivenDealerName() + "\",\"" - + showattendee.getAttendeeName() + "\",\"" - + showattendee.getRole() + "\",\"" - + showattendee.getTicketId() + "\",\"" - + showattendee.getAttendeeEmail() + "\",\"" - + showattendee.getCheckIn() + "\",\"" - + showattendee.getCheckIn2ndDay() + "\",\"" - + showattendee.getAddress1() + "\",\"" - + showattendee.getAddress2() + "\",\"" - + showattendee.getCity() + "\",\"" - + showattendee.getState() + "\",\"" - + showattendee.getZipCode() + "\",\"" - + dealerNotes + "\"" + "\"" + Objects.toString(showattendee.getRegionCode(), "") + "\",\"" + + Objects.toString(showattendee.getSalesman(), "") + "\",\"" + + Objects.toString(showattendee.getSecondSalesman(), "") + "\",\"" + + Objects.toString(showattendee.getDealerId(), "") + "\",\"" + + Objects.toString(showattendee.getDealerLevel(), "") + "\",\"" + + Objects.toString(showattendee.getGivenDealerName(), "") + "\",\"" + + Objects.toString(showattendee.getAttendeeName(), "") + "\",\"" + + Objects.toString(showattendee.getRole(), "") + "\",\"" + + Objects.toString(showattendee.getTicketId(), "") + "\",\"" + + Objects.toString(showattendee.getAttendeeEmail(), "") + "\",\"" + + Objects.toString(showattendee.getCheckIn(), "") + "\",\"" + + Objects.toString(showattendee.getCheckIn2ndDay(), "") + "\",\"" + + Objects.toString(showattendee.getAddress1(), "") + "\",\"" + + Objects.toString(showattendee.getAddress2(), "") + "\",\"" + + Objects.toString(showattendee.getCity(), "") + "\",\"" + + Objects.toString(showattendee.getState(), "") + "\",\"" + + Objects.toString(showattendee.getZipCode(), "") + "\",\"" + + dealerNotes + "\"" ); } %> - - - - - - - "", - "", - "", - ""," - ", - "", - "", - "", - "", - "", - "YES", - "", - "", - "", - "", - "" - ,"" - - Index: trunk/excel/showAttendeesPostReport.jsp =================================================================== diff -u -r223 -r226 --- trunk/excel/showAttendeesPostReport.jsp (.../showAttendeesPostReport.jsp) (revision 223) +++ trunk/excel/showAttendeesPostReport.jsp (.../showAttendeesPostReport.jsp) (revision 226) @@ -9,11 +9,11 @@ response.setHeader("Content-Disposition", "attachment; filename=\"attendeesPostShow.csv\""); PrintWriter pw = response.getWriter(); pw.println("Region,Rep 1,Rep 2,Dealer,Level,Dealer Name,Attendee,Title,Ticket#,Attendee Email,Day 1 CheckIn, Day 2 CheckIn,Address1,Address2,City,State,Zip,Mega Dealer,Notes"); - AllAttendeesObject[] showAttendees = (AllAttendeesObject[]) request.getAttribute("showattendees"); + List showAttendees = (List) request.getAttribute("showattendees"); - for (int i = 0; i < showAttendees.length; i++) { - AllAttendeesObject showattendee = showAttendees[i]; + for (int i = 0; i < showAttendees.size(); i++) { + AllAttendeesObject showattendee = showAttendees.get(i); List dealerEventNoteList = (List) showattendee.getDealerEventNoteList(); String dealerNotes = ""; Index: trunk/excel/showAttendeesSpecialEventPostReport.jsp =================================================================== diff -u -r223 -r226 --- trunk/excel/showAttendeesSpecialEventPostReport.jsp (.../showAttendeesSpecialEventPostReport.jsp) (revision 223) +++ trunk/excel/showAttendeesSpecialEventPostReport.jsp (.../showAttendeesSpecialEventPostReport.jsp) (revision 226) @@ -12,11 +12,11 @@ pw.println("Region,Rep 1,Rep 2,Dealer,Level,Dealer Name,Attendee,Title,Ticket#,Attendee Email,Day 1 CheckIn, Day 2 CheckIn,Address1,Address2,City,State,Zip,Mega Dealer,Attending Showcase, Attending Meet and Greet,Notes"); - AllAttendeesObject[] showAttendees = (AllAttendeesObject[]) request.getAttribute("showattendees"); + List showAttendees = (List) request.getAttribute("showattendees"); - for (int i = 0; i < showAttendees.length; i++) { - AllAttendeesObject showattendee = showAttendees[i]; + for (int i = 0; i < showAttendees.size(); i++) { + AllAttendeesObject showattendee = showAttendees.get(i); List dealerEventNoteList = (List) showattendee.getDealerEventNoteList(); String dealerNotes = ""; Index: trunk/excel/showAttendeesShowcasePostReport.jsp =================================================================== diff -u -r223 -r226 --- trunk/excel/showAttendeesShowcasePostReport.jsp (.../showAttendeesShowcasePostReport.jsp) (revision 223) +++ trunk/excel/showAttendeesShowcasePostReport.jsp (.../showAttendeesShowcasePostReport.jsp) (revision 226) @@ -10,11 +10,11 @@ PrintWriter pw = response.getWriter(); pw.println("Region,Rep 1,Rep 2,Dealer,Level,Dealer Name,Attendee,Title,Ticket#,Attendee Email,Day 1 CheckIn, Day 2 CheckIn,Address1,Address2,City,State,Zip,MegaDealer,Notes"); - AllAttendeesObject[] showAttendees = (AllAttendeesObject[]) request.getAttribute("showattendees"); + List showAttendees = (List) request.getAttribute("showattendees"); - for (int i = 0; i < showAttendees.length; i++) { - AllAttendeesObject showattendee = showAttendees[i]; + for (int i = 0; i < showAttendees.size(); i++) { + AllAttendeesObject showattendee = showAttendees.get(i); List dealerEventNoteList = (List) showattendee.getDealerEventNoteList(); String dealerNotes = "";