Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 968 → Rev 969

/kickup/trunk/webapp/admin/participant/edit.jsp
35,82 → 35,86
<table border=1>
<tr>
<th>Кодовый номер</th>
<td colspan=3><bean:write name="participant" property="ident" />&nbsp;</td>
<td colspan=2><bean:write name="participant" property="ident" />&nbsp;</td>
</tr>
<tr>
<th>Ник</th>
<td colspan=3><html:text property="nick" /></td>
<td colspan=2><html:text property="nick" /></td>
</tr>
<tr>
<th>e-mail</th>
<td colspan=3><html:text property="email" /></td>
<td colspan=2><html:text property="email" /></td>
</tr>
<tr>
<th>Показ e-mail разрешен</th>
<td colspan=3><html:checkbox property="emailPublic" /></td>
<td colspan=2><html:checkbox property="emailPublic" /></td>
</tr>
<tr>
<th>Имя</th>
<td colspan=3><html:text property="name" /></td>
<td colspan=2><html:text property="name" /></td>
</tr>
<tr>
<th>Телефон</th>
<td colspan=3><html:text property="phone" /></td>
<td colspan=2><html:text property="phone" /></td>
</tr>
<tr>
<th>Количество человек</th>
<td colspan=3><html:text property="persons" /></td>
<td colspan=2><html:text property="persons" /></td>
</tr>
<tr>
<th>Выезд из PLZ</th>
<td colspan=3><html:text property="fromZip" /></td>
<td colspan=2><html:text property="fromZip" /></td>
</tr>
<tr>
<th>Выезд из города</th>
<td colspan=3><html:text property="fromCity" /></td>
<td colspan=2><html:text property="fromCity" /></td>
</tr>
<tr>
<th>Время отправления</th>
<td colspan=3><html:text property="departure" /></td>
<td colspan=2><html:text property="departure" /></td>
</tr>
<tr>
<th>Свободных мест в машине</th>
<td colspan=3><html:text property="freeTransport" /></td>
<td colspan=2><html:text property="freeTransport" /></td>
</tr>
<tr>
<th>Условия транспортировки</th>
<td colspan=3><html:textarea property="transportComment" /></td>
<td colspan=2><html:textarea property="transportComment" /></td>
</tr>
<tr>
<th>Свободных спальных мест</th>
<td colspan=3><html:text property="freeSleep" /></td>
<td colspan=2><html:text property="freeSleep" /></td>
</tr>
<tr>
<th>Условия ночевки</th>
<td colspan=3><html:textarea property="sleepComment" /></td>
<td colspan=2><html:textarea property="sleepComment" /></td>
</tr>
<tr>
<th>Дополнительная информация</th>
<td colspan=3><html:textarea property="comment" /></td>
<td colspan=2><html:textarea property="comment" /></td>
</tr>
<tr>
<th>Оплачено</th>
<td colspan=3><html:checkbox property="payed" /></td>
<th>Оплачено, евро</th>
<td><html:text property="payed" /></td>
<td>
<logic:notEmpty name="participant" property="mustPay">
(должен заплатить: <bean:write name="participant" property="mustPay" format="0.00" />)
</logic:notEmpty>
</td>
</tr>
<tr>
<th>Комментарии организаторов</th>
<td colspan=3><html:textarea property="privateComment" /></td>
<td colspan=2><html:textarea property="privateComment" /></td>
</tr>
 
<logic:notEmpty name="actList" property="objects">
<tr>
<th colspan=4>Участвует в</th>
<th colspan=3>Участвует в</th>
</tr>
<tr>
<td>Название</td>
<td>Включить</td>
<td>Дополнительно</td>
<td>&nbsp;</td>
</tr>
<logic:iterate name="ParticipantEditForm" property="acts" id="acts" indexId="iid">
<tr>
120,13 → 124,12
</th>
<td><html:checkbox name="acts" property="selected" indexed="true" /></td>
<td><html:text name="acts" property="comment" indexed="true" /></td>
<td>&nbsp;</td>
</tr>
</logic:iterate>
</logic:notEmpty>
 
<tr>
<td colspan=4>
<td colspan=3>
<html:submit>Сохранить</html:submit>
<backpath:notEmpty><backpath:backlink>Отменить</backpath:backlink></backpath:notEmpty>
</td>
/kickup/trunk/webapp/admin/participant/list.jsp
28,6 → 28,23
</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;">&nbsp;</td><td>Не заплатил</td></tr>
<tr><td class="payedLess">&nbsp;</td><td>Недоплатил</td></tr>
<tr><td class="payedExactly">&nbsp;</td><td>Все точно</td></tr>
<tr><td class="payedMore">&nbsp;</td><td>Переплатил</td></tr>
</table>
</logic:notEmpty>
</div>
<!-- legend end -->
 
<table border=1>
<tr>
<th>Кодовый номер</th>
35,23 → 52,25
<th>e-mail</th>
<th>Имя</th>
<th>Количество</th>
<th>Оплачено</th>
<th>Оплачено, евро</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
 
<logic:iterate name="participants" id="p">
<tr class="<logic:equal name="p" property="payed" value="true">payed</logic:equal><logic:notEqual name="p" property="payed" value="true">notpayed</logic:notEqual>">
<tr 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" />&nbsp;</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" />&nbsp;</td>
<td><bean:write name="p" property="persons" />&nbsp;</td>
<td><bean:write name="p" property="payed" format="0.00" />&nbsp;</td>
<td>
<logic:equal name="p" property="payed" value="true">да</logic:equal>
<logic:notEqual name="p" property="payed" value="true">нет</logic:notEqual>
</td>
<td>
<kickup:link action="/admin/participant/edit" paramId="id" paramName="p" paramProperty="id" paramId2="event" paramName2="event" paramProperty2="id">редактировать</kickup:link>
</td>
<td>