• R/O
  • SSH
  • HTTPS

pal: Commit


Commit MetaInfo

Revision1683 (tree)
Zeit2009-01-20 15:46:16
Autorshinsuke

Log Message

allow you to update a target event and later.

Ändern Zusammenfassung

Diff

--- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/RepeatScheduleAction.java (revision 1682)
+++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/RepeatScheduleAction.java (revision 1683)
@@ -305,6 +305,52 @@
305305 }
306306
307307 @Execute(validator = true, input = "edit.jsp")
308+ public String updateitandlater() {
309+ if (!SchedulerUtil.compare(repeatScheduleForm.getStartDate(),
310+ repeatScheduleForm.getStartTime(), repeatScheduleForm
311+ .getEndDate(), repeatScheduleForm.getEndTime())) {
312+ throw new ActionMessagesException("errors.invalid_end_date");
313+ }
314+ try {
315+ int ty = Integer.parseInt(repeatScheduleForm.tYear);
316+ int tm = Integer.parseInt(repeatScheduleForm.tMonth);
317+ int td = Integer.parseInt(repeatScheduleForm.tDate);
318+ Date d1 = DateUtil.get(ty - 1900, tm - 1, td - 1);
319+ EventSchedule prevEventSchedule = getEventSchedule();
320+ prevEventSchedule.setEndDate(d1);
321+ repeatScheduleService.store(prevEventSchedule);
322+
323+ repeatScheduleForm.mode = CommonConstants.CREATE_MODE;
324+ Date d2 = DateUtil.get(ty - 1900, tm - 1, td);
325+ EventSchedule eventSchedule = createEventSchedule();
326+ eventSchedule.setStartDate(d2);
327+ eventSchedule.setParentId(prevEventSchedule.getId());
328+ repeatScheduleService.store(eventSchedule);
329+
330+ SAStrutsUtil.addMessage(request,
331+ "success.update_eventSchedule_and_later");
332+
333+ repeatScheduleForm.id = eventSchedule.getId().toString();
334+
335+ repeatScheduleForm.mode = CommonConstants.CONFIRM_MODE;
336+
337+ // update edit page
338+ loadDetailsPageParameters();
339+
340+ loadEventSchedule();
341+
342+ return "confirm.jsp";
343+ } catch (ActionMessagesException e) {
344+ log.error(e.getMessage(), e);
345+ throw e;
346+ } catch (Exception e) {
347+ log.error(e.getMessage(), e);
348+ throw new ActionMessagesException(
349+ "errors.failed_to_update_eventSchedule");
350+ }
351+ }
352+
353+ @Execute(validator = true, input = "edit.jsp")
308354 public String update() {
309355 if (!SchedulerUtil.compare(repeatScheduleForm.getStartDate(),
310356 repeatScheduleForm.getStartTime(), repeatScheduleForm
@@ -598,6 +644,15 @@
598644 return eventSchedule;
599645 }
600646
647+ private EventSchedule getEventSchedule() {
648+ String userId = request.getRemoteUser();
649+ EventSchedule eventSchedule = repeatScheduleService.getEventSchedule(
650+ Long.parseLong(repeatScheduleForm.id), null);
651+ eventSchedule.setUpdatedBy(userId);
652+
653+ return eventSchedule;
654+ }
655+
601656 private EventSchedule createDeletedEventSchedule(EventSchedule eventSchedule) {
602657 String userId = request.getRemoteUser();
603658 EventSchedule deletedEventSchedule = new EventSchedule();
--- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/schedule/RepeatScheduleAction.java (revision 1682)
+++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/schedule/RepeatScheduleAction.java (revision 1683)
@@ -298,6 +298,52 @@
298298 }
299299
300300 @Execute(validator = true, input = "edit.jsp")
301+ public String updateitandlater() {
302+ if (!SchedulerUtil.compare(repeatScheduleForm.getStartDate(),
303+ repeatScheduleForm.getStartTime(), repeatScheduleForm
304+ .getEndDate(), repeatScheduleForm.getEndTime())) {
305+ throw new ActionMessagesException("errors.invalid_end_date");
306+ }
307+ try {
308+ int ty = Integer.parseInt(repeatScheduleForm.tYear);
309+ int tm = Integer.parseInt(repeatScheduleForm.tMonth);
310+ int td = Integer.parseInt(repeatScheduleForm.tDate);
311+ Date d1 = DateUtil.get(ty - 1900, tm - 1, td - 1);
312+ EventSchedule prevEventSchedule = getEventSchedule();
313+ prevEventSchedule.setEndDate(d1);
314+ repeatScheduleService.store(prevEventSchedule);
315+
316+ repeatScheduleForm.mode = CommonConstants.CREATE_MODE;
317+ Date d2 = DateUtil.get(ty - 1900, tm - 1, td);
318+ EventSchedule eventSchedule = createEventSchedule();
319+ eventSchedule.setStartDate(d2);
320+ eventSchedule.setParentId(prevEventSchedule.getId());
321+ repeatScheduleService.store(eventSchedule);
322+
323+ SAStrutsUtil.addMessage(request,
324+ "success.update_eventSchedule_and_later");
325+
326+ repeatScheduleForm.id = eventSchedule.getId().toString();
327+
328+ repeatScheduleForm.mode = CommonConstants.CONFIRM_MODE;
329+
330+ // update edit page
331+ loadDetailsPageParameters();
332+
333+ loadEventSchedule();
334+
335+ return "confirm.jsp";
336+ } catch (ActionMessagesException e) {
337+ log.error(e.getMessage(), e);
338+ throw e;
339+ } catch (Exception e) {
340+ log.error(e.getMessage(), e);
341+ throw new ActionMessagesException(
342+ "errors.failed_to_update_eventSchedule");
343+ }
344+ }
345+
346+ @Execute(validator = true, input = "edit.jsp")
301347 public String update() {
302348 if (!SchedulerUtil.compare(repeatScheduleForm.getStartDate(),
303349 repeatScheduleForm.getStartTime(), repeatScheduleForm
@@ -590,6 +636,15 @@
590636 return eventSchedule;
591637 }
592638
639+ private EventSchedule getEventSchedule() {
640+ String userId = request.getRemoteUser();
641+ EventSchedule eventSchedule = repeatScheduleService.getEventSchedule(
642+ Long.parseLong(repeatScheduleForm.id), null);
643+ eventSchedule.setUpdatedBy(userId);
644+
645+ return eventSchedule;
646+ }
647+
593648 private EventSchedule createDeletedEventSchedule(EventSchedule eventSchedule) {
594649 String userId = request.getRemoteUser();
595650 EventSchedule deletedEventSchedule = new EventSchedule();
Show on old repository browser