) showattendee.getDealerEventNoteList();
+
+ String dealerNotes = "";
+ if (dealerEventNoteList != null) {
+ for (int j = 0; j < dealerEventNoteList.size(); j++) {
+ dealerNotes = dealerNotes + 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 + "\""
+ );
+ }
+%>
Index: trunk/ver3/attendanceRegistrationShowcase.jsp
===================================================================
diff -u -r208 -r223
--- trunk/ver3/attendanceRegistrationShowcase.jsp (.../attendanceRegistrationShowcase.jsp) (revision 208)
+++ trunk/ver3/attendanceRegistrationShowcase.jsp (.../attendanceRegistrationShowcase.jsp) (revision 223)
@@ -128,8 +128,14 @@
|
IDNAME |
|
- DEALER IDDEALER NAMEATTENDEE |
- |
+
+ DEALER ID
+ DEALER NAME
+ 2nd
+ 1st
+ ATTENDEE
+ |
+ |
Index: trunk/WEB-INF/src/com/showcase/sql/AllAttendeesSignedUpDAOImpl.java
===================================================================
diff -u -r211 -r223
--- trunk/WEB-INF/src/com/showcase/sql/AllAttendeesSignedUpDAOImpl.java (.../AllAttendeesSignedUpDAOImpl.java) (revision 211)
+++ trunk/WEB-INF/src/com/showcase/sql/AllAttendeesSignedUpDAOImpl.java (.../AllAttendeesSignedUpDAOImpl.java) (revision 223)
@@ -100,6 +100,7 @@
report.setAttendeeName(rs.getString("attendee_name"));
report.setAttendeeEmail(rs.getString("attendee_email"));
report.setCheckIn(rs.getString("checked_in"));
+ report.setCheckIn2ndDay(rs.getString("checked_in_2nd_day"));
report.setRoleId(rs.getInt("role_id"));
report.setZipCode(rs.getString("zip_code"));
report.setAttendingMeetAndGreet(rs.getString("attending_meet_and_greet"));
Index: trunk/WEB-INF/src/com/showcase/sql/ShowCaseDAOImpl.java
===================================================================
diff -u -r208 -r223
--- trunk/WEB-INF/src/com/showcase/sql/ShowCaseDAOImpl.java (.../ShowCaseDAOImpl.java) (revision 208)
+++ trunk/WEB-INF/src/com/showcase/sql/ShowCaseDAOImpl.java (.../ShowCaseDAOImpl.java) (revision 223)
@@ -334,11 +334,11 @@
con = getDBConnection();
StringBuffer buff = new StringBuffer();
buff.append(" select d.salesman, d.dealer_id, d.given_dealer_name, ");
- buff.append(" a.attendee_name , a.checked_in from dealers d, attendees a, events e where e.event_id=");
+ buff.append(" a.attendee_name , a.checked_in, a.checked_in_2nd_day from dealers d, attendees a, events e where e.event_id=");
buff.append(event_id);
buff.append(" and e.event_id=a.event_id and a.dealer_id=d.dealer_id ");
buff.append(" and a.status!='D'");
-
+
if(dealer_id!=null){
buff.append(" and d.salesman='");
buff.append(dealer_id);
Index: trunk/showcase.lemansnet.com.iml
===================================================================
diff -u -r211 -r223
--- trunk/showcase.lemansnet.com.iml (.../showcase.lemansnet.com.iml) (revision 211)
+++ trunk/showcase.lemansnet.com.iml (.../showcase.lemansnet.com.iml) (revision 223)
@@ -2,7 +2,7 @@
-
+
@@ -15,31 +15,31 @@
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -60,7 +60,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
@@ -87,7 +87,7 @@
-
+
@@ -106,7 +106,7 @@
-
+
@@ -175,10 +175,10 @@
-
+
-
+
@@ -223,7 +223,7 @@
-
+
@@ -232,7 +232,7 @@
-
+
@@ -259,7 +259,7 @@
-
+
@@ -286,7 +286,7 @@
-
+
@@ -304,7 +304,7 @@
-
+
@@ -331,7 +331,7 @@
-
+
@@ -349,7 +349,7 @@
-
+
@@ -367,7 +367,7 @@
-
+
@@ -385,7 +385,7 @@
-
+
@@ -421,7 +421,7 @@
-
+
@@ -439,7 +439,7 @@
-
+
@@ -455,5 +455,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: trunk/WEB-INF/src/com/showcase/sql/FinalizeShowcaseDAOImpl.java
===================================================================
diff -u -r208 -r223
--- trunk/WEB-INF/src/com/showcase/sql/FinalizeShowcaseDAOImpl.java (.../FinalizeShowcaseDAOImpl.java) (revision 208)
+++ trunk/WEB-INF/src/com/showcase/sql/FinalizeShowcaseDAOImpl.java (.../FinalizeShowcaseDAOImpl.java) (revision 223)
@@ -1,176 +1,170 @@
package com.showcase.sql;
-import java.sql.Connection;
-import java.sql.Date;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.SimpleDateFormat;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Vector;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import com.showcase.dao.FinalizeShowcaseDAO;
import com.showcase.exception.DAOException;
import com.showcase.mainframe.general.CustomVector;
import com.showcase.mainframe.general.DealersAttended;
import com.showcase.mainframe.general.JMainframeImpl;
import com.showcase.mainframe.general.Transaction;
import com.showcase.util.BaseDAO;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.sql.*;
+import java.text.SimpleDateFormat;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Vector;
+
@SuppressWarnings("unchecked")
-public class FinalizeShowcaseDAOImpl extends BaseDAO implements FinalizeShowcaseDAO{
+public class FinalizeShowcaseDAOImpl extends BaseDAO implements FinalizeShowcaseDAO {
- private static final Log log = LogFactory.getLog(FinalizeShowcaseDAOImpl.class);
-
- public FinalizeShowcaseDAOImpl(){
-
- }
-
- public int finalizeShowCase(int event_id) throws DAOException{
- log.info("event_id=>"+event_id);
- @SuppressWarnings("unused")
- String TRANSACTION_CODE="DLRATN ";
- @SuppressWarnings("unused")
- SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
- int DEALERS_TO_PASS = 40;
- int totalAccepted = 0;
-
- ResultSet rs = null;
- Connection con=null;
- PreparedStatement pstmt = null;
- StringBuffer buff=null;
- Vector dealers=new Vector();
- try{
- if(log.isDebugEnabled())
- log.debug("Finalizing Showcase");
- con=getDBConnection();
- buff=new StringBuffer("SELECT DEALER_ID FROM ATTENDEES WHERE EVENT_ID=");
- buff.append(event_id);
- buff.append(" AND CHECKED_IN='Y'");
- pstmt=con.prepareStatement(buff.toString());
- rs=pstmt.executeQuery();
- String dealer=null;
- while(rs.next()){
- dealer=(String)rs.getString(1);
- if (!dealers.contains(dealer))
- dealers.add(dealer);
- }
-
- rs.close();
- pstmt.close();
- buff=new StringBuffer("SELECT EVENT_CODE, START_DATE, STOP_DATE FROM EVENTS WHERE EVENT_ID=");
- buff.append(event_id);
- pstmt=con.prepareStatement(buff.toString());
- rs=pstmt.executeQuery();
- String eventCode=null;
- Date startDate=null;
- Date stopDate=null;
- while(rs.next()){
- eventCode=(String)rs.getString(1);
- startDate=(Date)rs.getDate(2);
- stopDate=(Date)rs.getDate(3);
- }
- //get the ticket_buyin flag for dealers to send
-
- Map dealerVsTicketBuyIn = new HashMap();
- if(dealers.size() > 0 ){
-
- String dealersCommSeplist = StringUtils.join(dealers.iterator(), "','");
- dealersCommSeplist = "'" + dealersCommSeplist + "'";
-
- if(log.isDebugEnabled()) {
- log.info("dealersCommSeplist:"+dealersCommSeplist);
- }
- buff=new StringBuffer("SELECT dealer_id, event_id, ticket_buyin FROM dealer_events ");
- buff.append(" WHERE event_id = ");
- buff.append(event_id);
- buff.append(" AND dealer_id IN (");
- buff.append(dealersCommSeplist);
- buff.append(")");
-
- pstmt=con.prepareStatement(buff.toString());
- rs=pstmt.executeQuery();
- String ticketBuyId = null;
- while(rs.next()){
- String dealerId = (String)rs.getString("dealer_id");
- ticketBuyId=(String)rs.getString("ticket_buyin");
- dealerVsTicketBuyIn.put(dealerId, ticketBuyId);
- }
- }
- if(log.isDebugEnabled()) {
- log.debug(" dealerVsTicketBuyIn:"+dealerVsTicketBuyIn);
- }
-
- log.info(" Sending dealers to mainframe ");
-
- Vector dealersToPass=new Vector();
- log.info(" dealers.size()=>"+dealers.size());
- for (int i = 0; i < dealers.size(); i++) {
- String dealer1=(String)dealers.get(i);
- dealersToPass.add(dealer1);
- if(dealersToPass.size()==DEALERS_TO_PASS || i == dealers.size()-1){
- JMainframeImpl mf= new JMainframeImpl();
- Vector dtp=new Vector();
- for(int j=0; j"+responseFromMF);
- CustomVector cvec=null;
- try {
- transaction.parseMOD(responseFromMF);
- cvec= transaction.getMODDefinition();
- log.info("cvec=>"+cvec);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- if(!cvec.get("Message").equals("ERROR") && ! cvec.get("Message").toString().equalsIgnoreCase("bad show code"))
- totalAccepted=totalAccepted+Integer.parseInt((String)cvec.get("DealersInserted"));
- dealersToPass.clear();
-
-
- log.info("Total Dealers accepted by mainframe" + totalAccepted);
- }
- }
-
- StringBuffer setStatus=new StringBuffer();
- setStatus.append("UPDATE events set status='F' WHERE event_id=");
- setStatus.append(event_id);
- pstmt=con.prepareStatement(setStatus.toString());
- int updateValue=pstmt.executeUpdate();
-
- if(updateValue==0){
- log.info(" Event status value has been set to F ");
- }
+ private static final Log log = LogFactory.getLog(FinalizeShowcaseDAOImpl.class);
- } catch (SQLException sqlE)
- {
- log.error("SQLException while finalizing showcase ", sqlE);
- throw new DAOException("SQLException while finalizing showcase " + sqlE.getMessage());
- }
- catch (Exception e)
- {
- log.error("Exception while finalizing showcase ", e);
- throw new DAOException("Exception while finalizing showcase" + e.getMessage());
- }
- finally
- {
- try { con.close(); } catch(SQLException sq) { }
- }
+ public FinalizeShowcaseDAOImpl() {
- return totalAccepted;
-
-
}
-
-
+
+ public int finalizeShowCase(int event_id) throws DAOException {
+ log.info("event_id=>" + event_id);
+ @SuppressWarnings("unused")
+ String TRANSACTION_CODE = "DLRATN ";
+ @SuppressWarnings("unused")
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+ int DEALERS_TO_PASS = 40;
+ int totalAccepted = 0;
+
+ ResultSet rs = null;
+ Connection con = null;
+ PreparedStatement pstmt = null;
+ StringBuffer buff = null;
+ Vector dealers = new Vector();
+ try {
+ if (log.isDebugEnabled())
+ log.debug("Finalizing Showcase");
+ con = getDBConnection();
+ buff = new StringBuffer("SELECT DEALER_ID FROM ATTENDEES WHERE EVENT_ID=");
+ buff.append(event_id);
+ buff.append(" AND CHECKED_IN='Y'");
+ pstmt = con.prepareStatement(buff.toString());
+ rs = pstmt.executeQuery();
+ String dealer = null;
+ while (rs.next()) {
+ dealer = (String) rs.getString(1);
+ if (!dealers.contains(dealer))
+ dealers.add(dealer);
+ }
+
+ rs.close();
+ pstmt.close();
+ buff = new StringBuffer("SELECT EVENT_CODE, START_DATE, STOP_DATE FROM EVENTS WHERE EVENT_ID=");
+ buff.append(event_id);
+ pstmt = con.prepareStatement(buff.toString());
+ rs = pstmt.executeQuery();
+ String eventCode = null;
+ Date startDate = null;
+ Date stopDate = null;
+ while (rs.next()) {
+ eventCode = (String) rs.getString(1);
+ startDate = (Date) rs.getDate(2);
+ stopDate = (Date) rs.getDate(3);
+ }
+ //get the ticket_buyin flag for dealers to send
+
+ Map dealerVsTicketBuyIn = new HashMap();
+ if (dealers.size() > 0) {
+
+ String dealersCommSeplist = StringUtils.join(dealers.iterator(), "','");
+ dealersCommSeplist = "'" + dealersCommSeplist + "'";
+
+ if (log.isDebugEnabled()) {
+ log.info("dealersCommSeplist:" + dealersCommSeplist);
+ }
+ buff = new StringBuffer("SELECT dealer_id, event_id, ticket_buyin FROM dealer_events ");
+ buff.append(" WHERE event_id = ");
+ buff.append(event_id);
+ buff.append(" AND dealer_id IN (");
+ buff.append(dealersCommSeplist);
+ buff.append(")");
+
+ pstmt = con.prepareStatement(buff.toString());
+ rs = pstmt.executeQuery();
+ String ticketBuyId = null;
+ while (rs.next()) {
+ String dealerId = (String) rs.getString("dealer_id");
+ ticketBuyId = (String) rs.getString("ticket_buyin");
+ dealerVsTicketBuyIn.put(dealerId, ticketBuyId);
+ }
+ }
+ if (log.isDebugEnabled()) {
+ log.debug(" dealerVsTicketBuyIn:" + dealerVsTicketBuyIn);
+ }
+
+ log.info(" Sending dealers to mainframe ");
+
+ Vector dealersToPass = new Vector();
+ log.info(" dealers.size()=>" + dealers.size());
+ for (int i = 0; i < dealers.size(); i++) {
+ String dealer1 = (String) dealers.get(i);
+ dealersToPass.add(dealer1);
+ if (dealersToPass.size() == DEALERS_TO_PASS || i == dealers.size() - 1) {
+ JMainframeImpl mf = new JMainframeImpl();
+ Vector dtp = new Vector();
+ for (int j = 0; j < dealersToPass.size(); j++) {
+ dtp.add(dealersToPass.get(j));
+ }
+
+ Transaction transaction = new DealersAttended(eventCode, startDate, stopDate, dtp, dealerVsTicketBuyIn);
+ log.info("Transaction");
+ String responseFromMF = (String) mf.getData(transaction.getMID());
+ log.info("responseFromMF=>" + responseFromMF);
+ CustomVector cvec = null;
+ try {
+ transaction.parseMOD(responseFromMF);
+ cvec = transaction.getMODDefinition();
+ log.info("cvec=>" + cvec);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ if (!cvec.get("Message").equals("ERROR") && !cvec.get("Message").toString().equalsIgnoreCase("bad show code"))
+ totalAccepted = totalAccepted + Integer.parseInt((String) cvec.get("DealersInserted"));
+ dealersToPass.clear();
+
+
+ log.info("Total Dealers accepted by mainframe" + totalAccepted);
+ }
+ }
+
+ StringBuffer setStatus = new StringBuffer();
+ setStatus.append("UPDATE events set status='F' WHERE event_id=");
+ setStatus.append(event_id);
+ pstmt = con.prepareStatement(setStatus.toString());
+ int updateValue = pstmt.executeUpdate();
+
+ if (updateValue == 0) {
+ log.info(" Event status value has been set to F ");
+ }
+
+ } catch (SQLException sqlE) {
+ log.error("SQLException while finalizing showcase ", sqlE);
+ throw new DAOException("SQLException while finalizing showcase " + sqlE.getMessage());
+ } catch (Exception e) {
+ log.error("Exception while finalizing showcase ", e);
+ throw new DAOException("Exception while finalizing showcase" + e.getMessage());
+ } finally {
+ try {
+ con.close();
+ } catch (SQLException sq) {
+ }
+ }
+
+ return totalAccepted;
+
+
+ }
+
+
}
Index: trunk/WEB-INF/src/com/showcase/sql/DealerSearchDAOImpl.java
===================================================================
diff -u -r208 -r223
--- trunk/WEB-INF/src/com/showcase/sql/DealerSearchDAOImpl.java (.../DealerSearchDAOImpl.java) (revision 208)
+++ trunk/WEB-INF/src/com/showcase/sql/DealerSearchDAOImpl.java (.../DealerSearchDAOImpl.java) (revision 223)
@@ -35,7 +35,7 @@
con = getDBConnection();
StringBuffer buff = new StringBuffer();
buff.append(" select a.dealer_id, r.role, dl.given_dealer_name, dl.salesman, dl.second_salesman, dl.city, dl.state, a.attendee_id, ");
- buff.append(" a.attending_show, a.attending_hosp, a.attendee_name, a.checked_in, a.role_id ");
+ buff.append(" a.attending_show, a.attending_hosp, a.attendee_name, a.checked_in, a.checked_in_2nd_day, a.role_id ");
buff.append(" FROM attendees a ");
buff.append(" LEFT JOIN roles r ON a.role_id = r.role_id, dealers dl WHERE a.status != 'D'");
buff.append(" AND a.dealer_id = dl.dealer_id AND a.event_id=");
@@ -110,7 +110,7 @@
con = getDBConnection();
StringBuffer buff = new StringBuffer();
buff.append(" select a.dealer_id, r.role, dl.given_dealer_name, dl.salesman, dl.second_salesman, dl.city, dl.state, a.attendee_id, ");
- buff.append(" a.attending_show, a.attending_hosp, a.attendee_name, a.checked_in, a.role_id ");
+ buff.append(" a.attending_show, a.attending_hosp, a.attendee_name, a.checked_in, a.checked_in_2nd_day, a.role_id ");
buff.append(" FROM attendees a ");
buff.append(" LEFT JOIN roles r ON a.role_id = r.role_id, dealers dl WHERE a.status != 'D'");
buff.append(" AND a.dealer_id = dl.dealer_id AND a.event_id=");
@@ -171,7 +171,8 @@
report.setAttendingHosp(rs.getString(10));
report.setAttendeeName(rs.getString(11));
report.setCheckIn(rs.getString(12));
- report.setRoleId(rs.getInt(13));
+ report.setCheckIn2ndDay(rs.getString(13));
+ report.setRoleId(rs.getInt(14));
return report;
}
Index: trunk/excel/showPerRepRadiusReport.jsp
===================================================================
diff -u -r208 -r223
--- trunk/excel/showPerRepRadiusReport.jsp (.../showPerRepRadiusReport.jsp) (revision 208)
+++ trunk/excel/showPerRepRadiusReport.jsp (.../showPerRepRadiusReport.jsp) (revision 223)
@@ -1,22 +1,23 @@
-<%-----------------------------------------------------------
-* SHOWCASE APPLICATION *
-* version 3.0 *
-------------------------------------------------------------%>
-<% response.reset(); %>
+<%@ page import="com.showcase.model.PerRepRadiusReportObject" %>
+<%@ page import="java.io.PrintWriter" %>
+<%@ taglib uri="/WEB-INF/tlds/c.tld" prefix="c" %>
<%@ page contentType="application/vnd.ms-excel; charset=UTF-8" %>
+<%
+ response.reset();
+ response.setHeader("Content-Disposition", "attachment; filename=\"PerRepRadiusReport.csv\"");
+ PrintWriter pw = response.getWriter();
+ pw.println("Region Name,Salesman,Dealer ID,Dealer Name,Phone Number, Distance From Event");
+ PerRepRadiusReportObject[] perRepRadiusReport = (PerRepRadiusReportObject[]) request.getAttribute("perRepRadiusReport");
+ for (int i = 0; i < perRepRadiusReport.length; i++) {
+ PerRepRadiusReportObject radiusReport = perRepRadiusReport[i];
-<%-- Set the content disposition header --%>
-<% response.setHeader("Content-Disposition", "attachment; filename=\"PerRepRadiusReport.csv\""); %>
-
-<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
-<%@ taglib uri="/WEB-INF/tlds/struts-html-el.tld" prefix="html-el" %>
-<%@ taglib uri="/WEB-INF/tlds/c.tld" prefix="c" %>
-<%@ taglib uri="/WEB-INF/tlds/pager-taglib.tld" prefix="pg" %>
-"Region Name","Salesman","Dealer ID","Dealer Name","Phone Number","Distance From Event"
-
-
-"","","","","",""
-
-
\ No newline at end of file
+ pw.println(
+ "\"" + radiusReport.getRegionName() + "\",\""
+ + radiusReport.getSalesman() + "\",\""
+ + radiusReport.getDealerId() + "\",\""
+ + radiusReport.getGivenDealerName() + "\",\""
+ + radiusReport.getPhoneNumber() + "\",\""
+ + radiusReport.getDistanceFromEvent() + "\""
+ );
+ }
+%>
Index: trunk/excel/showAttendeesSpecialEvent.jsp
===================================================================
diff -u -r211 -r223
--- trunk/excel/showAttendeesSpecialEvent.jsp (.../showAttendeesSpecialEvent.jsp) (revision 211)
+++ trunk/excel/showAttendeesSpecialEvent.jsp (.../showAttendeesSpecialEvent.jsp) (revision 223)
@@ -1,17 +1,51 @@
+<%@ page import="com.showcase.model.AllAttendeesObject" %>
+<%@ page import="com.showcase.model.DealerEventNote" %>
+<%@ page import="java.io.PrintWriter" %>
+<%@ page import="java.util.List" %>
<%@ taglib uri="/WEB-INF/tlds/c.tld" prefix="c" %>
<%@ page contentType="application/vnd.ms-excel; charset=UTF-8" %>
-<% response.reset(); %><% response.setHeader("Content-Disposition", "attachment; filename=\"attendeesPreShow.csv\""); %>
-"Region","Rep 1","Rep 2","Dealer","Level","Dealer Name","Attendee","Title","Ticket
-#","Attendee Email","Showing","Address1","Address2","City","State","Zip","Attending Showcase","Attending Meet and Greet","Notes"
-"","","","","
- ","","","","","","YES","","","","","","
- YES","YES"
- ,""
-
-
+<%
+ response.reset();
+ response.setHeader("Content-Disposition", "attachment; filename=\"attendeesPreShow.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,Attending Showcase, Attending Meet and Greet,Notes");
+
+
+ AllAttendeesObject[] showAttendees = (AllAttendeesObject[]) request.getAttribute("showattendees");
+
+
+ for (int i = 0; i < showAttendees.length; i++) {
+ AllAttendeesObject showattendee = showAttendees[i];
+ List dealerEventNoteList = (List) showattendee.getDealerEventNoteList();
+
+ String dealerNotes = "";
+ if (dealerEventNoteList != null) {
+ for (int j = 0; j < dealerEventNoteList.size(); j++) {
+ dealerNotes = dealerNotes + 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() + "\",\""
+ + showattendee.getAttendingShow() + "\",\""
+ + showattendee.getAttendingMeetAndGreet() + "\",\""
+ + dealerNotes + "\""
+ );
+ }
+%>
Index: trunk/ver3/completeReport.jsp
===================================================================
diff -u -r208 -r223
--- trunk/ver3/completeReport.jsp (.../completeReport.jsp) (revision 208)
+++ trunk/ver3/completeReport.jsp (.../completeReport.jsp) (revision 223)
@@ -128,11 +128,11 @@
- | Total Attendees: |
- | Total Dealers: |
+ | Total Attendees: |
+ | Total Dealers: |
- | Total No-Shows: |
- | Total Dealers: |
+ | Total No-Shows: |
+ | Total Dealers: |
@@ -144,7 +144,8 @@
| Dealer Name |
Attendee Name |
Attended |
-
+ Attended 2nd Day |
+
@@ -155,7 +156,8 @@
|
|
|
-  |
+ |
+ |
@@ -168,7 +170,8 @@
|
|
|
-
+ |
+
Index: trunk/excel/showPerRepReport.jsp
===================================================================
diff -u -r208 -r223
--- trunk/excel/showPerRepReport.jsp (.../showPerRepReport.jsp) (revision 208)
+++ trunk/excel/showPerRepReport.jsp (.../showPerRepReport.jsp) (revision 223)
@@ -17,83 +17,115 @@
<%@ taglib uri="/WEB-INF/tlds/c.tld" prefix="c" %>
<%@ taglib uri="/WEB-INF/tlds/pager-taglib.tld" prefix="pg" %>
-
-
-Attended |
-
-
-Dealer ID |
-Dealer Name |
-Dealer Attendee Name |
-
-
-
-
-
-
- |
- |
- |
-
-
-
-
-
-
Total Attendees: |
-
-
- | Total Dealers: |
-
+
+
+
+ Attended
+ |
+
+
+
+ Dealer ID
+ |
+
+ Dealer Name
+ |
+
+ Dealer Attendee Name
+ |
+
+
+
+
+
+ |
+ |
+ |
+
+
+
+
+
+
+
Total Attendees:
+
+ |
+
+
+ | Total Dealers:
+
+ |
+
-
-Not Attended |
-
-
-Dealer ID |
-Dealer Name |
-Dealer Attendee Name |
-
-
-
-
-
-
- |
- |
- |
-
-
-
-
-
-
Total No-Shows: |
-
-
- | Total Dealers: |
-
-
-Dealers by walkins |
-
-
-Dealer ID |
-Rep ID |
-Rep Name |
-
+
+
+ Not Attended
+ |
+
+
+
+ Dealer ID
+ |
+
+ Dealer Name
+ |
+
+ Dealer Attendee Name
+ |
+
-
-
-
-
-
- |
- |
- |
-
-
-
-
-
+
+
+
+
+ |
+ |
+ |
+
+
+
+
+
+
+
Total No-Shows:
+
+ |
+
+
+ | Total Dealers:
+
+ |
+
-
\ No newline at end of file
+
+
+ Dealers by walkins
+ |
+
+
+
+ Dealer ID
+ |
+
+ Rep ID
+ |
+
+ Rep Name
+ |
+
+
+
+
+
+
+
+ |
+ |
+ |
+
+
+
+
+
Index: trunk/WEB-INF/src/com/showcase/actions/DealerAttendeesForm.java
===================================================================
diff -u -r216 -r223
--- trunk/WEB-INF/src/com/showcase/actions/DealerAttendeesForm.java (.../DealerAttendeesForm.java) (revision 216)
+++ trunk/WEB-INF/src/com/showcase/actions/DealerAttendeesForm.java (.../DealerAttendeesForm.java) (revision 223)
@@ -33,7 +33,9 @@
private ImageButtonBean finish;
private ImageButtonBean submit;
-
+
+ private ImageButtonBean submitToMainframeAsAttended;
+
private ImageButtonBean addNewRow;
@@ -50,6 +52,8 @@
private List dealerEventNoteList;
private String note;
+
+ private boolean submittedToMainframe;
@@ -69,6 +73,7 @@
submit = new ImageButtonBean();
addNewRow = new ImageButtonBean();
dealerItems = new DealerAttendee[MAX_DEALER_ATTENDEES];
+ submitToMainframeAsAttended = new ImageButtonBean();
}
/**
@@ -133,6 +138,10 @@
return update;
}
+ public ImageButtonBean getSubmitToMainframeAsAttended() {
+ return submitToMainframeAsAttended;
+ }
+
public ImageButtonBean getSubmit() {
return submit;
}
@@ -208,6 +217,14 @@
this.note = note;
}
+ public boolean getSubmittedToMainframe() {
+ return submittedToMainframe;
+ }
+
+ public void setSubmittedToMainframe(boolean submittedToMainframe) {
+ this.submittedToMainframe = submittedToMainframe;
+ }
+
}
Index: trunk/excel/showAttendeesHospitality.jsp
===================================================================
diff -u -r211 -r223
--- trunk/excel/showAttendeesHospitality.jsp (.../showAttendeesHospitality.jsp) (revision 211)
+++ trunk/excel/showAttendeesHospitality.jsp (.../showAttendeesHospitality.jsp) (revision 223)
@@ -1,11 +1,50 @@
-<%@ taglib uri="/WEB-INF/tlds/c.tld" prefix="c" %><%@ page contentType="application/vnd.ms-excel; charset=UTF-8" %><% response.reset(); %><% response.setHeader("Content-Disposition", "attachment; filename=\"attendeesPreShow.csv\""); %>
-"Region","Rep 1","Rep 2","Dealer","Level","Dealer Name","Attendee","Title","Ticket
-#","Tix","AttendeeEmail","Day1","Day2","Address1","Address2","City","State","Zip","Notes"
-"","","","","","","","","","Yes","","Yes","Yes","","","","","",""
-
+<%@ page import="com.showcase.model.AllAttendeesObject" %>
+<%@ page import="com.showcase.model.DealerEventNote" %>
+<%@ page import="java.io.PrintWriter" %>
+<%@ page import="java.util.List" %>
+<%@ taglib uri="/WEB-INF/tlds/c.tld" prefix="c" %>
+<%@ page contentType="application/vnd.ms-excel; charset=UTF-8" %>
+<%
+ response.reset();
+ response.setHeader("Content-Disposition", "attachment; filename=\"attendeesPreShow.csv\"");
+ 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,Notes");
+
+ AllAttendeesObject[] showAttendees = (AllAttendeesObject[]) request.getAttribute("showattendees");
+
+
+ for (int i = 0; i < showAttendees.length; i++) {
+ AllAttendeesObject showattendee = showAttendees[i];
+ List dealerEventNoteList = (List) showattendee.getDealerEventNoteList();
+
+ String dealerNotes = "";
+ if (dealerEventNoteList != null) {
+ for (int j = 0; j < dealerEventNoteList.size(); j++) {
+ dealerNotes = dealerNotes + 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.getHasTicket() + "\",\""
+ + showattendee.getAttendeeEmail() + "\",\""
+ + showattendee.getCheckedInHospDay1() + "\",\""
+ + showattendee.getCheckedInHospDay2() + "\",\""
+ + showattendee.getAddress1() + "\",\""
+ + showattendee.getAddress2() + "\",\""
+ + showattendee.getCity() + "\",\""
+ + showattendee.getState() + "\",\""
+ + showattendee.getZipCode() + "\",\""
+ + dealerNotes + "\""
+ );
+ }
+%>
+
Index: trunk/WEB-INF/src/userloader.properties
===================================================================
diff -u -r220 -r223
--- trunk/WEB-INF/src/userloader.properties (.../userloader.properties) (revision 220)
+++ trunk/WEB-INF/src/userloader.properties (.../userloader.properties) (revision 223)
@@ -1,8 +1,9 @@
#database config
datasource=org.apache.tomcat.dbcp.dbcp.BasicDataSource
dbdriver=com.microsoft.sqlserver.jdbc.SQLServerDriver
-dbserver=dev-dbprod02vm
+dbserver=stg-dbprod04vm
database=intranet_authorizations
dbusername=ad_user
-dbpassword=DevPassword1
-testUser=vramisetti
\ No newline at end of file
+dbpassword=StgPassword1
+
+testUser=vramisetti
Index: trunk/WEB-INF/src/com/showcase/sql/PerRepReportDAOImpl.java
===================================================================
diff -u -r208 -r223
--- trunk/WEB-INF/src/com/showcase/sql/PerRepReportDAOImpl.java (.../PerRepReportDAOImpl.java) (revision 208)
+++ trunk/WEB-INF/src/com/showcase/sql/PerRepReportDAOImpl.java (.../PerRepReportDAOImpl.java) (revision 223)
@@ -106,12 +106,12 @@
con = getDBConnection();
StringBuffer buff = new StringBuffer();
buff.append(" select DISTINCT 'attended', d.salesman, d.dealer_id, d.given_dealer_name, ");
- buff.append(" a.attendee_name, a.checked_in FROM dealers d JOIN attendees a ON a.dealer_id=d.dealer_id WHERE a.event_id=");
+ buff.append(" a.attendee_name, a.checked_in, a.checked_in_2nd_day FROM dealers d JOIN attendees a ON a.dealer_id=d.dealer_id WHERE a.event_id=");
buff.append(event_id);
buff.append(" AND d.salesman='");
buff.append(salesman);
buff.append("' AND checked_in = 'y' UNION ALL ");
- buff.append(" SELECT DISTINCT 'noshow', d.salesman, d.dealer_id, d.given_dealer_name, a.attendee_name, a.checked_in ");
+ buff.append(" SELECT DISTINCT 'noshow', d.salesman, d.dealer_id, d.given_dealer_name, a.attendee_name, a.checked_in, a.checked_in_2nd_day ");
buff.append(" FROM dealers d JOIN attendees a on a.dealer_id=d.dealer_id ");
buff.append(" WHERE a.event_id=");
buff.append(event_id);
@@ -164,18 +164,24 @@
}
- protected CompleteReportObject extractCompleteReportObjectFromResultSet(ResultSet rs) throws SQLException
- {
+ protected CompleteReportObject extractCompleteReportObjectFromResultSet(ResultSet rs) throws SQLException {
CompleteReportObject report = new CompleteReportObject();
report.setSalesman(rs.getString("salesman"));
report.setDealerId(rs.getString("dealer_id"));
report.setGivenDealerName(rs.getString("given_dealer_name"));
report.setAttendeeName(rs.getString("attendee_name"));
- if(rs.getString("checked_in").equals("Y"))
+
+ if (rs.getString("checked_in").equals("Y")) {
report.setAttended(true);
- else
- if(rs.getString("checked_in").equals("N"))
+ } else if (rs.getString("checked_in").equals("N")) {
report.setAttended(false);
+ }
+
+ if (rs.getString("checked_in_2nd_day") != null && rs.getString("checked_in_2nd_day").equals("Y")) {
+ report.setAttendedSecondDay(true);
+ } else {
+ report.setAttendedSecondDay(false);
+ }
return report;
}
Index: trunk/WEB-INF/src/com/showcase/util/BaseDAO.java
===================================================================
diff -u -r208 -r223
--- trunk/WEB-INF/src/com/showcase/util/BaseDAO.java (.../BaseDAO.java) (revision 208)
+++ trunk/WEB-INF/src/com/showcase/util/BaseDAO.java (.../BaseDAO.java) (revision 223)
@@ -14,7 +14,7 @@
*
* @throws SQLException
*/
- protected Connection getDBConnection() throws SQLException {
+ public Connection getDBConnection() throws SQLException {
Context ctx = null;
Connection conn = null;
Index: trunk/ver3/finalized.jsp
===================================================================
diff -u -r208 -r223
--- trunk/ver3/finalized.jsp (.../finalized.jsp) (revision 208)
+++ trunk/ver3/finalized.jsp (.../finalized.jsp) (revision 223)
@@ -77,9 +77,8 @@
Attendence - Summary
-Show has been finalized!
-Reps have been emailed.
- dealers were accepted by the mainframe
+Show has been finalized!
+Reps have been emailed.
@@ -96,4 +95,4 @@
 |
-
\ No newline at end of file
+
Index: trunk/WEB-INF/src/com/showcase/model/DealerEvent.java
===================================================================
diff -u -r208 -r223
--- trunk/WEB-INF/src/com/showcase/model/DealerEvent.java (.../DealerEvent.java) (revision 208)
+++ trunk/WEB-INF/src/com/showcase/model/DealerEvent.java (.../DealerEvent.java) (revision 223)
@@ -18,9 +18,13 @@
private String registeredBy;
private String approved;
+
+ private boolean ticketBuyIn;
private String dateReminderEmailed;
+ private boolean submittedToMainframe;
+
public String getDealerId() {
return dealerId;
}
@@ -61,6 +65,14 @@
this.approved = approved;
}
+ public boolean isTicketBuyIn() {
+ return ticketBuyIn;
+ }
+
+ public void setTicketBuyIn(boolean ticketBuyIn) {
+ this.ticketBuyIn = ticketBuyIn;
+ }
+
public String getDateReminderEmailed() {
return dateReminderEmailed;
}
@@ -69,11 +81,11 @@
this.dateReminderEmailed = dateReminderEmailed;
}
-
+ public boolean isSubmittedToMainframe() {
+ return submittedToMainframe;
+ }
-
-
-
-
-
+ public void setSubmittedToMainframe(boolean submittedToMainframe) {
+ this.submittedToMainframe = submittedToMainframe;
+ }
}
Index: trunk/WEB-INF/src/com/showcase/actions/FinalizeAction.java
===================================================================
diff -u -r208 -r223
--- trunk/WEB-INF/src/com/showcase/actions/FinalizeAction.java (.../FinalizeAction.java) (revision 208)
+++ trunk/WEB-INF/src/com/showcase/actions/FinalizeAction.java (.../FinalizeAction.java) (revision 223)
@@ -20,7 +20,7 @@
ShowCaseDelegate showCaseDelegate = new ShowCaseDelegate();
request.setAttribute("showcaseinfo", showCaseDelegate.getShowCaseInfo(event_id));
request.setAttribute("showtotals", showCaseDelegate.getSummaryReport(event_id));
- request.setAttribute("totalAccepted", "" + showCaseDelegate.finalizeShowCase(event_id));
+// request.setAttribute("totalAccepted", "" + showCaseDelegate.finalizeShowCase(event_id));
// ************* SEND EMAIL ***********************
Index: trunk/WEB-INF/src/com/showcase/actions/DealerAttendeesAction.java
===================================================================
diff -u -r208 -r223
--- trunk/WEB-INF/src/com/showcase/actions/DealerAttendeesAction.java (.../DealerAttendeesAction.java) (revision 208)
+++ trunk/WEB-INF/src/com/showcase/actions/DealerAttendeesAction.java (.../DealerAttendeesAction.java) (revision 223)
@@ -90,6 +90,7 @@
dealerForm.setDealerInfo(dealerInfo);
dealerForm.setRoles(showCaseDelegate.getRoles());
+ dealerForm.setSubmittedToMainframe(showCaseDelegate.getIfDealerSubmittedToMainframe(event_id, dealer_id));
session.setAttribute("dealerForm", dealerForm);
log.info("isShowcase?"+showCaseInfo.getIsShowcase());
@@ -111,4 +112,4 @@
blankList.add(datt);
}
}
-}
\ No newline at end of file
+}
Index: trunk/ver3/attendanceRegistrationHospitality.jsp
===================================================================
diff -u -r208 -r223
--- trunk/ver3/attendanceRegistrationHospitality.jsp (.../attendanceRegistrationHospitality.jsp) (revision 208)
+++ trunk/ver3/attendanceRegistrationHospitality.jsp (.../attendanceRegistrationHospitality.jsp) (revision 223)
@@ -128,8 +128,14 @@
|
IDNAME |
|
- DEALER IDDEALER NAMEATTENDEE |
- |
+
+ DEALER ID
+ DEALER NAME
+ 2nd
+ 1st
+ ATTENDEE
+ |
+ |
Index: trunk/ver3/dealerAttendeesShowcase.jsp
===================================================================
diff -u -r216 -r223
--- trunk/ver3/dealerAttendeesShowcase.jsp (.../dealerAttendeesShowcase.jsp) (revision 216)
+++ trunk/ver3/dealerAttendeesShowcase.jsp (.../dealerAttendeesShowcase.jsp) (revision 223)
@@ -12,6 +12,11 @@
<%@include file="/common/header.jsp"%>
+
+
+
+
+