svnno****@sourc*****
svnno****@sourc*****
2008年 12月 1日 (月) 23:12:15 JST
Revision: 1490
http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1490
Author: shinsuke
Date: 2008-12-01 23:12:15 +0900 (Mon, 01 Dec 2008)
Log Message:
-----------
fixed bug and set empty string.
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
timecard/trunk/src/main/java/jp/sf/pal/timecard/service/ReportService.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-01 09:18:22 UTC (rev 1489)
+++ timecard/trunk/src/main/java/jp/sf/pal/timecard/action/EmployeeAction.java 2008-12-01 14:12:15 UTC (rev 1490)
@@ -182,6 +182,31 @@
public String confirm() {
employeeForm.status = String
.valueOf(TimecardConstants.REPORT_STATUS_EDITING);
+
+ if (StringUtils.isEmpty(employeeForm.startTimeHr)
+ || StringUtils.isEmpty(employeeForm.startTimeMin)) {
+ employeeForm.startTimeHr = "";
+ employeeForm.startTimeMin = "";
+ }
+
+ if (StringUtils.isEmpty(employeeForm.endTimeHr)
+ || StringUtils.isEmpty(employeeForm.endTimeMin)) {
+ employeeForm.endTimeHr = "";
+ employeeForm.endTimeMin = "";
+ }
+
+ if (StringUtils.isEmpty(employeeForm.breakTimeHr)
+ || StringUtils.isEmpty(employeeForm.breakTimeMin)) {
+ employeeForm.breakTimeHr = "";
+ employeeForm.breakTimeMin = "";
+ }
+
+ if (StringUtils.isEmpty(employeeForm.otjTimeHr)
+ || StringUtils.isEmpty(employeeForm.otjTimeMin)) {
+ employeeForm.otjTimeHr = "";
+ employeeForm.otjTimeMin = "";
+ }
+
return "confirm.jsp";
}
@@ -189,6 +214,31 @@
public String sendrequest() {
employeeForm.status = String
.valueOf(TimecardConstants.REPORT_STATUS_REQUEST);
+
+ if (StringUtils.isEmpty(employeeForm.startTimeHr)
+ || StringUtils.isEmpty(employeeForm.startTimeMin)) {
+ employeeForm.startTimeHr = "";
+ employeeForm.startTimeMin = "";
+ }
+
+ if (StringUtils.isEmpty(employeeForm.endTimeHr)
+ || StringUtils.isEmpty(employeeForm.endTimeMin)) {
+ employeeForm.endTimeHr = "";
+ employeeForm.endTimeMin = "";
+ }
+
+ if (StringUtils.isEmpty(employeeForm.breakTimeHr)
+ || StringUtils.isEmpty(employeeForm.breakTimeMin)) {
+ employeeForm.breakTimeHr = "";
+ employeeForm.breakTimeMin = "";
+ }
+
+ if (StringUtils.isEmpty(employeeForm.otjTimeHr)
+ || StringUtils.isEmpty(employeeForm.otjTimeMin)) {
+ employeeForm.otjTimeHr = "";
+ employeeForm.otjTimeMin = "";
+ }
+
return "confirm.jsp";
}
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-01 09:18:22 UTC (rev 1489)
+++ timecard/trunk/src/main/java/jp/sf/pal/timecard/action/admin/TimecardAction.java 2008-12-01 14:12:15 UTC (rev 1490)
@@ -17,6 +17,7 @@
import jp.sf.pal.timecard.form.admin.TimecardForm;
import jp.sf.pal.timecard.service.ReportService;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.seasar.struts.annotation.ActionForm;
@@ -174,12 +175,36 @@
@Execute(validator = true, input = "edit.jsp")
public String confirm() {
+ if (StringUtils.isEmpty(timecardForm.startTimeHr)
+ || StringUtils.isEmpty(timecardForm.startTimeMin)) {
+ timecardForm.startTimeHr = "";
+ timecardForm.startTimeMin = "";
+ }
+
+ if (StringUtils.isEmpty(timecardForm.endTimeHr)
+ || StringUtils.isEmpty(timecardForm.endTimeMin)) {
+ timecardForm.endTimeHr = "";
+ timecardForm.endTimeMin = "";
+ }
+
+ if (StringUtils.isEmpty(timecardForm.breakTimeHr)
+ || StringUtils.isEmpty(timecardForm.breakTimeMin)) {
+ timecardForm.breakTimeHr = "";
+ timecardForm.breakTimeMin = "";
+ }
+
+ if (StringUtils.isEmpty(timecardForm.otjTimeHr)
+ || StringUtils.isEmpty(timecardForm.otjTimeMin)) {
+ timecardForm.otjTimeHr = "";
+ timecardForm.otjTimeMin = "";
+ }
+
return "confirm.jsp";
}
// @Execute(validator = false, input = "error.jsp")
// public String deletepage() {
- // employeeForm.mode = TimecardConstants.DELETE_MODE;
+ // timecardForm.mode = TimecardConstants.DELETE_MODE;
//
// // update edit page
// loadDetailsPageParameters();
@@ -234,7 +259,7 @@
// @Execute(validator = false, input = "error.jsp")
// public String delete() {
// try {
- // reportService.disable(Long.parseLong(employeeForm.id), request
+ // reportService.disable(Long.parseLong(timecardForm.id), request
// .getRemoteUser());
// TimecardUtil.addMessage(request, "success.delete_daily_report");
//
Modified: timecard/trunk/src/main/java/jp/sf/pal/timecard/service/ReportService.java
===================================================================
--- timecard/trunk/src/main/java/jp/sf/pal/timecard/service/ReportService.java 2008-12-01 09:18:22 UTC (rev 1489)
+++ timecard/trunk/src/main/java/jp/sf/pal/timecard/service/ReportService.java 2008-12-01 14:12:15 UTC (rev 1490)
@@ -182,7 +182,8 @@
for (DailyReport dailyReport : dailyReportList) {
if (dailyReport.getStartTime() == null
&& dailyReport.getEndTime() == null
- && dailyReport.getBreakTime() == null) {
+ && dailyReport.getBreakTime() == null
+ && dailyReport.getWorkingType() == TimecardConstants.WORKING_TYPE_WORK) {
// check holiday
if (dailyReport.getDayOfWeek() != 0
&& dailyReport.getDayOfWeek() != 6