/kickup/trunk/src/ak/kickup/core/RegistrationMail.txt |
---|
13,4 → 13,4 |
В качестве Verwendungszweck укажите ваш номер, %ident%. |
Если у вас есть вопросы, обращайтесь к организаторам |
(%eventAdmins%) по адресу %eventEmail%. |
(%eventAdmins%) по адресу %eventEmail% или телефонам %eventPhones% |
/kickup/trunk/src/ak/kickup/core/action/AdminEventAction.java |
---|
74,6 → 74,7 |
showForm.set("name", event.getName()); |
showForm.set("email", event.getEmail()); |
showForm.set("admins", event.getAdmins()); |
showForm.set("phones", event.getPhones()); |
showForm.set("place", event.getPlace()); |
showForm.set("address", event.getAddress()); |
showForm.set("transport", event.getTransportDesc()); |
194,6 → 195,7 |
// others |
event.setEmail((String)theForm.get("email")); |
event.setAdmins((String)theForm.get("admins")); |
event.setPhones((String)theForm.get("phones")); |
event.setPlace((String)theForm.get("place")); |
event.setAddress((String)theForm.get("address")); |
event.setTransportDesc((String)theForm.get("transport")); |
/kickup/trunk/src/ak/kickup/core/action/ParticipantAction.java |
---|
41,7 → 41,7 |
throws Exception |
{ |
if("submit".equals(mapping.getParameter()) || "update".equals(mapping.getParameter()) |
|| "unregister".equals(mapping.getParameter())) |
|| "unregister".equals(mapping.getParameter()) || "login".equals(mapping.getParameter())) |
{ |
DynaActionForm theForm = (DynaActionForm)form; |
Long eventId = StringConverter.parseLong(theForm.get("event")); |
/kickup/trunk/src/ak/kickup/core/action/AdminParticipantAction.java |
---|
211,6 → 211,7 |
} |
catch(Exception ex) { |
request.setAttribute("event", event); |
request.setAttribute("participant", participant); |
initLists(request, event); |
throw ex; |
} |
/kickup/trunk/src/ak/kickup/core/CoreResources.properties |
---|
34,6 → 34,7 |
ak.kickup.core.participant.edit.freetransport.wrong=Количество мест в машине должно быть целым числом |
ak.kickup.core.participant.edit.departure.wrong=Время отправления дожно быть, например, 20.10.2004 13:55 |
ak.kickup.core.participant.edit.freesleep.wrong=Количество спальных мест должно быть целым числом |
ak.kickup.core.participant.edit.ident.required=Вы не указали ваш номер |
ak.kickup.core.participant.edit.ident.wrong=Неизвестный номер |
ak.kickup.core.participant.edit.registration.unavailable=Время регистрации прошло |
ak.kickup.core.participant.edit.unregistration.unavailable=Время отмены регистрации прошло |
/kickup/trunk/src/ak/kickup/core/model/Participant.java |
---|
280,7 → 280,7 |
public BigDecimal getMustPay() |
{ |
if(event.getPrice() == null || persons == null) return null; |
if(event == null || event.getPrice() == null || persons == null) return null; |
return new BigDecimal(event.getPrice().doubleValue() * persons.intValue()); |
} |
287,7 → 287,7 |
public int getPayedStatus() |
{ |
if(event.getPrice() == null || persons == null) return PAYED_NULL; |
if(event == null || event.getPrice() == null || persons == null) return PAYED_NULL; |
if(payed == null) return PAYED_NONE; |
double needed = event.getPrice().doubleValue() * persons.intValue(); |
/kickup/trunk/src/ak/kickup/core/model/Event.java |
---|
22,6 → 22,7 |
private String name; |
private String email; |
private String admins; |
private String phones; |
private String place; |
private String address; |
private String transportDesc; |
96,6 → 97,20 |
* |
* @hibernate.property |
*/ |
public String getPhones() |
{ |
return phones; |
} |
public void setPhones(String phones) |
{ |
this.phones = phones; |
} |
/** |
* |
* @hibernate.property |
*/ |
public String getPlace() |
{ |
return place; |
/kickup/trunk/src/ak/kickup/core/mail/Messages.java |
---|
80,6 → 80,7 |
replace(message, "eventMoneyAccount", participant.getEvent().getMoneyAccount()); |
replace(message, "eventAdmins", participant.getEvent().getAdmins()); |
replace(message, "eventEmail", participant.getEvent().getEmail()); |
replace(message, "eventPhones", participant.getEvent().getPhones()); |
replace(message, "", "%"); |
// send message |
/kickup/trunk/webapp/participant/ident.jsp |
---|
10,6 → 10,12 |
<meta http-equiv="expires" content="0"> |
<title>Пьянка XP - <bean:write name="event" property="name" /> - Идентификация</title> |
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css"> |
<script> |
function confirmUnregister() |
{ |
return confirm("Вы уверены, что хотите удалить вашу информацию?"); |
} |
</script> |
</head> |
<body> |
46,7 → 52,7 |
<h2>Отказ от регистрации</h2> |
<logic:equal name="event" property="unregistrationAvailable" value="true"> |
<html:form action="/participant/unregister"> |
<html:form action="/participant/unregister" onsubmit="return confirmUnregister();"> |
<backpath:current /> |
<input type=hidden name="event" value="<bean:write name="event" property="id" />"> |
<table border=1> |
/kickup/trunk/webapp/style/general.css |
---|
1,6 → 1,13 |
body { font-family: verdana, sans-serif; } |
h1 { font-weight: bold; font-size: x-large; color: #5A2A9C; } |
h2 { font-weight: bold; font-size: large; color: #5A2A9C; } |
h1 { font-weight: bold; font-size: 16pt; color: #5A2A9C; } |
h2 { font-weight: bold; font-size: 12pt; color: #5A2A9C; } |
.smallHeader { font-weight: bold; font-size: 12pt; color: #5A2A9C; margin-top: 1em; } |
.subHeader { font-weight: bold; font-size: 10pt; color: #5A2A9C; background-color: #EDD9F1; } |
.standardCell { background-color: white; } |
th { text-align: left; font-size: 10pt; vertical-align: top; } |
td { text-align: left; font-size: 10pt; vertical-align: top; } |
.even { background-color: #E0D3F1; } |
.odd { background-color: #EDD9F1; } |
.error { color: red; } |
10,11 → 17,11 |
.payedExactly { background-color: #67EF5D; } |
.payedMore { background-color: #E476F8; } |
.eventName { font-weight: bold; font-size: x-large; } |
.eventName { font-weight: bold; font-size: 16pt; } |
.personCount { font-weight: bold; } |
.eventDate { font-weight: bold; margin:4px; } |
.eventPlace { font-weight: bold; margin:4px; } |
.eventAddress { margin:4px; } |
.eventAdmins { font-weight: bold; } |
.actParticipants { font-size: small; text-decoration: none; } |
.actParticipants { font-size: 10pt; text-decoration: none; } |
/kickup/trunk/webapp/event/show.jsp |
---|
18,11 → 18,11 |
<!-- header begin --> |
<table border=0> |
<tr> |
<td align=left valign=top> |
<td valign=top> |
<div class="eventName"><bean:write name="event" property="name" /></div> |
</td> |
<td align=right valign=top colspan=2> |
<div class="eventDate"> |
<td valign=top> |
<div class="eventDate" style="text-align: right; "> |
<logic:empty name="event" property="start">(дата еще неизвестна)</logic:empty> |
<logic:notEmpty name="event" property="start"> |
<bean:write name="event" property="start" format="d MMM yyyy" /> |
29,14 → 29,16 |
<logic:notEmpty name="event" property="stop">- <bean:write name="event" property="stop" format="d MMM yyyy" /></logic:notEmpty> |
</logic:notEmpty> |
</div> |
<div class="eventPlace"><bean:write name="event" property="place" /></div> |
<div class="eventPlace" style="text-align: right; "> |
<bean:write name="event" property="place" /> |
</div> |
</td> |
</tr> |
<tr> |
<td align=left valign=bottom colspan=2> |
<td valign=bottom> |
Уже зарегистрированно <span class="personCount"><bean:write name="event" property="personCount" /></span> участников |
</td> |
<td align=right valign=bottom> |
<td valign=bottom style="text-align: right; "> |
<logic:equal name="event" property="registrationAvailable" value="true"> |
<backpath:link action="/participant/register" paramId="event" paramName="event" paramProperty="id"><img src="<strutsx:root />/images/register.gif" alt="Зарегистрироваться" border=0></backpath:link> |
</logic:equal> |
43,21 → 45,21 |
</td> |
</tr> |
<tr> |
<td colspan=3> </td> |
<td colspan=2> </td> |
</tr> |
<tr> |
<td align=left valign=top colspan=2> |
<td valign=top> |
<kickup:currentLink action="/event/show" paramId="id" paramName="event" paramProperty="id"><img src="<strutsx:root />/images/show.gif" alt="Программа" border=0></kickup:currentLink> |
<kickup:currentLink action="/apartment/list" paramId="event" paramName="event" paramProperty="id"><img src="<strutsx:root />/images/apartments.gif" alt="Программа" border=0></kickup:currentLink> |
<kickup:currentLink action="/transport/list" paramId="event" paramName="event" paramProperty="id"><img src="<strutsx:root />/images/transport.gif" alt="Программа" border=0></kickup:currentLink> |
<kickup:currentLink action="/participant/list" paramId="event" paramName="event" paramProperty="id"><img src="<strutsx:root />/images/participants.gif" alt="Программа" border=0></kickup:currentLink> |
</td> |
<td align=right valign=top> |
<td valign=top style="text-align: right; "> |
<kickup:currentLink action="/participant/ident" paramId="event" paramName="event" paramProperty="id"><img src="<strutsx:root />/images/ident.gif" alt="Программа" border=0></kickup:currentLink> |
</td> |
</tr> |
<tr> |
<td colspan=3><img src="<strutsx:root />/images/line.gif" alt=""></td> |
<td colspan=2><img src="<strutsx:root />/images/line.gif" alt=""></td> |
</tr> |
</table> |
<!-- header end --> |
105,16 → 107,22 |
</tr> |
<tr> |
<td>По всем вопросам обращайтесь к организаторам: <span class="eventAdmins"><bean:write name="event" property="admins" /></span></td> |
<td align=right valign=top> |
<td align=right valign=top style="text-align: right; "> |
<html:link page="/admin"><img src="<strutsx:root />/images/admin.gif" alt="Администрирование" border=0></html:link> |
</td> |
</tr> |
<tr> |
<td>Контактный e-mail: <a href="mailto:<bean:write name="event" property="email" />"><bean:write name="event" property="email" /></a></td> |
<td align=right valign=top> |
<td align=right valign=top style="text-align: right; "> |
<html:link page="/"><img src="<strutsx:root />/images/list.gif" alt="Администрирование" border=0></html:link> |
</td> |
<tr> |
<logic:notEmpty name="event" property="phones" > |
<tr> |
<td>Телефоны: <bean:write name="event" property="phones" /></td> |
<td align=right valign=top> </td> |
<tr> |
</logic:notEmpty> |
</table> |
<!-- footer end --> |
/kickup/trunk/webapp/images/participants-small.gif |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes: |
Added: svn:mime-type |
+application/octet-stream |
\ No newline at end of property |
/kickup/trunk/webapp/images/add.gif |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes: |
Added: svn:mime-type |
+application/octet-stream |
\ No newline at end of property |
/kickup/trunk/webapp/images/transport.gif |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/kickup/trunk/webapp/images/apartments.gif |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/kickup/trunk/webapp/images/show.gif |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/kickup/trunk/webapp/images/participants.gif |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/kickup/trunk/webapp/images/delete.gif |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes: |
Added: svn:mime-type |
+application/octet-stream |
\ No newline at end of property |
/kickup/trunk/webapp/images/edit.gif |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes: |
Added: svn:mime-type |
+application/octet-stream |
\ No newline at end of property |
/kickup/trunk/webapp/images/back-small.gif |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes: |
Added: svn:mime-type |
+application/octet-stream |
\ No newline at end of property |
/kickup/trunk/webapp/WEB-INF/struts-config.xml |
---|
20,6 → 20,7 |
<form-property name="place" type="java.lang.String" /> |
<form-property name="email" type="java.lang.String" /> |
<form-property name="admins" type="java.lang.String" /> |
<form-property name="phones" type="java.lang.String" /> |
<form-property name="address" type="java.lang.String" /> |
<form-property name="transport" type="java.lang.String" /> |
<form-property name="start" type="java.lang.String" /> |
/kickup/trunk/webapp/admin/act/edit.jsp |
---|
31,14 → 31,14 |
<backpath:current /> |
<html:hidden property="id" /> |
<table border=1> |
<tr> |
<table border=0 cellspacing=0 cellpadding=4> |
<tr class="even"> |
<th>Название</th> |
<td><html:text property="name" /></td> |
<td><html:text property="name" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="odd"> |
<th>Описание</th> |
<td><html:textarea property="comment" /></td> |
<td><html:textarea property="comment" cols="40" rows="8" style="width:200px;" /></td> |
</tr> |
<tr> |
<td colspan=2> |
/kickup/trunk/webapp/admin/act/list.jsp |
---|
10,6 → 10,12 |
<meta http-equiv="expires" content="0"> |
<title>Пьянка XP - Администрирование - Мероприятия</title> |
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css"> |
<script> |
function confirmDelete() |
{ |
return confirm("Вы уверены, что хотите удалить это мероприятие?"); |
} |
</script> |
</head> |
<body> |
27,29 → 33,35 |
</div> |
</strutsx:notEmpty> |
<table border=1> |
<table border=0 cellspacing=0 cellpadding=4> |
<tr> |
<th>Название</th> |
<th> </th> |
<th> </th> |
<th class="subHeader">Название</th> |
<th class="subHeader" width=50> </th> |
<th class="subHeader"> </th> |
<th class="subHeader"> </th> |
</tr> |
<logic:iterate name="acts" id="a"> |
<tr> |
<td><bean:write name="a" property="name" /></td> |
<td> |
<backpath:link action="/admin/act/edit" paramId="id" paramName="a" paramProperty="id">редактировать</backpath:link> |
<td style="border-bottom: 1px dotted black;"><bean:write name="a" property="name" /></td> |
<td style="border-bottom: 1px dotted black;"> </td> |
<td style="border-bottom: 1px dotted black;"> |
<backpath:link action="/admin/act/edit" paramId="id" paramName="a" paramProperty="id"><img src="<strutsx:root />/images/edit.gif" alt="Редактировать" border=0></backpath:link> |
</td> |
<td> |
<backpath:link action="/admin/act/delete" paramId="id" paramName="a" paramProperty="id">удалить</backpath:link> |
<td style="border-bottom: 1px dotted black;"> |
<backpath:link action="/admin/act/delete" paramId="id" paramName="a" paramProperty="id" onclick="return confirmDelete();"><img src="<strutsx:root />/images/delete.gif" alt="Удалить" border=0></backpath:link> |
</td> |
</tr> |
</logic:iterate> |
<tr> |
<td colspan=4> </td> |
</tr> |
</table> |
<backpath:link action="/admin/act/edit">Добавить мероприятие</backpath:link> |
<br> |
<backpath:notEmpty><backpath:backlink>Назад</backpath:backlink></backpath:notEmpty> |
<div> |
<backpath:link action="/admin/act/edit"><img src="<strutsx:root />/images/add.gif" alt="Добавить мероприятие" border=0></backpath:link> |
<backpath:notEmpty><backpath:backlink><img src="<strutsx:root />/images/back-small.gif" alt="Назад" border=0></backpath:backlink></backpath:notEmpty> |
</div> |
</body> |
/kickup/trunk/webapp/admin/apartment/edit.jsp |
---|
31,26 → 31,26 |
<backpath:current /> |
<html:hidden property="id" /> |
<table border=1> |
<tr> |
<table border=0 cellspacing=0 cellpadding=4> |
<tr class="even"> |
<th>Название</th> |
<td><html:text property="name" /></td> |
<td><html:text property="name" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="odd"> |
<th>Адрес и телефоны</th> |
<td><html:textarea property="address" /></td> |
<td><html:textarea property="address" cols="40" rows="8" style="width:200px;" /></td> |
</tr> |
<tr> |
<tr class="even"> |
<th>Цена ночевки на одного человека</th> |
<td><html:text property="price" /></td> |
<td><html:text property="price" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="odd"> |
<th>URL домашней странички</th> |
<td><html:text property="url" /></td> |
<td><html:text property="url" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="even"> |
<th>Описание</th> |
<td><html:textarea property="comment" /></td> |
<td><html:textarea property="comment" cols="40" rows="8" style="width:200px;" /></td> |
</tr> |
<tr> |
<td colspan=2> |
/kickup/trunk/webapp/admin/apartment/list.jsp |
---|
10,6 → 10,12 |
<meta http-equiv="expires" content="0"> |
<title>Пьянка XP - Администрирование - Гостиницы</title> |
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css"> |
<script> |
function confirmDelete() |
{ |
return confirm("Вы уверены, что хотите удалить эту гостиницу?"); |
} |
</script> |
</head> |
<body> |
27,29 → 33,35 |
</div> |
</strutsx:notEmpty> |
<table border=1> |
<table border=0 cellspacing=0 cellpadding=4> |
<tr> |
<th>Название</th> |
<th> </th> |
<th> </th> |
<th class="subHeader">Название</th> |
<th class="subHeader" width=50> </th> |
<th class="subHeader"> </th> |
<th class="subHeader"> </th> |
</tr> |
<logic:iterate name="apartments" id="a"> |
<tr> |
<td><bean:write name="a" property="name" /></td> |
<td> |
<backpath:link action="/admin/apartment/edit" paramId="id" paramName="a" paramProperty="id">редактировать</backpath:link> |
<td style="border-bottom: 1px dotted black;"><bean:write name="a" property="name" /></td> |
<td style="border-bottom: 1px dotted black;"> </td> |
<td style="border-bottom: 1px dotted black;"> |
<backpath:link action="/admin/apartment/edit" paramId="id" paramName="a" paramProperty="id"><img src="<strutsx:root />/images/edit.gif" alt="Редактировать" border=0></backpath:link> |
</td> |
<td> |
<backpath:link action="/admin/apartment/delete" paramId="id" paramName="a" paramProperty="id">удалить</backpath:link> |
<td style="border-bottom: 1px dotted black;"> |
<backpath:link action="/admin/apartment/delete" paramId="id" paramName="a" paramProperty="id" onclick="return confirmDelete();"><img src="<strutsx:root />/images/delete.gif" alt="Удалить" border=0></backpath:link> |
</td> |
</tr> |
</logic:iterate> |
<tr> |
<td colspan=4> </td> |
</tr> |
</table> |
<backpath:link action="/admin/apartment/edit">Добавить гостиницу</backpath:link> |
<br> |
<backpath:notEmpty><backpath:backlink>Назад</backpath:backlink></backpath:notEmpty> |
<div> |
<backpath:link action="/admin/apartment/edit"><img src="<strutsx:root />/images/add.gif" alt="Добавить гостиницу" border=0></backpath:link> |
<backpath:notEmpty><backpath:backlink><img src="<strutsx:root />/images/back-small.gif" alt="Назад" border=0></backpath:backlink></backpath:notEmpty> |
</div> |
</body> |
/kickup/trunk/webapp/admin/participant/edit.jsp |
---|
32,70 → 32,70 |
<html:hidden property="id" /> |
<html:hidden property="event" /> |
<table border=1> |
<tr> |
<table border=0 cellspacing=0 cellpadding=4> |
<tr class="even"> |
<th>Кодовый номер</th> |
<td colspan=2><bean:write name="participant" property="ident" /> </td> |
<td colspan=2 width=300><bean:write name="participant" property="ident" /> </td> |
</tr> |
<tr> |
<tr class="odd"> |
<th>Ник</th> |
<td colspan=2><html:text property="nick" /></td> |
<td colspan=2><html:text property="nick" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="even"> |
<th>e-mail</th> |
<td colspan=2><html:text property="email" /></td> |
<td colspan=2><html:text property="email" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="odd"> |
<th>Показ e-mail разрешен</th> |
<td colspan=2><html:checkbox property="emailPublic" /></td> |
</tr> |
<tr> |
<tr class="even"> |
<th>Имя</th> |
<td colspan=2><html:text property="name" /></td> |
<td colspan=2><html:text property="name" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="odd"> |
<th>Телефон</th> |
<td colspan=2><html:text property="phone" /></td> |
<td colspan=2><html:text property="phone" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="even"> |
<th>Количество человек</th> |
<td colspan=2><html:text property="persons" /></td> |
<td colspan=2><html:text property="persons" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="odd"> |
<th>Выезд из PLZ</th> |
<td colspan=2><html:text property="fromZip" /></td> |
<td colspan=2><html:text property="fromZip" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="even"> |
<th>Выезд из города</th> |
<td colspan=2><html:text property="fromCity" /></td> |
<td colspan=2><html:text property="fromCity" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="odd"> |
<th>Время отправления</th> |
<td colspan=2><html:text property="departure" /></td> |
<td colspan=2><html:text property="departure" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="even"> |
<th>Свободных мест в машине</th> |
<td colspan=2><html:text property="freeTransport" /></td> |
<td colspan=2><html:text property="freeTransport" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="odd"> |
<th>Условия транспортировки</th> |
<td colspan=2><html:textarea property="transportComment" /></td> |
<td colspan=2><html:textarea property="transportComment" cols="40" rows="8" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="even"> |
<th>Свободных спальных мест</th> |
<td colspan=2><html:text property="freeSleep" /></td> |
<td colspan=2><html:text property="freeSleep" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="odd"> |
<th>Условия ночевки</th> |
<td colspan=2><html:textarea property="sleepComment" /></td> |
<td colspan=2><html:textarea property="sleepComment" cols="40" rows="8" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="even"> |
<th>Дополнительная информация</th> |
<td colspan=2><html:textarea property="comment" /></td> |
<td colspan=2><html:textarea property="comment" cols="40" rows="8" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="odd"> |
<th>Оплачено, евро</th> |
<td><html:text property="payed" /></td> |
<td><html:text property="payed" style="width:100%" /></td> |
<td> |
<logic:notEmpty name="participant" property="mustPay"> |
(должен заплатить: <bean:write name="participant" property="mustPay" format="0.00" />) |
102,28 → 102,28 |
</logic:notEmpty> |
</td> |
</tr> |
<tr> |
<tr class="even"> |
<th>Комментарии организаторов</th> |
<td colspan=2><html:textarea property="privateComment" /></td> |
<td colspan=2><html:textarea property="privateComment" cols="40" rows="8" style="width:100%" /></td> |
</tr> |
<logic:notEmpty name="actList" property="objects"> |
<tr> |
<th colspan=3>Участвует в</th> |
<th colspan=3><div class="smallHeader">Участвует в</div></th> |
</tr> |
<tr> |
<td>Название</td> |
<td>Включить</td> |
<td>Дополнительно</td> |
<td class="subHeader">Название</td> |
<td class="subHeader">Включить</td> |
<td class="subHeader">Дополнительно</td> |
</tr> |
<logic:iterate name="ParticipantEditForm" property="acts" id="acts" indexId="iid"> |
<tr> |
<th> |
<td> |
<bean:write name="actList" property='<%= "objects[" + iid + "].act.name" %>' /> |
<html:hidden name="acts" property="actId" indexed="true" /> |
</th> |
</td> |
<td><html:checkbox name="acts" property="selected" indexed="true" /></td> |
<td><html:text name="acts" property="comment" indexed="true" /></td> |
<td><html:text name="acts" property="comment" indexed="true" style="width:100%" /></td> |
</tr> |
</logic:iterate> |
</logic:notEmpty> |
/kickup/trunk/webapp/admin/participant/list.jsp |
---|
11,6 → 11,12 |
<meta http-equiv="expires" content="0"> |
<title>Пьянка XP - Администрирование - Участники пьянки "<bean:write name="event" property="name" />"</title> |
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css"> |
<script> |
function confirmDelete() |
{ |
return confirm("Вы уверены, что хотите удалить этого участника?"); |
} |
</script> |
</head> |
<body> |
28,65 → 34,88 |
</div> |
</strutsx:notEmpty> |
<!-- legend begin --> |
<div style="float:right; width:200px; background-color:#E0E0E0"> |
<logic:empty name="event" property="price"> |
<div style="margin: 1em; ">Размер оплаты участия в этой пьянке еще не определен, поэтому статус оплаты не показан.</div> |
</logic:empty> |
<logic:notEmpty name="event" property="price"> |
<table border=1 width=100%> |
<tr><th colspan=2>Легенда</th><tr> |
<tr><td class="payedNone" style="width:50px;"> </td><td>Не заплатил</td></tr> |
<tr><td class="payedLess"> </td><td>Недоплатил</td></tr> |
<tr><td class="payedExactly"> </td><td>Все точно</td></tr> |
<tr><td class="payedMore"> </td><td>Переплатил</td></tr> |
</table> |
</logic:notEmpty> |
<div style="float:right; width:200px; background-color:#EDD9F1; padding: 1em; "> |
<!-- legend begin --> |
<logic:empty name="event" property="price"> |
<div>Размер оплаты участия в этой пьянке еще не определен, поэтому статус оплаты не показан.</div> |
</logic:empty> |
<logic:notEmpty name="event" property="price"> |
<table border=0 width=100%> |
<tr><th colspan=2>Легенда</th><tr> |
<tr><td class="payedNone" style="width:50px;"> </td><td>Не заплатил</td></tr> |
<tr><td class="payedLess"> </td><td>Недоплатил</td></tr> |
<tr><td class="payedExactly"> </td><td>Все точно</td></tr> |
<tr><td class="payedMore"> </td><td>Переплатил</td></tr> |
<tr><td colspan=2> </td></tr> |
</table> |
</logic:notEmpty> |
<!-- legend end --> |
<table border=0 width=100%> |
<tr><th colspan=2>Статистика</th><tr> |
<tr><td>Всего заявок</td><td><bean:write name="event" property="participantCount" /></td></tr> |
<tr><td>Всего участников</td><td><bean:write name="event" property="personCount" /></td></tr> |
</table> |
</div> |
<!-- legend end --> |
<table border=1> |
<table border=0 cellspacing=0 cellpadding=4> |
<tr> |
<th>Кодовый номер</th> |
<th>Ник</th> |
<th>e-mail</th> |
<th>Имя</th> |
<th>Количество</th> |
<th>Оплачено, евро</th> |
<th> </th> |
<th> </th> |
<th class="subHeader">Кодовый номер</th> |
<th class="subHeader">Ник</th> |
<th class="subHeader">e-mail</th> |
<th class="subHeader">Имя</th> |
<th class="subHeader">Количество</th> |
<th class="subHeader">Оплачено, евро</th> |
<th class="subHeader" width=50> </th> |
<th class="subHeader"> </th> |
<th class="subHeader"> </th> |
</tr> |
<logic:iterate name="participants" id="p"> |
<tr class="<logic:equal name="p" property="payedStatus" value="0" |
<tr> |
<td class="<logic:equal name="p" property="payedStatus" value="0" |
>payedNull</logic:equal><logic:equal name="p" property="payedStatus" value="1" |
>payedNone</logic:equal><logic:equal name="p" property="payedStatus" value="2" |
>payedLess</logic:equal><logic:equal name="p" property="payedStatus" value="3" |
>payedExactly</logic:equal><logic:equal name="p" property="payedStatus" value="4" |
>payedMore</logic:equal>"> |
<td><bean:write name="p" property="ident" /></td> |
<td><bean:write name="p" property="nick" /> </td> |
<td><a href="mailto:<bean:write name="p" property="email" />"><bean:write name="p" property="email" /></a></td> |
<td><bean:write name="p" property="name" /> </td> |
<td><bean:write name="p" property="persons" /> </td> |
<td><bean:write name="p" property="payed" format="0.00" /> </td> |
<td> |
<kickup:link action="/admin/participant/edit" paramId="id" paramName="p" paramProperty="id" paramId2="event" paramName2="event" paramProperty2="id">редактировать</kickup:link> |
>payedMore</logic:equal>" style="border-bottom: 1px dotted black;"> |
<bean:write name="p" property="ident" /> |
</td> |
<td> |
<backpath:link action="/admin/participant/delete" paramId="id" paramName="p" paramProperty="id">удалить</backpath:link> |
<td style="border-bottom: 1px dotted black;"> |
<bean:write name="p" property="nick" /> |
</td> |
<td style="border-bottom: 1px dotted black;"> |
<a href="mailto:<bean:write name="p" property="email" />"><bean:write name="p" property="email" /></a> |
</td> |
<td style="border-bottom: 1px dotted black;"> |
<bean:write name="p" property="name" /> |
</td> |
<td style="border-bottom: 1px dotted black;"> |
<bean:write name="p" property="persons" /> |
</td> |
<td style="border-bottom: 1px dotted black;"> |
<bean:write name="p" property="payed" format="0.00" /> |
</td> |
<td class="standardCell" style="border-bottom: 1px dotted black;"> </td> |
<td class="standardCell" style="border-bottom: 1px dotted black;"> |
<kickup:link action="/admin/participant/edit" paramId="id" paramName="p" paramProperty="id" paramId2="event" paramName2="event" paramProperty2="id"><img src="<strutsx:root />/images/edit.gif" alt="Редактировать" border=0></kickup:link> |
</td> |
<td class="standardCell" style="border-bottom: 1px dotted black;"> |
<backpath:link action="/admin/participant/delete" paramId="id" paramName="p" paramProperty="id" onclick="return confirmDelete();"><img src="<strutsx:root />/images/delete.gif" alt="Удалить" border=0></backpath:link> |
</td> |
</tr> |
</logic:iterate> |
<tr> |
<td colspan=9> </td> |
</tr> |
</table> |
<p>Всего заявок: <bean:write name="event" property="participantCount" /></p> |
<p>Всего участников: <bean:write name="event" property="personCount" /></p> |
<div> |
<backpath:link action="/admin/participant/edit" paramId="event" paramName="event" paramProperty="id"><img src="<strutsx:root />/images/add.gif" alt="Добавить участника" border=0></backpath:link> |
<backpath:notEmpty><backpath:backlink><img src="<strutsx:root />/images/back-small.gif" alt="Назад" border=0></backpath:backlink></backpath:notEmpty> |
</div> |
<backpath:link action="/admin/participant/edit" paramId="event" paramName="event" paramProperty="id">Добавить участника</backpath:link> |
<br> |
<backpath:notEmpty><backpath:backlink>Назад</backpath:backlink></backpath:notEmpty> |
</body> |
</html> |
/kickup/trunk/webapp/admin/event/list.jsp |
---|
10,6 → 10,12 |
<meta http-equiv="expires" content="0"> |
<title>Пьянка XP - Администрирование - Пьянки</title> |
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css"> |
<script> |
function confirmDelete() |
{ |
return confirm("Вы уверены, что хотите удалить эту пьянку со всеми участниками?"); |
} |
</script> |
</head> |
<body> |
27,48 → 33,55 |
</div> |
</strutsx:notEmpty> |
<table border=1> |
<table border=0 cellspacing=0 cellpadding=4> |
<tr> |
<th>Название</th> |
<th>Место/город</th> |
<th>Начало</th> |
<th>Окончание</th> |
<th>В открытом доступе</th> |
<th>Заявок</th> |
<th>Участников</th> |
<th> </th> |
<th> </th> |
<th> </th> |
<th class="subHeader">Название</th> |
<th class="subHeader">Место/город</th> |
<th class="subHeader">Начало</th> |
<th class="subHeader">Окончание</th> |
<th class="subHeader">В открытом доступе</th> |
<th class="subHeader">Заявок</th> |
<th class="subHeader">Участников</th> |
<th class="subHeader" width=50> </th> |
<th class="subHeader"> </th> |
<th class="subHeader"> </th> |
<th class="subHeader"> </th> |
</tr> |
<logic:iterate name="events" id="e"> |
<tr> |
<td><bean:write name="e" property="name" /></td> |
<td><bean:write name="e" property="place" /> </td> |
<td><bean:write name="e" property="start" format="dd.MM.yyyy" /> </td> |
<td><bean:write name="e" property="stop" format="dd.MM.yyyy" /> </td> |
<td> |
<td style="border-bottom: 1px dotted black;"><bean:write name="e" property="name" /></td> |
<td style="border-bottom: 1px dotted black;"><bean:write name="e" property="place" /> </td> |
<td style="border-bottom: 1px dotted black;"><bean:write name="e" property="start" format="dd.MM.yyyy" /> </td> |
<td style="border-bottom: 1px dotted black;"><bean:write name="e" property="stop" format="dd.MM.yyyy" /> </td> |
<td align=middle style="border-bottom: 1px dotted black;"> |
<logic:equal name="e" property="enabled" value="true">да</logic:equal> |
<logic:notEqual name="e" property="enabled" value="true">нет</logic:notEqual> |
</td> |
<td><bean:write name="e" property="participantCount" /></td> |
<td><bean:write name="e" property="personCount" /></td> |
<td> |
<backpath:link action="/admin/event/edit" paramId="id" paramName="e" paramProperty="id">редактировать</backpath:link> |
<td align=right style="border-bottom: 1px dotted black;"><bean:write name="e" property="participantCount" /></td> |
<td align=right style="border-bottom: 1px dotted black;"><bean:write name="e" property="personCount" /></td> |
<td style="border-bottom: 1px dotted black;"> </td> |
<td style="border-bottom: 1px dotted black;"> |
<backpath:link action="/admin/event/edit" paramId="id" paramName="e" paramProperty="id"><img src="<strutsx:root />/images/edit.gif" alt="Редактировать" border=0></backpath:link> |
</td> |
<td> |
<backpath:link action="/admin/event/delete" paramId="id" paramName="e" paramProperty="id">удалить</backpath:link> |
<td style="border-bottom: 1px dotted black;"> |
<backpath:link action="/admin/event/delete" paramId="id" paramName="e" paramProperty="id" onclick="return confirmDelete();"><img src="<strutsx:root />/images/delete.gif" alt="Удалить" border=0></backpath:link> |
</td> |
<td> |
<backpath:link action="/admin/participant/list" paramId="event" paramName="e" paramProperty="id">участники</backpath:link> |
<td style="border-bottom: 1px dotted black;"> |
<backpath:link action="/admin/participant/list" paramId="event" paramName="e" paramProperty="id"><img src="<strutsx:root />/images/participants-small.gif" alt="Участники" border=0></backpath:link> |
</td> |
</tr> |
</logic:iterate> |
<tr> |
<td colspan=11> </td> |
</tr> |
</table> |
<backpath:link action="/admin/event/edit">Добавить пьянку</backpath:link> |
<br> |
<backpath:notEmpty><backpath:backlink>Назад</backpath:backlink></backpath:notEmpty> |
<div> |
<backpath:link action="/admin/event/edit"><img src="<strutsx:root />/images/add.gif" alt="Добавить пьянку" border=0></backpath:link> |
<backpath:notEmpty><backpath:backlink><img src="<strutsx:root />/images/back-small.gif" alt="Назад" border=0></backpath:backlink></backpath:notEmpty> |
</div> |
</body> |
/kickup/trunk/webapp/admin/event/edit.jsp |
---|
31,103 → 31,107 |
<backpath:current /> |
<html:hidden property="id" /> |
<table border=1> |
<tr> |
<table border=0 cellspacing=0 cellpadding=4> |
<tr class="even"> |
<th>Название</th> |
<td colspan=3><html:text property="name" /></td> |
<td colspan=3><html:text property="name" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="odd"> |
<th>Контактный e-mail</th> |
<td colspan=3><html:text property="email" /></td> |
<td colspan=3><html:text property="email" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="even"> |
<th>Организаторы</th> |
<td colspan=3><html:text property="admins" /></td> |
<td colspan=3><html:text property="admins" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="odd"> |
<th>Контактные телефоны</th> |
<td colspan=3><html:text property="phones" style="width:100%" /></td> |
</tr> |
<tr class="even"> |
<th>Место/город</th> |
<td colspan=3><html:text property="place" /></td> |
<td colspan=3><html:text property="place" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="odd"> |
<th>Точный адрес</th> |
<td colspan=3><html:textarea property="address" /></td> |
<td colspan=3><html:textarea property="address" rows="8" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="even"> |
<th>Описание проезда</th> |
<td colspan=3><html:textarea property="transport" /></td> |
<td colspan=3><html:textarea property="transport" rows="8" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="odd"> |
<th>Начало</th> |
<td colspan=3><html:text property="start" /></td> |
<td colspan=3><html:text property="start" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="even"> |
<th>Окончание</th> |
<td colspan=3><html:text property="stop" /></td> |
<td colspan=3><html:text property="stop" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="odd"> |
<th>Дата окончания регистрации</th> |
<td colspan=3><html:text property="lastreg" /></td> |
<td colspan=3><html:text property="lastreg" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="even"> |
<th>Последний срок отказа</th> |
<td colspan=3><html:text property="lastunreg" /></td> |
<td colspan=3><html:text property="lastunreg" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="odd"> |
<th>Цена с человека</th> |
<td colspan=3><html:text property="price" /></td> |
<td colspan=3><html:text property="price" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="even"> |
<th>Счет для перевода денег</th> |
<td colspan=3><html:textarea property="account" /></td> |
<td colspan=3><html:textarea property="account" rows="8" style="width:100%" /></td> |
</tr> |
<tr> |
<tr class="odd"> |
<th>Открыть доступ</th> |
<td colspan=3><html:checkbox property="enabled" /></td> |
</tr> |
<tr> |
<tr class="even"> |
<th>Описание</th> |
<td colspan=3><html:textarea property="comment" /></td> |
<td colspan=3><html:textarea property="comment" rows="8" style="width:100%" /></td> |
</tr> |
<tr> |
<th colspan=4>Планируемые мероприятия</th> |
<th colspan=4><div class="smallHeader">Планируемые мероприятия</div></th> |
</tr> |
<tr> |
<td>Название</td> |
<td>Включить</td> |
<td>Описание</td> |
<td> </td> |
<td class="subHeader">Название</td> |
<td class="subHeader">Включить</td> |
<td class="subHeader">Дополнительная информация</td> |
<td class="subHeader"> </td> |
</tr> |
<logic:iterate name="EventEditForm" property="acts" id="acts" indexId="iid"> |
<tr> |
<th> |
<td> |
<bean:write name="actList" property='<%= "objects[" + iid + "].name" %>' /> |
<html:hidden name="acts" property="actId" indexed="true" /> |
</th> |
</td> |
<td><html:checkbox name="acts" property="selected" indexed="true" /></td> |
<td><html:text name="acts" property="comment" indexed="true" /></td> |
<td><html:text name="acts" property="comment" indexed="true" style="width:100%" /></td> |
<td> </td> |
</tr> |
</logic:iterate> |
<tr> |
<th colspan=4>Ближайшие гостиницы</th> |
<th colspan=4><div class="smallHeader">Ближайшие гостиницы</div></th> |
</tr> |
<tr> |
<td>Название</td> |
<td>Включить</td> |
<td>Описание</td> |
<td>Расстояние до местa (км)</td> |
<td class="subHeader">Название</td> |
<td class="subHeader">Включить</td> |
<td class="subHeader">Дополнительная информация</td> |
<td class="subHeader">Расстояние до местa (км)</td> |
</tr> |
<logic:iterate name="EventEditForm" property="apartments" id="apartments" indexId="iid2"> |
<tr> |
<th> |
<td> |
<bean:write name="apartmentList" property='<%= "objects[" + iid2 + "].name" %>' /> |
<html:hidden name="apartments" property="apartmentId" indexed="true" /> |
</th> |
</td> |
<td><html:checkbox name="apartments" property="selected" indexed="true" /></td> |
<td><html:text name="apartments" property="comment" indexed="true" /></td> |
<td><html:text name="apartments" property="distance" indexed="true" /></td> |
<td><html:text name="apartments" property="comment" indexed="true" style="width:100%" /></td> |
<td><html:text name="apartments" property="distance" indexed="true" style="width:100%" /></td> |
</tr> |
</logic:iterate> |
/kickup/trunk/sql/00.tables.sql |
---|
51,6 → 51,7 |
name varchar(255) not null, |
email varchar(255) not null, |
admins varchar(255) not null, |
phones varchar(255), |
place varchar(255), |
address text, |
transport_desc text, |