Changeset 17815

Timestamp:

08/01/08 13:27:10 (1 month ago)

Author:

carlos

Message:

Added reamining columns to the Indented Beta view.

Files:

• trunk/core/src/net/project/schedule/Schedule.java (modified) (2 diffs)
• trunk/core/src/net/project/schedule/ScheduleEntry.java (modified) (1 diff)
• trunk/core/web/jsp/schedule/Main.jsp (modified) (4 diffs)
• trunk/core/web/src/indentedView.js (modified) (3 diffs)

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

@@ -1132 +1132 @@
-        columns.add("sequence");
-        columns.add("name");
+        columns.add("description");
-        columns.add("work");
-        columns.add("workUnits");
-        columns.add("workInHours");
+        columns.add("duration");        
+        columns.add("calculationType");
+        columns.add("isMilestone");
+        columns.add("actualStart");
+        columns.add("startDateTime");
+        columns.add("endDateTime");
+        columns.add("actualFinish");
+        columns.add("durationInHours");
+        columns.add("workPercentComplete");
+        columns.add("workCompleteString");
+        columns.add("assigneeString");
+        columns.add("phaseName");
+        columns.add("priorityString");
-        
-        final NodeFactory factory = new NodeFactory(columns);
@@ -1140 +1154 @@
-        Node root = factory.nextNode();
-        root.setTitle(this.name);
+        root.set("name", this.name);
-        root.set("id", this.id);
-        

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

@@ -1538 +1538 @@
-    public void addToNode(final NodeFactory factory, final Node root){
-        final Node newNode = factory.nextNode();
+        DateFormat df = SessionManager.getUser().getDateFormatter();
+        
+        //Add all the property values
-        newNode.setTitle(this.name);
-        newNode.set("id", this.id);
-        newNode.set("sequence", this.sequenceNumber);
-        newNode.set("name", XMLUtils.escape(this.getNameMaxLength40()));
+        newNode.set("description", XMLUtils.escape(this.description));
-        newNode.set("work", XMLUtils.escape(this.getWork()));
-        newNode.set("workUnits", XMLUtils.escape(getWorkUnitsString()));
-        newNode.set("workInHours", XMLUtils.escape(this.getAmountUnitInHours(this.work)));
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        // Determine whether this newNode will be added to received root
-        if(StringUtils.isNumeric(this.parentTaskID)){

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

@@ -270 +270 @@
-    }
-    
-
+Grid
-    flatView.setConfigurationReader('id', '*:has(id)');
-    flatView.setDataStore(JSPRootURL + '/schedule/include/storeFlatListProvider.jsp?module=' + scheduleModule);
@@ -281 +281 @@
-
-function setupIndentedAjaxView(){
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    if(null != grid){
+        grid.addRecord(null, '_id', '_id', 'int');
+        grid.addRecord(null, '_level', '_level', 'int');
+        grid.addRecord(null, '_lft', '_lft', 'int');
+        grid.addRecord(null, '_rgt', '_rgt', 'int');
+        grid.addRecord(null, '_is_leaf', '_is_leaf', 'bool');
+        grid.addRecord(null, 'id', 'id', 'int');
+        setBaseRecordDefinition(grid);
+    }
+}
+
+function setGridRecordDefinition(grid){
+    if(null != grid){
+        setBaseRecordDefinition(grid);
+        grid.addRecord(null, 'idlist', 'idlist', null);
+    }
+}
+
+function setBaseRecordDefinition(grid){
+   if(null != grid){
-        grid.addRecord(null, 'sequence', 'sequence', 'int');
-        grid.addRecord(null, 'name', 'name', null);
@@ -305 +327 @@
-        grid.addRecord(null, 'workComplete', 'workCompleteString', null);
-        grid.addRecord(null, 'assigneeString', 'assignees', null);
-_n
+N
-        grid.addRecord(null, 'priorityString', 'priority', null);
-        grid.addRecord(null, 'idlist', 'idlist', null);
-    }
-}
@@ -687 +708 @@
-        grid.addColumn('priority', '<display:get name="prm.schedule.list.priority.column" />', true, null, null, null);
-        grid.addColumn('calculationType', '<display:get name="prm.schedule.list.calculationtype.column" />', true, null, null, null);
+    }
+}
+
+function setTreeGridColumns(grid){
+    if(null != grid){
+        grid.addColumn('name', 'name', '<display:get name="prm.schedule.list.task.column" />', false, nameRenderer, null, null);
+        grid.addColumn(null, 'description', '<display:get name="prm.schedule.list.taskdescription.column" />', true, null, null, null);       
+        grid.addColumn(null, 'startDate', '<display:get name="prm.schedule.list.startdate.column" />', false, Ext.util.Format.dateRenderer('n/j/y'), null, null);
+        grid.addColumn(null, 'actualStartDate', '<display:get name="prm.schedule.list.actualstartdate.column" />', true, Ext.util.Format.dateRenderer('n/j/y'), null, null);
+        grid.addColumn(null, 'endDate', '<display:get name="prm.schedule.list.enddate.column" />', false, Ext.util.Format.dateRenderer('n/j/y'), null, null);
+        grid.addColumn(null, 'actualEndDate', '<display:get name="prm.schedule.list.actualenddate.column" />', true, Ext.util.Format.dateRenderer('n/j/y'), null, null);
+        grid.addColumn(null, 'workInHours', '<display:get name="prm.schedule.list.work.column" />', false, workRenderer, null, null);
+        grid.addColumn(null, 'durationInHours', '<display:get name="prm.schedule.list.duration.column" />', false, durationRenderer, null, null);
+        grid.addColumn(null, 'workComplete', '<display:get name="prm.schedule.list.workcomplete.column" />', true, null, null, null);
+        grid.addColumn(null, 'workPercentComplete', '<display:get name="prm.schedule.list.complete.column" />', false, formatPercentRenderer, null, null);
+        grid.addColumn(null, 'assignees', '<display:get name="prm.schedule.list.resources.column" />', true, null, null, null);
+        grid.addColumn(null, 'phase', '<display:get name="prm.schedule.list.phase.column" />', true, null, null, null);
+        grid.addColumn(null, 'priority', '<display:get name="prm.schedule.list.priority.column" />', true, null, null, null);
+        grid.addColumn(null, 'calculationType', '<display:get name="prm.schedule.list.calculationtype.column" />', true, null, null, null);
-    }
-}

trunk/core/web/src/indentedView.js

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-Controller.prototype.init = function init(renderTo, dataStoreUrl
+TreeGrid.prototype.init = function init(renderTo
-      
-    // Create the data store
@@ -20 +169 @@
-    var store = new Ext.ux.maximgb.treegrid.NestedSetStore({
-            autoLoad : true
-{id: 'id'}, record
-dataStoreUrl
+that.getConfigurationReader(), that.getRecords()
+that.getDataStore()
-    });
-        
@@ -50 +199 @@
-        
-    Ext.onReady(function(){
-
+
-        // create the Grid
-        var grid = new Ext.ux.maximgb.treegrid.GridPanel({
-              store: store,
-              master_column_id : 'name',
-
-
-
-
+
-              renderTo:renderTo,
-              stripeRows: true,