/kickup/trunk/src/ak/kickup/core/action/ApartmentAction.java |
---|
File deleted |
/kickup/trunk/src/ak/kickup/core/action/EventAction.java |
---|
File deleted |
/kickup/trunk/src/ak/kickup/core/action/ParticipantAction.java |
---|
File deleted |
/kickup/trunk/src/ak/kickup/core/action/TransportAction.java |
---|
File deleted |
/kickup/trunk/src/ak/kickup/core/action/AdminParticipantAction.java |
---|
38,7 → 38,7 |
if("submit".equals(mapping.getParameter())) { |
DynaActionForm theForm = (DynaActionForm)form; |
Long eventId = StringConverter.parseLong(theForm.get("event")); |
Event event = EventManager.getInstance().get(eventId, false); |
Event event = EventManager.getInstance().get(eventId); |
Long participantId = StringConverter.parseLong(theForm.get("id")); |
Participant participant; |
if(participantId == null) { |
59,8 → 59,8 |
if("list".equals(mapping.getParameter())) { |
DynaActionForm theForm = (DynaActionForm)form; |
Long eventId = StringConverter.parseLong(theForm.get("event")); |
Event event = EventManager.getInstance().get(eventId, false); |
List list = new ArrayList(event.getParticipantCollection()); |
Event event = EventManager.getInstance().get(eventId); |
List list = new ArrayList(ParticipantManager.getInstance().listParticipants(event)); |
Collections.sort(list, ParticipantManager.NICK_COMPARATOR); |
request.setAttribute("participants", list); |
request.setAttribute("event", event); |
69,7 → 69,7 |
else if("edit".equals(mapping.getParameter())) { |
DynaActionForm theForm = (DynaActionForm)form; |
Long eventId = StringConverter.parseLong(theForm.get("event")); |
Event event = EventManager.getInstance().get(eventId, false); |
Event event = EventManager.getInstance().get(eventId); |
Long participantId = StringConverter.parseLong(theForm.get("id")); |
Participant participant; |
DynaActionForm showForm = (DynaActionForm)RequestUtilsX.populateActionForm( |
118,7 → 118,7 |
if(participantId == null) { |
Long eventId = StringConverter.parseLong(theForm.get("event")); |
Event event = EventManager.getInstance().get(eventId, false); |
Event event = EventManager.getInstance().get(eventId); |
participant = ParticipantManager.getInstance().create(); |
participant.setIdent(ParticipantManager.getInstance().generateIdent()); |
/kickup/trunk/src/ak/kickup/core/action/AdminEventAction.java |
---|
70,7 → 70,7 |
showForm.set("enabled", Boolean.TRUE); |
} |
else { |
event = EventManager.getInstance().get(eventId, false); |
event = EventManager.getInstance().get(eventId); |
showForm.set("name", event.getName()); |
showForm.set("place", event.getPlace()); |
showForm.set("address", event.getAddress()); |
110,7 → 110,7 |
else if("delete".equals(mapping.getParameter())) { |
DynaActionForm theForm = (DynaActionForm)form; |
Long eventId = StringConverter.parseLong(theForm.get("id")); |
Event event = EventManager.getInstance().get(eventId, false); |
Event event = EventManager.getInstance().get(eventId); |
EventManager.getInstance().delete(event); |
response.sendRedirect(BackPath.findBackPath(request).getBackwardUrl()); |
125,12 → 125,14 |
event = EventManager.getInstance().create(); |
} |
else { |
event = EventManager.getInstance().get(eventId, false); |
event = EventManager.getInstance().get(eventId); |
} |
// acts |
EventActBean[] acts = (EventActBean[])theForm.get("acts"); |
for(int i = 0; i < acts.length; i++) { |
// FIXME: validate act id |
// get bean |
Long actId = StringConverter.parseLong(acts[i].getActId()); |
Act act = ActManager.getInstance().get(actId); |
153,6 → 155,8 |
// apartments |
EventApartmentBean[] apartments = (EventApartmentBean[])theForm.get("apartments"); |
for(int i = 0; i < apartments.length; i++) { |
// FIXME: validate apartment id, distance |
// get bean |
Long apartmentId = StringConverter.parseLong(apartments[i].getApartmentId()); |
Apartment apartment = ApartmentManager.getInstance().get(apartmentId); |
168,15 → 172,7 |
eventApartment.setApartment(apartment); |
event.addApartment(eventApartment); |
} |
try { |
eventApartment.setDistance(StringConverter.parseNumber(apartments[i].getDistance())); |
} |
catch(Exception ex) { // the distance cannot be parsed |
initLists(request); |
throw new UserException("ak.kickup.core.event.edit.distance.wrong"); |
} |
eventApartment.setDistance(StringConverter.parseNumber(apartments[i].getDistance())); |
eventApartment.setComment(apartments[i].getComment()); |
} |
} |
184,7 → 180,6 |
// name |
String name = (String)theForm.get("name"); |
if(EventManager.getInstance().nameExists(event, name)) { |
initLists(request); |
throw new UserException("ak.kickup.core.event.name.nonunique"); |
} |
event.setName(name); |