Update of /var/cvs/contributions/natmm/templates/editors/evenementen/util
In directory
james.mmbase.org:/tmp/cvs-serv15739/templates/editors/evenementen/util
Modified Files:
double_booking.jsp
Log Message:
NMCMS-481
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/evenementen/util
See also: http://www.mmbase.org/jira/browse/NMCMS-481
Index: double_booking.jsp
===================================================================
RCS file:
/var/cvs/contributions/natmm/templates/editors/evenementen/util/double_booking.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- double_booking.jsp 5 Jun 2006 08:29:05 -0000 1.1
+++ double_booking.jsp 29 Apr 2008 08:46:46 -0000 1.2
@@ -15,25 +15,40 @@
long nowSec = (new java.util.Date()).getTime()/1000;
String lastName = "";
String lastTitle = "";
+ String lastDateTime = "";
+ String ticketOffice = "";
+ String ticketOfficeSource = "";
%>
<mm:list path="inschrijvingen,posrel,evenement"
- constraints="<%=
"inschrijvingen.ticket_office='website' AND evenement.begindatum > " + nowSec
%>"
+ constraints="<%= "evenement.begindatum > " + nowSec %>"
orderby="inschrijvingen.number">
<mm:field name="evenement.begindatum" jspvar="cdate"
vartype="String" write="false">
<mm:field name="evenement.titel" jspvar="etitle"
vartype="String" write="false">
<mm:node element="inschrijvingen">
+ <mm:field name="ticket_office" jspvar="ticket_office"
vartype="String" write="false">
+ <%ticketOffice = ticket_office;%>
+ </mm:field>
+ <mm:field name="ticket_office_source"
jspvar="ticket_office_source" vartype="String" write="false">
+ <%ticketOfficeSource = ticket_office_source;%>
+ </mm:field>
<mm:field name="number" jspvar="ticket_number"
vartype="String" write="false">
<mm:related path="posrel,deelnemers" max="1"
fields="deelnemers.titel">
<mm:field name="deelnemers.titel"
jspvar="name" vartype="String" write="false">
+ <mm:time time="<%= cdate %>" format="dd-MM-yyyy hh:mm"
jspvar="dateTime" vartype="String">
+
<%
- if(lastName.equals(name) &&
lastTitle.equals(etitle)) { // this is probably a double booking
+ if(lastName.equals(name) &&
lastTitle.equals(etitle) && lastDateTime.equals(dateTime) ){ // this is
probably a double booking
%><%= ticket_number %>
- <%= name %>
- <%= etitle %>
- - <mm:time time="<%=
cdate %>" format="dd-MM-yyyy hh:mm" /><br/><%
+ - <%= dateTime %>
+ - aanmelding via: <%=ticketOffice %>
(<%=ticketOfficeSource %>)<br/><%
+
}
lastName= name;
- lastTitle = etitle; %>
+ lastTitle = etitle;
+ lastDateTime = dateTime; %>
+ </mm:time>
</mm:field>
</mm:related>
</mm:field>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
