Changeset 17911

Timestamp:

08/20/08 03:51:10 (3 months ago)

Author:

sjmittal

Message:

fixes for bfd 5805, 5694, 5806, 5807
FormData?.java: inserting name of the form in case of form data update, if the same has not been updated before, as its needed for assignable forms to work that were created prior to the introduction of this concept.
PercentCompleteChangedHandler?.java: handling for assignable form
UpdateAssignmentsProcessingHandler?.java: storing and % complete change for assignable form
FormEdit?.jsp, include/FormEdit.jsp: making the % complete non editable if no work is captured yet
FormEditProcessing?.jsp: checking for work = work complete also so that update of 100% works
UpdateAssignments?.jsp: unlimiting the characters in capture work from 2

Files:

• trunk/core/src/net/project/form/FormData.java (modified) (2 diffs)
• trunk/core/src/net/project/resource/mvc/handler/PercentCompleteChangedHandler.java (modified) (5 diffs)
• trunk/core/src/net/project/resource/mvc/handler/UpdateAssignmentsProcessingHandler.java (modified) (1 diff)
• trunk/core/web/jsp/form/FormEdit.jsp (modified) (1 diff)
• trunk/core/web/jsp/form/FormEditProcessing.jsp (modified) (1 diff)
• trunk/core/web/jsp/form/include/FormEdit.jsp (modified) (3 diffs)
• trunk/core/web/jsp/resource/include/UpdateAssignments.jsp (modified) (1 diff)

trunk/core/src/net/project/form/FormData.java

@@ -393 +393 @@
-
-        FormField titleField = m_form.getFirstEditableField();
-
-
-
-
-
-
-
+
+
+
+
+
+
-                return titleFieldValue;
-
-
-
+
+
-            }
-        }
@@ -788 +786 @@
-                db.pstmt.setString(++index, m_form.getFirstEditableField() == null ? m_form.getAbbreviation() + "-" + sequenceNum : getName());
-                DatabaseUtils.setInteger(db.pstmt, ++index, dataObjectID);                
-
+
+
+
+
+
+
+
+
+
+
-            } else {
-

trunk/core/src/net/project/resource/mvc/handler/PercentCompleteChangedHandler.java

@@ -36 +36 @@
-import net.project.base.mvc.IView;
-import net.project.base.property.PropertyProvider;
+import net.project.form.assignment.FormAssignment;
+import net.project.resource.ActivityAssignment;
+import net.project.resource.Assignment;
-import net.project.resource.ScheduleEntryAssignment;
-import net.project.resource.mvc.view.PercentCompleteChangedView;
@@ -126 +129 @@
-        //Get the assignment for this work
-        Map assignmentMap = (Map)request.getSession().getAttribute("updateAssignmentsMap");
-ScheduleEntryAssignment assn = (ScheduleEntry
+Assignment assn = (
-
-        //Figure out the total amount of work that has been completed.
-assn.getWorkComplete(
+getWorkComplete(assn
-
-        for (int i = 0; i < 7; i++) {
@@ -140 +143 @@
-        if (workComplete.isZero()) {
-            errors.addError(PropertyProvider.get("prm.personal.assignments.cannotsetpercentcomplete.message"));
-assn.getPercentComplete(
+getPercentComplete(assn
-            return;
-        }
@@ -156 +159 @@
-        if(!Validator.isInRange(percentComplete.doubleValue(), 0.00001, 1)) {
-            errors.addError(new ErrorDescription(PropertyProvider.get("prm.resource.updatework.error.pencentcomplete.range.message")));
-assn.getPercentComplete(
+getPercentComplete(assn
-            return;
-        }
@@ -166 +169 @@
-        model.put("workRemaining", workRemaining);
-    }
+    
+    private TimeQuantity getWorkComplete(Assignment assn) {
+        if(assn instanceof ScheduleEntryAssignment)
+            return((ScheduleEntryAssignment) assn).getWorkComplete();
+        else if(assn instanceof FormAssignment)
+            return ((FormAssignment) assn).getWorkComplete();
+        else
+            return ((ActivityAssignment) assn).getWork();
+    }
+    
+    private BigDecimal getPercentComplete(Assignment assn) {
+        if(assn instanceof ScheduleEntryAssignment)
+            return((ScheduleEntryAssignment) assn).getPercentComplete();
+        else if(assn instanceof FormAssignment)
+            return ((FormAssignment) assn).getPercentComplete();
+        else
+            return new BigDecimal(1.0);
+    }
-}

trunk/core/src/net/project/resource/mvc/handler/UpdateAssignmentsProcessingHandler.java

@@ -629 +629 @@
-                    newWork = new TimeQuantity(new BigDecimal(workUpdateString), TimeQuantityUnit.HOUR);
-                    fAssignment.setWork(newWork);
+                    //store any work changes here as you may not get a chance to do that later
+                    fAssignment.store();
-                }
-            } else if (assignment instanceof ActivityAssignment) {

trunk/core/web/jsp/form/FormEdit.jsp

@@ -208 +208 @@
-   theForm = self.document.forms[0];
-   isLoaded = true;
+   var workComplete = Ext.DomQuery.selectNode("#work_complete");
+   if(workComplete && workComplete.value == '0') {
+       var workPercentComplete  = Ext.DomQuery.selectNode("#work_percent_complete");
+       if(workPercentComplete)
+           workPercentComplete.readOnly = true;
+   }
-}
-

trunk/core/web/jsp/form/FormEditProcessing.jsp

@@ -89 +89 @@
-                                    TimeQuantity newWork = TimeQuantity.parse(work, workUnits);
-                                    TimeQuantity oldWorkComplete = assignment.getWorkComplete();
-
+=
-                                        assignment.setWork(newWork);
-                                    }

trunk/core/web/jsp/form/include/FormEdit.jsp

@@ -92 +92 @@
-
-                editMode = "modify";
-
+
-        } else {// Creating new form instance, requires Form object in session
-                id = null;
@@ -369 +369 @@
-        </td>
-        <td nowrap width="25%">
-Blur
+Change
-            <input:select elementID="work_units" name="work_units" onChange="workUnitsChanged();" options="<%=availableUnits%>" defaultSelected="<%=assigned == null ? TimeQuantityUnit.HOUR : assigned.getWork().getUnits()%>" />
-        </td>
@@ -378 +378 @@
-        </td>
-        <td nowrap width="15%" >
-Blur
+Change
-        </td>
-        <td nowrap width="15%" id="startDate">

trunk/core/web/jsp/resource/include/UpdateAssignments.jsp

@@ -488 +488 @@
-                    <%=work.toShortString(0,2)%> <br>
-                <% if(!readOnly) { %>
-2
+5
-                <%  } %>
-                </td>