svnno****@sourc*****
svnno****@sourc*****
2008年 12月 4日 (木) 11:12:08 JST
Revision: 1515
http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1515
Author: shinsuke
Date: 2008-12-04 11:12:08 +0900 (Thu, 04 Dec 2008)
Log Message:
-----------
set a default value to a minute.
Modified Paths:
--------------
timecard/trunk/src/main/java/jp/sf/pal/timecard/action/EmployeeAction.java
timecard/trunk/src/main/java/jp/sf/pal/timecard/action/admin/TimecardAction.java
-------------- next part --------------
Modified: timecard/trunk/src/main/java/jp/sf/pal/timecard/action/EmployeeAction.java
===================================================================
--- timecard/trunk/src/main/java/jp/sf/pal/timecard/action/EmployeeAction.java 2008-12-04 01:15:28 UTC (rev 1514)
+++ timecard/trunk/src/main/java/jp/sf/pal/timecard/action/EmployeeAction.java 2008-12-04 02:12:08 UTC (rev 1515)
@@ -187,6 +187,30 @@
employeeForm.status = String
.valueOf(TimecardConstants.REPORT_STATUS_EDITING);
+ // set minutes
+ if (!StringUtils.isEmpty(employeeForm.startTimeHr)
+ && StringUtils.isEmpty(employeeForm.startTimeMin)) {
+ employeeForm.startTimeMin = "00";
+ }
+
+ // set minutes
+ if (!StringUtils.isEmpty(employeeForm.endTimeHr)
+ && StringUtils.isEmpty(employeeForm.endTimeMin)) {
+ employeeForm.endTimeMin = "00";
+ }
+
+ // set minutes
+ if (!StringUtils.isEmpty(employeeForm.otjTimeHr)
+ && StringUtils.isEmpty(employeeForm.otjTimeMin)) {
+ employeeForm.otjTimeMin = "00";
+ }
+
+ // set minutes
+ if (!StringUtils.isEmpty(employeeForm.breakTimeHr)
+ && StringUtils.isEmpty(employeeForm.breakTimeMin)) {
+ employeeForm.breakTimeMin = "00";
+ }
+
if (StringUtils.isEmpty(employeeForm.startTimeHr)
|| StringUtils.isEmpty(employeeForm.startTimeMin)) {
employeeForm.startTimeHr = "";
@@ -220,6 +244,7 @@
employeeForm.otjTimeMin = "";
}
}
+
return "confirm.jsp";
}
@@ -228,6 +253,30 @@
employeeForm.status = String
.valueOf(TimecardConstants.REPORT_STATUS_REQUEST);
+ // set minutes
+ if (!StringUtils.isEmpty(employeeForm.startTimeHr)
+ && StringUtils.isEmpty(employeeForm.startTimeMin)) {
+ employeeForm.startTimeMin = "00";
+ }
+
+ // set minutes
+ if (!StringUtils.isEmpty(employeeForm.endTimeHr)
+ && StringUtils.isEmpty(employeeForm.endTimeMin)) {
+ employeeForm.endTimeMin = "00";
+ }
+
+ // set minutes
+ if (!StringUtils.isEmpty(employeeForm.otjTimeHr)
+ && StringUtils.isEmpty(employeeForm.otjTimeMin)) {
+ employeeForm.otjTimeMin = "00";
+ }
+
+ // set minutes
+ if (!StringUtils.isEmpty(employeeForm.breakTimeHr)
+ && StringUtils.isEmpty(employeeForm.breakTimeMin)) {
+ employeeForm.breakTimeMin = "00";
+ }
+
if (StringUtils.isEmpty(employeeForm.startTimeHr)
|| StringUtils.isEmpty(employeeForm.startTimeMin)) {
employeeForm.startTimeHr = "";
Modified: timecard/trunk/src/main/java/jp/sf/pal/timecard/action/admin/TimecardAction.java
===================================================================
--- timecard/trunk/src/main/java/jp/sf/pal/timecard/action/admin/TimecardAction.java 2008-12-04 01:15:28 UTC (rev 1514)
+++ timecard/trunk/src/main/java/jp/sf/pal/timecard/action/admin/TimecardAction.java 2008-12-04 02:12:08 UTC (rev 1515)
@@ -168,6 +168,30 @@
@Execute(validator = true, input = "edit.jsp")
public String confirm() {
+ // set minutes
+ if (!StringUtils.isEmpty(timecardForm.startTimeHr)
+ && StringUtils.isEmpty(timecardForm.startTimeMin)) {
+ timecardForm.startTimeMin = "00";
+ }
+
+ // set minutes
+ if (!StringUtils.isEmpty(timecardForm.endTimeHr)
+ && StringUtils.isEmpty(timecardForm.endTimeMin)) {
+ timecardForm.endTimeMin = "00";
+ }
+
+ // set minutes
+ if (!StringUtils.isEmpty(timecardForm.otjTimeHr)
+ && StringUtils.isEmpty(timecardForm.otjTimeMin)) {
+ timecardForm.otjTimeMin = "00";
+ }
+
+ // set minutes
+ if (!StringUtils.isEmpty(timecardForm.breakTimeHr)
+ && StringUtils.isEmpty(timecardForm.breakTimeMin)) {
+ timecardForm.breakTimeMin = "00";
+ }
+
if (StringUtils.isEmpty(timecardForm.startTimeHr)
|| StringUtils.isEmpty(timecardForm.startTimeMin)) {
timecardForm.startTimeHr = "";