Changeset 20514

Timestamp:

03/02/10 08:16:00 (5 months ago)

Author:

nilesh

Message:

changes for providing configuration for warning messages and work capture to an un-assigned task.

Files:

• trunk/core/src/net/project/schedule/Schedule.java (modified) (9 diffs)
• trunk/core/src/net/project/schedule/SchedulePropertiesHelper.java (modified) (3 diffs)
• trunk/core/web/jsp/schedule/properties/ScheduleProperties.jsp (modified) (1 diff)
• trunk/core/web/jsp/schedule/properties/SchedulePropertiesProcessing.jsp (modified) (2 diffs)

trunk/core/src/net/project/schedule/Schedule.java

@@ -268 +268 @@
-    /** Indicates if this schedule is being shared by any other projects. */
-    private boolean isShared = false;
+    private boolean editingWarning = true;
+    private boolean unAssignedWorkcapture = true;
-
-    /**
@@ -313 +315 @@
-        startConstraintDate = null;
-        predecessorList = new PredecessorList();
+        editingWarning = true;
+        unAssignedWorkcapture = true;
-    }
-
@@ -1531 +1535 @@
-        }
-
-
+,?,?
-
-        int index = 0;
@@ -1552 +1556 @@
-        db.cstmt.setString(++index, startConstraint.getID());
-        DatabaseUtils.setTimestamp(db.cstmt, ++index, startConstraintDate);
-
+
+
+
-        db.cstmt.registerOutParameter((idIndex = ++index), Types.NUMERIC);
-        DatabaseUtils.setInteger(db.cstmt, idIndex, getID());
@@ -1614 +1620 @@
-            "    p.default_calendar_id, p.timezone_id, shp.space_id, p.default_task_calc_type_id, " +
-            "    p.earliest_start_date, p.earliest_finish_date, p.latest_start_date, " +
-
+, inline_editing_warning, un_assigned_workcapture
-            "from " +
-            "    pn_space_has_plan shp, " +
@@ -1645 +1651 @@
-        int CONSTRAINT_DATE_COL = colID++;
-        int LOAD_TIME_COL = colID++;
+        int EDITING_WARNING_COL = colID++;
+        int UN_ASSIGNED_WORKCAPTURE_COL = colID++;
-
-
@@ -1672 +1680 @@
-            startConstraint = TaskConstraintType.getForID(db.result.getString(CONSTRAINT_TYPE_ID_COL));
-            startConstraintDate = DatabaseUtils.getTimestamp(db.result, CONSTRAINT_DATE_COL);
+            editingWarning = db.result.getBoolean(EDITING_WARNING_COL);
+            unAssignedWorkcapture = db.result.getBoolean(UN_ASSIGNED_WORKCAPTURE_COL);
-
-            String timeZoneID = db.result.getString(TIMEZONE_ID_COL);
@@ -2522 +2532 @@
-        clone.isShared = this.isShared;
-        clone.latestFinishDate = this.latestFinishDate;
+        clone.editingWarning = this.editingWarning;
+        clone.unAssignedWorkcapture = this.unAssignedWorkcapture;
-        //Make copies of all the entries in the entry map
-        Map clonedEntryMap = new LinkedHashMap();
@@ -2635 +2647 @@
-        return getTaskList().first() == null ? "" : getTaskList().first().getID();
-    }
+
+        /**
+         * @return the unAssignedWorkcapture
+         */
+        public boolean isUnAssignedWorkcapture() {
+                return unAssignedWorkcapture;
+        }
+
+        /**
+         * @param unAssignedWorkcapture the unAssignedWorkcapture to set
+         */
+        public void setUnAssignedWorkcapture(boolean unAssignedWorkcapture) {
+                this.unAssignedWorkcapture = unAssignedWorkcapture;
+        }
+
+        /**
+         * @return the editingWarning
+         */
+        public boolean isEditingWarning() {
+                return editingWarning;
+        }
+
+        /**
+         * @param editingWarning the editingWarning to set
+         */
+        public void setEditingWarning(boolean editingWarning) {
+                this.editingWarning = editingWarning;
+        }
-    
-}

trunk/core/src/net/project/schedule/SchedulePropertiesHelper.java

@@ -50 +50 @@
-    private TaskCalculationType defaultTaskCalculationType;
-    private List scheduleDependencies = new ArrayList();
+    private boolean editingWarning;
+    private boolean unAssignedWorkcapture;
-
-    /**
@@ -93 +95 @@
-        this.isAutoCalculateTaskEndpoints = schedule.isAutocalculateTaskEndpoints();
-        this.defaultTaskCalculationType = schedule.getDefaultTaskCalculationType();
+        this.editingWarning = schedule.isEditingWarning();
+        this.unAssignedWorkcapture = schedule.isUnAssignedWorkcapture();
-    }
-
@@ -248 +252 @@
-        return scheduleDependencies;
-    }
+    
+    /**
+     * Returns the "checked" attribute based on the autocalculation setting
+     * @return the string "checked" if auto calculate is on;
+     * otherwise empty string
+     */
+    public String getCheckedEditingWarning() {
+        return (this.editingWarning ? "checked" : "");
+    }
+    
+    /**
+     * Returns the "checked" attribute based on the autocalculation setting
+     * @return the string "checked" if auto calculate is on;
+     * otherwise empty string
+     */
+    public String getCheckedUnAssignedWorkcapture() {
+        return (this.unAssignedWorkcapture ? "checked" : "");
+    }
-
-}

trunk/core/web/jsp/schedule/properties/ScheduleProperties.jsp

@@ -275 +275 @@
-    </td>
-</tr>
+<%-- enable inline editing warning message checkbox --%>
+<tr>
+    <td colspan="2" class="tableContent">
+        <label>
+        <input type="checkbox" name="editingWarning" value="true" <jsp:getProperty name="schedulePropertiesHelper" property="checkedEditingWarning" />>
+        <display:get name="prm.schedule.properties.inlineeditwarning.label"/>
+        </label>
+    </td>
+</tr>
+<%-- Enable Un-assigned task work capture --%>
+<tr>
+    <td colspan="2" class="tableContent">
+        <label>
+        <input type="checkbox" name="unAssignedWorkcapture" value="true" <jsp:getProperty name="schedulePropertiesHelper" property="checkedUnAssignedWorkcapture" />>
+        <display:get name="prm.schedule.properties.unassignedworkcapture.label"/>
+        </label>
+    </td>
+</tr>
-</table>
-

trunk/core/web/jsp/schedule/properties/SchedulePropertiesProcessing.jsp

@@ -107 +107 @@
-    TaskCalculationType taskCalculationType = TaskCalculationType.makeFromComponents(TaskCalculationType.FixedElement.forID(defaultTaskCalculationTypeFixedElementID), isNewTaskEffortDriven);
-    TaskConstraintType startConstraintType = TaskConstraintType.getForID(request.getParameter("scheduleStartConstraint"));
-
+
+
-    if (!errorReporter.errorsFound()) {
-        if (!Validator.isBlankOrNull(onlyshiftworkplan) && onlyshiftworkplan.equals("true")) {
@@ -120 +121 @@
-            schedule.setDefaultTaskCalculationType(taskCalculationType);
-            schedule.setStartConstraint(startConstraintType);
-
+
+
+
-            schedule.store();
-