Index: trunk/ver3/dealerAttendeesHospitality.jsp =================================================================== diff -u -r212 -r232 --- trunk/ver3/dealerAttendeesHospitality.jsp (.../dealerAttendeesHospitality.jsp) (revision 212) +++ trunk/ver3/dealerAttendeesHospitality.jsp (.../dealerAttendeesHospitality.jsp) (revision 232) @@ -3,212 +3,282 @@ * version 3.0 * ------------------------------------------------------------%> <%@ taglib uri="/WEB-INF/tlds/fmt.tld" prefix="fmt" %> -<%@page import="com.showcase.actions.DealerAttendee"%> -<%@page import="com.showcase.model.DealerInfo"%> +<%@page import="com.showcase.actions.DealerAttendee" %> - + + + + + + -<%@include file="/common/header.jsp"%> +<%@include file="/common/header.jsp" %> - - - - - + + + + +
- - - - - - - - - - - -
Edit ShowcaseAttendance RegistrationSummary ReportComplete Reportper Rep ReportFinalize Showcase
-
+ + + + + + + + + + + +
Edit ShowcaseAttendance RegistrationSummary ReportComplete Reportper Rep ReportFinalize Showcase
+
- - - - - - - - + + + + + + + - - - - - - - - - - - - - - + style="font-family: Arial; font-weight: bold; font-size: 15px; color: #FFFFFF; margin-right:0px; margin-left:2px;">SELECTED DEALER + + + + + + + + + +
- - +
+ + SELECTED DEALER - - - -
- DEALER ATTENDEES - - - -
- 		- -
- - + + + + + + - - + + + + + + + + + + + + - - - - - - <%DealerAttendee dealerAttnd = (DealerAttendee) pageContext.getAttribute("dealerItems");%> - - - - -
-
- +
- - - - - + + + + + + + + + + + + + + + +
+ DEALER ATTENDEES + - - - - - - - - - - - - -
Dealership:
Dealer Id:
City:
State:
Zip:
Program:
Tickets:
- -<%-- update dealer form --%> - - - - - - - - - -
 
-
- - - - - - - -
 
-
-
Notes:
- -
 
- - -
- - -<%---------------------------------------- End Form to update notes ------------------------------------%> - - 		- - - + +
- -<%-- update dealer attendees form --%> - - -
- -
-
-   - Attendee Name - Role - Tix - Day1 - Day2 - Ticket # - Email Id -
-
- - - - - - -
- - - - - - - + +
+ 		+ +
+ + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Dealership:
Dealer Id:
City:
State:
Zip:
Program:
Tickets:
+ + <%-- update dealer form --%> + + + + + + +
 
+
+ + + + + + + + + + + + + +
 
- -
- - - - -
- -<%-- update dealer attendees form end --%> - -
- 		- -
Notes:
+ +
 
+ + +
+ + + <%---------------------------------------- End Form to update notes ------------------------------------%> + + 		+ + + + + + +
+ + <%-- update dealer attendees form --%> + + +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Attendee NameRoleTixDay 1
checkin		Day 2
checkin		Ticket #Email IdActions
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%DealerAttendee dealerAttnd = (DealerAttendee) pageContext.getAttribute("dealerItems");%> +
+
+ + +
+ +
+
+ +
+ + <%-- update dealer attendees form end --%> + +
+ 		+ +
Index: trunk/ver3/dealerAttendeesShowcase.jsp =================================================================== diff -u -r225 -r232 --- trunk/ver3/dealerAttendeesShowcase.jsp (.../dealerAttendeesShowcase.jsp) (revision 225) +++ trunk/ver3/dealerAttendeesShowcase.jsp (.../dealerAttendeesShowcase.jsp) (revision 232) @@ -4,234 +4,281 @@ ------------------------------------------------------------%> <%@ taglib uri="/WEB-INF/tlds/fmt.tld" prefix="fmt" %> <%@ taglib uri="/WEB-INF/tlds/fn.tld" prefix="fn" %> -<%@page import="com.showcase.actions.DealerAttendee"%> -<%@page import="com.showcase.actions.DealerAttendeesForm"%> -<%@page import="com.showcase.model.DealerInfo"%> +<%@page import="com.showcase.actions.DealerAttendee" %> +<%@page import="com.showcase.actions.DealerAttendeesForm" %> - + - -<%@include file="/common/header.jsp"%> + +<%@include file="/common/header.jsp" %> - - - - - + + + + +
- - - - - - - - - - - -
Edit ShowcaseAttendance RegistrationSummary ReportComplete Reportper Rep ReportFinalize Showcase
-
+ + + + + + + + + + + +
Edit ShowcaseAttendance RegistrationSummary ReportComplete Reportper Rep ReportFinalize Showcase
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + +
- - - SELECTED DEALER - - - -
- DEALER ATTENDEES - - - -
- 		- -
- - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +
Dealership:
Dealer Id:
City:
State:
Zip:
Program:
Tickets:
+
+ + + SELECTED DEALER + + + + + + + + +
+ DEALER ATTENDEES + + + +
+ 		+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -
Dealership:
Dealer Id:
City:
State:
Zip:
Program:
Tickets:
- + - + + - + + -
- -<%-- update notes form --%> - - - - - - - - - - -
-
- - - - - - - -
 
-
-
Notes:
- -
 
- - -
- - -<%-- update notes form end --%> - -
- 		- - - + + + + -
- -<%-- update dealer attendees form --%> - - -
- - -
-
- - - - - - - - - - + <%-- update notes form --%> + +
- Attendee NameRoleDay 1
checkin		Day 2
checkin		Ticket #Email IdActions
- - - - - - - - + +
- - - - - - - - - - -
+
+ + + + + + + + + + + + - - - -
 
- - - - - <%DealerAttendee dealerAttnd = (DealerAttendee) pageContext.getAttribute("dealerItems");%> -
-
- - -
- -
- -
- -<%-- update dealer attendees form end --%> +
+
+
Notes:
- 		- -
+ +
 
+ + +
+ + + <%-- update notes form end --%> + + + + + + + + + + + +
+ + <%-- update dealer attendees form --%> + + +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ Attendee NameRoleDay 1
checkin		Day 2
checkin		Ticket #Email IdActions
+ + + + + + + + + + + + + + + + <%DealerAttendee dealerAttnd = (DealerAttendee) pageContext.getAttribute("dealerItems");%> +
+
+ + +
+ +
+ +
+ + <%-- update dealer attendees form end --%> + +
+ + + + + + + + Index: trunk/WEB-INF/src/com/showcase/actions/UpdateDealerAttendeesAction.java =================================================================== diff -u -r229 -r232 --- trunk/WEB-INF/src/com/showcase/actions/UpdateDealerAttendeesAction.java (.../UpdateDealerAttendeesAction.java) (revision 229) +++ trunk/WEB-INF/src/com/showcase/actions/UpdateDealerAttendeesAction.java (.../UpdateDealerAttendeesAction.java) (revision 232) @@ -233,7 +233,7 @@ ShowCaseDetailObject showCaseDetailObject, String dealer_id, int event_id, HttpServletRequest request) throws Exception { DealerEvent dealerEvent = showCaseDelegate.getDealerEvent(event_id, dealer_id); - if (dealerEvent.isSubmittedToMainframe() != true) { + if (showCaseDetailObject.getIsShowcase().equalsIgnoreCase("Y") && dealerEvent.isSubmittedToMainframe() != true) { AllAttendeesObject[] dealerAttendees = showCaseDelegate.dealerAttendees(event_id, dealer_id); if (dealerAttendees != null && dealerAttendees.length > 0 && atLeastOneAttendeeCheckedIn(dealerAttendees) == true) {