| /kickup/trunk/src/ak/kickup/core/action/AdminParticipantAction.java |
|---|
| 102,7 → 102,7 |
| showForm.set("transportComment", participant.getTransportComment()); |
| showForm.set("freeSleep", StringConverter.toString(participant.getFreeSleep())); |
| showForm.set("sleepComment", participant.getSleepComment()); |
| showForm.set("payed", StringConverter.toCurrency(participant.getPayed())); |
| showForm.set("payed", participant.getPayed()); |
| showForm.set("comment", participant.getComment()); |
| showForm.set("privateComment", participant.getPrivateComment()); |
| } |
| 200,7 → 200,7 |
| participant.setTransportComment((String)theForm.get("transportComment")); |
| participant.setFreeSleep(StringConverter.parseInteger(theForm.get("freeSleep"))); |
| participant.setSleepComment((String)theForm.get("sleepComment")); |
| participant.setPayed(StringConverter.parseCurrency(theForm.get("payed"))); |
| participant.setPayed((Boolean)theForm.get("payed")); |
| participant.setComment((String)theForm.get("comment")); |
| participant.setPrivateComment((String)theForm.get("privateComment")); |
| /kickup/trunk/src/ak/kickup/core/CoreResources.properties |
|---|
| 37,7 → 37,6 |
| ak.kickup.core.participant.edit.ident.wrong=Неизвестный номер |
| ak.kickup.core.participant.edit.registration.unavailable=Время регистрации прошло |
| ak.kickup.core.participant.edit.unregistration.unavailable=Время отмены регистрации прошло |
| ak.kickup.core.participant.edit.payed.wrong=Оплаченная сумма должна быть числом, например 12,35 |
| ak.kickup.core.mail.send.error=Не могу отправить вам e-mail. Проверьте свой адрес и обратитесь к организаторам. |
| ak.kickup.core.mail.read.error=Не могу отправить вам e-mail. Ошибка в системе. |
| ak.kickup.core.mail.subject=Регистрация на {0} |
| /kickup/trunk/src/ak/kickup/core/model/Participant.java |
|---|
| 1,6 → 1,5 |
| package ak.kickup.core.model; |
| import java.math.BigDecimal; |
| import java.util.Date; |
| import java.util.Map; |
| import java.util.HashMap; |
| 18,12 → 17,6 |
| public class Participant |
| extends GeneralModelObject |
| { |
| public static final int PAYED_NULL = 0; // event price is nto defined |
| public static final int PAYED_NONE = 1; // noit yet payed |
| public static final int PAYED_LESS = 2; // payed but less then needed |
| public static final int PAYED_EXACTLY = 3; // payed exactly as needed |
| public static final int PAYED_MORE = 4; // payed more then needed |
| private String ident; |
| private String nick; |
| private String email; |
| 39,7 → 32,7 |
| private String transportComment; |
| private Integer freeSleep; |
| private String sleepComment; |
| private BigDecimal payed; |
| private Boolean payed; |
| private String comment; |
| private String privateComment; |
| private Collection acts; // Collection(ParticipantAct) |
| 268,36 → 261,16 |
| * |
| * @hibernate.property |
| */ |
| public BigDecimal getPayed() |
| public Boolean getPayed() |
| { |
| return payed; |
| } |
| public void setPayed(BigDecimal payed) |
| public void setPayed(Boolean payed) |
| { |
| this.payed = payed; |
| } |
| public BigDecimal getMustPay() |
| { |
| if(event.getPrice() == null || persons == null) return null; |
| return new BigDecimal(event.getPrice().doubleValue() * persons.intValue()); |
| } |
| public int getPayedStatus() |
| { |
| if(event.getPrice() == null || persons == null) return PAYED_NULL; |
| if(payed == null) return PAYED_NONE; |
| double needed = event.getPrice().doubleValue() * persons.intValue(); |
| double p = payed.doubleValue(); |
| if(Math.abs(needed - p) < 0.001) return PAYED_EXACTLY; |
| else if(needed < p) return PAYED_MORE; |
| else return PAYED_LESS; |
| } |
| /** |
| * |
| * @hibernate.property |
| /kickup/trunk/src/ak/kickup/core/taglib/CurrentLinkTag.java |
|---|
| File deleted |