Changeset 17785

Timestamp:

07/25/08 10:56:18 (1 month ago)

Author:

sjmittal

Message:

fix for bfd 5778, 5779, 5780, 5781
TaskEdit?.jsp:
1. reset to again load the task from db
2. value change should always fire ajax call
ScheduleEntryDurationModifier?.java:
set the work complete also to be zero

Files:

• trunk/core/src/net/project/schedule/calc/ScheduleEntryDurationModifier.java (modified) (2 diffs)
• trunk/core/web/jsp/schedule/TaskEdit.jsp (modified) (12 diffs)

trunk/core/src/net/project/schedule/calc/ScheduleEntryDurationModifier.java

@@ -132 +132 @@
-            if (newDuration.isZero()) {
-                scheduleEntry.setWork(new TimeQuantity(0, scheduleEntry.getWorkTQ().getUnits()));
+                scheduleEntry.setWorkComplete(new TimeQuantity(0, scheduleEntry.getWorkCompleteTQ().getUnits()));
-            }
-            scheduleEntry.calculateEndDate(this.workingTimeCalendarProvider);
@@ -227 +228 @@
-            // If the new duration is zero, we set work to zero (keeping same units)
-            if (newDuration.isZero()) {
-
+
+
-            }
-

trunk/core/web/jsp/schedule/TaskEdit.jsp

@@ -245 +245 @@
-
-function reset() {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-}
-
@@ -286 +281 @@
-
-        // Now do a round-trip since no date is required
- && (getSelectedValue(document.getElementById("constraintTypeID")) != document.getElementById("constraintTypeIDHidden").value)
+
-            recalculateForConstraintChange();
-        }
@@ -340 +335 @@
-    toggleTimeWarningHelp(true);
-
- && (document.getElementById("constraintDateString").value != document.getElementById("constraintDateStringHidden").value)
+
-        recalculateForConstraintChange();
-    }
@@ -351 +346 @@
-    var percentCompleteValueCell = document.getElementById("percentCompleteValueCell");
-
-    //Deal with percent complete field being disabled or enabled
-    //sjmittal: moved to milestoneChecked
-
-        var workCompleteValue = getWorkHours(parseFloat(removeSeparator(theForm.work_complete.value)),parseInt(getSelectedValue(document.getElementById("work_complete_units"))));
-        var workValue = getWorkHours(parseFloat(removeSeparator(theForm.work.value)), parseInt(getSelectedValue(document.getElementById("work_units"))));
-//      if (theForm.work.value == '0') {
-//          theForm.work_complete.value = '0';
-//      }
-        if (workCompleteValue > workValue) {                            
-                errorHandler(theForm.work, '<%=PropertyProvider.get("prm.schedule.taskedit.error.moreworkcomplete.message")%>');
-        theForm.work.value = document.getElementById("workHidden").value;
-        theForm.work.focus();
-
-
+
-        recalculateForWorkChange();
-    }
@@ -372 +360 @@
-    goSubmit = true;
-    // Only if user changed the value
- && (getSelectedValue(document.getElementById("work_units")) != document.getElementById("work_unitsHidden").value)
+
-                var workCompleteValue = getWorkHours(parseFloat(removeSeparator(theForm.work_complete.value)),parseInt(getSelectedValue(document.getElementById("work_complete_units"))));
-                var workValue = getWorkHours(parseFloat(removeSeparator(theForm.work.value)), parseInt(getSelectedValue(document.getElementById("work_units"))));
-//              if (theForm.work.value == '0') {
-//                      theForm.work_complete.value = '0';
-//              }
-                if (workCompleteValue > workValue) {    
-                        errorHandler(theForm.work, '<%=PropertyProvider.get("prm.schedule.taskedit.error.moreworkcomplete.message")%>');
@@ -391 +376 @@
-        var workCompleteValue = getWorkHours(parseFloat(removeSeparator(theForm.work_complete.value)),parseInt(getSelectedValue(document.getElementById("work_complete_units"))));
-        var workValue = getWorkHours(parseFloat(removeSeparator(theForm.work.value)), parseInt(getSelectedValue(document.getElementById("work_units"))));
-//    if (theForm.work.value == '0') {
-//      theForm.work_complete.value = '0';
-//    }
-        if (workCompleteValue > workValue) {                            
-                errorHandler(theForm.work_complete, '<%=PropertyProvider.get("prm.schedule.taskedit.error.moreworkcomplete.message")%>');
-        theForm.work_complete.value = document.getElementById("work_completeHidden").value;
-        theForm.work_complete.focus();
-
-
+
-        recalculateForWorkCompleteChange();
-        }
@@ -417 +398 @@
-function workCompleteUnitsChanged() {
-    goSubmit = true;
-
-
+
-                var workCompleteValue = getWorkHours(parseFloat(removeSeparator(theForm.work_complete.value)),parseInt(getSelectedValue(document.getElementById("work_complete_units"))));
-                var workValue = getWorkHours(parseFloat(removeSeparator(theForm.work.value)), parseInt(getSelectedValue(document.getElementById("work_units"))));
-//              if (theForm.work.value == '0') {
-//                      theForm.work_complete.value = '0';
-//              }
-                if (workCompleteValue > workValue) {                            
-                        errorHandler(theForm.work_complete, '<%=PropertyProvider.get("prm.schedule.taskedit.error.moreworkcomplete.message")%>');
@@ -435 +412 @@
-function workPercentCompleteChanged() {
-        goSubmit = true;
-
-
-
-
-
-
+
-                recalculateForWorkPercentCompleteChange();
-        }
@@ -494 +466 @@
-    var startTimeHiddenElement = document.getElementById("startTimeHidden");
-
- && (startTimeElement.value != startTimeHiddenElement.value)
+
-        if (!verifyConstraintChange(true)) {
-            startTimeElement.value = startTimeHiddenElement.value;
@@ -522 +494 @@
-    var endTimeHiddenElement = document.getElementById("endTimeHidden");
-
- && (endTimeElement.value != endTimeHiddenElement.value)
+
-        if (!verifyConstraintChange(false)) {
-            endTimeElement.value = endTimeHiddenElement.value;
@@ -579 +551 @@
-function durationChanged() {
-    goSubmit = true;
-
-
+
-        recalculateForDurationChange();
-    }
@@ -587 +558 @@
-function durationUnitsChanged() {
-    goSubmit = true;
-
-
+
-        recalculateForDurationChange();
-    }