/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 |