Changeset 17847

Timestamp:

08/07/08 11:05:04 (3 weeks ago)

Author:

carlos

Message:

Added "Unindent" and "Indent" features to the Indented Beta view.

Files:

• trunk/core/src/net/project/schedule/mvc/handler/main/IndentHandler.java (modified) (2 diffs)
• trunk/core/src/net/project/schedule/mvc/handler/main/UnindentHandler.java (modified) (2 diffs)
• trunk/core/web/jsp/schedule/Main.jsp (modified) (7 diffs)
• trunk/core/web/src/indentedView.js (modified) (1 diff)

trunk/core/src/net/project/schedule/mvc/handler/main/IndentHandler.java

@@ -31 +31 @@
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
-
-import net.project.database.DatabaseUtils;
@@ -73 +75 @@
-        String parentTask = request.getParameter("parentTask");
-        String idList[] = request.getParameterValues("selected");
+        if(null == idList){
+            idList = StringUtils.split((String) request.getParameter("selectedIds"), ',');
+        }
-
-        ErrorReporter er = TaskListUtils.indentTasks(idList, parentTask, schedule);

trunk/core/src/net/project/schedule/mvc/handler/main/UnindentHandler.java

@@ -23 +23 @@
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
-
-import net.project.database.DatabaseUtils;
@@ -62 +64 @@
-
-        String idList[] = request.getParameterValues("selected");
+        if(null == idList){
+            idList = StringUtils.split((String) request.getParameter("selectedIds"), ',');
+        }
-
-        TaskListUtils.unindentTasks(idList, schedule);

trunk/core/web/jsp/schedule/Main.jsp

@@ -143 +143 @@
-<template:import type="javascript" src="/src/dhtml/tree.js" />
-<template:import type="javascript" src="/src/dhtml/xmlrequest.js" />
+<template:import type="javascript" src="/src/blogit.js" />
-<template:import type="javascript" src="/src/components/gridView.js" />
-<template:import type="javascript" src="/src/blogit.js" />
-<template:import type="javascript" src="/src/indentedView.js" />
-
@@ -277 +277 @@
-    flatView.init('schedule-grid');
-    flatView.addEditCellHandling(JSPRootURL + '/ajax/schedule/WorkplanUpdate', JSPRootURL + '/ajax/schedule/WorkplanUpdateValidator');
-
+, false
-}
-
@@ -287 +287 @@
-    setTreeGridColumns(indentedView);
-    indentedView.init('schedule-grid');
-
+, true
-}
-
@@ -333 +333 @@
-}
-
-
+, isTree
-        var menuItems = new Array();
-        if(null != grid){
@@ -349 +349 @@
-         menuItems[menuItems.length] = addUpdatePercentageWorkMenuItem(grid);
-         menuItems[menuItems.length] = addViewTaskPropertiesMenuItem(grid);
+         if(isTree){
+            menuItems[menuItems.length] = addIndentTaskMenuItem(grid);
+            menuItems[menuItems.length] = addUnIndentTaskMenuItem(grid);
+         }
-             grid.addRowContextMenu(menuItems);
-         }
@@ -466 +470 @@
-            extAlert('Error', '<display:get name="prm.global.javascript.verifyselection.noselection.error.message" />', Ext.MessageBox.ERROR);
-        }
+    }; // eo handler
+    return item;
+}
+
+function addIndentTaskMenuItem(grid){
+    var item = {};
+    item.text = '<display:get name="all.global.toolbar.schedule.taskright" />';
+    item.handler = function (){
+        var result = grid.getSelectedAdjoiningRowIdsFromGrid();
+        var parent = result.parent;
+        var ids = result.ids;
+        switch (parent){
+            case -1:
+                var errorMessage = '<display:get name="prm.global.javascript.verifyselection.noselection.error.message" />';
+                extAlert('Error', errorMessage , Ext.MessageBox.ERROR);
+                break;
+            case -2:
+                var errorMessage = '<prm.schedule.main.cannotindentfirsttask.error.message" />';
+                extAlert('Error', errorMessage , Ext.MessageBox.ERROR);
+                break;
+            case -3:
+                var errorMessage = '<prm.global.javascript.verifyadjoiningselection.error.message" />';
+                extAlert('Error', errorMessage , Ext.MessageBox.ERROR);
+                break;
+            default:
+            theForm.theAction.value = "/MainProcessing/Indent";
+            theForm.parentTask.value = parent;
+            theForm.action.value = "<%=Action.MODIFY%>";
+            theForm.selectedIds.value = ids;
+            theForm.target = "_self";
+            theForm.submit();
+        } // eo switch
-    }; // eo handler
-    return item;
@@ -608 +644 @@
-        } else{
-            extAlert('Error', '<display:get name="prm.global.javascript.verifyselection.noselection.error.message" />', Ext.MessageBox.ERROR);
+        }
+    }; // eo handler
+    return item;
+}
+
+function addUnIndentTaskMenuItem(grid){
+    var item = {};
+    item.text = '<display:get name="all.global.toolbar.schedule.taskleft" />';
+    item.handler = function (){
+        var ids = grid.getSelectedRowIdsFromGrid();
+        if(ids != -1){
+            theForm.theAction.value = "/MainProcessing/Unindent";
+            theForm.action.value = "<%=Action.MODIFY%>";
+            theForm.selectedIds.value = ids;
+            theForm.target = "_self";
+            theForm.submit();
+        }else{
+            var errorMessage = '<display:get name="prm.global.javascript.verifyselection.noselection.error.message" />';
+            extAlert('Error', errorMessage , Ext.MessageBox.ERROR);
-        }
-    }; // eo handler

trunk/core/web/src/indentedView.js

@@ -311 +311 @@
-    return ids;
-};
+
+TreeGrid.prototype.getSelectedAdjoiningRowIdsFromGrid = function getSelectedAdjoiningRowIdsFromGrid(){
+    var result = {};
+
+    // Selected records are driven by highligthed grid rows
+    var selectionModel = this.getSelectionModel();
+    var rowCount = selectionModel.getCount();
+    
+    // Test at least one row was selected
+    if(rowCount == 0){
+        result.parent = -1;
+        return result;
+    }
+    
+    var selectedRows = selectionModel.getSelections();
+    var ids = new Array();
+    // Check it is not selected the first row
+    if(selectionModel.isSelected(0)){
+        result.parent = -2;
+        return result;
+    }
+    // Now the selected row is its parent
+    var temp = new Array();
+    temp[0] = selectedRows[0];
+    selectionModel.selectRecords(temp);
+    selectionModel.selectPrevious();
+    result.parent = selectionModel.getSelected().id;
+    
+    // Check selected rows (before getting the parent) are in sequence.
+    var startSelection = selectedRows[0].get('sequence');
+    ids[ids.length] = selectedRows[0].id;
+    for(var i = 1; i < selectedRows.length; i++){
+        if(selectedRows[i].get('sequence') != (startSelection + 1)){
+            result.parent = -3;
+            return result;
+        } else{
+            ids[ids.length] = selectedRows[i].id;
+        }
+    }
+    result.ids = ids;
+    return result;
+};