Changeset 17903

Timestamp:

08/19/08 11:01:56 (3 months ago)

Author:

ritesh

Message:

Persisting columns state in database for Assignments(beta) link.

Files:

• trunk/core/src/net/project/hibernate/service/impl/PnAssignmentServiceImpl.java (modified) (3 diffs)
• trunk/core/src/net/project/view/pages/assignments/MyAssignments.java (modified) (9 diffs)
• trunk/core/web/html/assignments/MyAssignments.html (modified) (1 diff)
• trunk/core/web/src/components/myAssignment-treeGrid.js (modified) (2 diffs)
• trunk/core/web/src/components/myAssignments-dashboard.js (modified) (8 diffs)

trunk/core/src/net/project/hibernate/service/impl/PnAssignmentServiceImpl.java

@@ -27 +27 @@
-import net.project.resource.Assignment;
-import net.project.util.DateFormat;
-
+
+
+
+
+
-import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
@@ -681 +685 @@
-                String treeViewParamerer
-    ) {
-
-
+
-                                        projectIds, businessId, assignmentTypes, lateAssignment, comingDueDate, shouldHaveStart,
-                                        InProgress, startDate, endDate, statusId, percentComplete, PercentCompleteComparator,
-
-
-
-
-
-
-
+
-        }
-        
@@ -709 +706 @@
-                return workRmaining;
-        }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        for (PnAssignment assignment : assignments) {
-                                if (isAssignableType(assignment.getPnObjectType().getObjectType())) {
-
-
+
+
+
+
+
+
+
+
+
+
-                                        }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                        }
-                                        treeString += "{ objectId:"+ assignment.getPnObjectName().getObjectId()
-                                                        + ", objectName:'"+ assignment.getPnObjectName().getName().replaceAll("'", "´")
-                                                        + "', workSpace:'"+ assignment.getPnProjectSpace().getProjectName().replaceAll("'", "´")
-                                                        + "', objectType:'"+ assignment.getPnObjectType().getObjectType()
-                                                        + "', dueDate:'"+ userDateFormat.formatDate(assignment.getEndDate(), "MM/dd/yyyy")
-                                                        + "', workRemaining:'" + getWorkRemainingInHours(assignment.getWork(), 
-                                                                        assignment.getWorkComplete(), assignment.getWorkUnits()) 
-                                                        + "', assigneeName:'" + assignment.getPersonName().replaceAll("'", "´")
-                                                        + "', assignorName:'" + (StringUtils.isNotEmpty(assignment.getAssignorName()) 
-                                                                        ? assignment.getAssignorName().replaceAll("'", "´") : "") 
-                                                        + "', _id : "+ assignment.getPnObjectName().getObjectId() 
-                                                        + ", _parent : "+ assignment.getPnProjectSpace().getProjectId() 
-                                                        + " ,_level:2 ,_lft:" + left++ + ", _rgt:"+ right-- + " ,_is_leaf:true }";
-                                        projectId = assignment.getPnProjectSpace().getProjectId();
-                                }
-                        }
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-        private boolean isAssignableType(String assignmentType){

trunk/core/src/net/project/view/pages/assignments/MyAssignments.java

@@ -15 +15 @@
-import net.project.business.BusinessSpace;
-import net.project.business.BusinessSpaceFinder;
+import net.project.channel.ScopeType;
-import net.project.hibernate.constants.WeblogConstants;
-import net.project.hibernate.model.PnObjectType;
@@ -27 +28 @@
-import net.project.hibernate.service.ServiceFactory;
-import net.project.persistence.PersistenceException;
+import net.project.resource.PersonProperty;
-import net.project.security.SessionManager;
-import net.project.space.Space;
@@ -129 +131 @@
-        private String userId;
-        
+        private final String COLUMN_PROPERTY_CONTEXT = "net.project.column.MyProject";
+        
+        private static final String PROPERTY = "MyAssignmentscolumn";
+        
+        private String myAssignmentsColumn;
+
+        
-        private enum AssignmentsAction {
-
+, REPLACEMYASSIGNMENTCOLUMN
-        }
-        
@@ -136 +145 @@
-                GET_TIME_SHEET_ENTRIES, UPDATE_TIME_SHEET_ENTRIES, GET_TIME_VALUES_ARRAY, SUBMIT_TIME_SHEET_ENTRIES, GET_ERROR_MESSAGE
-        }
-
+
-        /**
-         * 
@@ -160 +169 @@
-                createUserBusinessOptionsString();
-                createUserProjectOptionsString();
+                initializeMyAssignmentsColumn();
-        }
-
@@ -186 +196 @@
-                                                .getParameter("view") : "indent");
-                        }
-
+else 
-                                setAllFilterParameter(request);
-                        }
-
+else 
-                                return getAssignmentTreeData();
-                        }                       
-
+else 
-                                String assignmentId = request.getParameter("assignmentId");
-                                if (assignmentId != null) {
@@ -198 +208 @@
-                                }
-                        }
+                        else if (action.equalsIgnoreCase(AssignmentsAction.REPLACEMYASSIGNMENTCOLUMN.toString())) {
+                                replaceMyAssignmentsColumn(request); 
+                        }
+                        
-                        // Action To generate the time sheet enteries from database ,if exist
-                        // otherwise generate a blank time sheet div for js and return
@@ -460 +474 @@
-                                && request.getParameter("inProgress").equals("true"));
-        }
+        
+        private void initializeMyAssignmentsColumn(){
+                String columns[] = {"objectName","workSpace","dueDate","workRemaining","objectId","objectType","assigneeName","assignorName"};
+                myAssignmentsColumn = "[{"; 
+                for(String column : columns){
+                        if(!myAssignmentsColumn.equals("[{")){
+                                myAssignmentsColumn += ",";
+                        }
+                        myAssignmentsColumn += "'" + column + "' : "+getColumnValue(column);
+                }
+                myAssignmentsColumn += "}]";
+        }
+        
+        private String getColumnValue(String column){
+                PersonProperty personProperty = new PersonProperty();
+                personProperty.setScope(ScopeType.GLOBAL.makeScope(SessionManager.getUser()));
+                return (personProperty.get(COLUMN_PROPERTY_CONTEXT + "_" + column, PROPERTY) != null 
+                                && personProperty.get(COLUMN_PROPERTY_CONTEXT + "_" + column, PROPERTY).length > 0 
+                                ? personProperty.get(COLUMN_PROPERTY_CONTEXT + "_" + column, PROPERTY)[0] : "null"); 
+        }
+        
+        private void replaceMyAssignmentsColumn(HttpServletRequest request) {
+                String column = request.getParameter("column"); 
+                String value = request.getParameter("value");
+                
+                if (StringUtils.isNotEmpty(column) && StringUtils.isNotEmpty(value)) {
+                        PersonProperty personProperty = new PersonProperty();
+                        try {
+                                personProperty.setScope(ScopeType.GLOBAL.makeScope(SessionManager.getUser()));
+                                personProperty.removeAllValues(COLUMN_PROPERTY_CONTEXT + "_" + column, PROPERTY);
+                                personProperty.put(COLUMN_PROPERTY_CONTEXT + "_" + column, PROPERTY, value);
+                        } catch (PersistenceException pnetEx) {
+                                pnetEx.printStackTrace();
+                        }
+                }
+        }
-
-        /**
@@ -763 +813 @@
-        }
-
+        /**
+         * @return the myAssignmentsColumn
+         */
+        public String getMyAssignmentsColumn() {
+                return myAssignmentsColumn;
+        }
+
+        /**
+         * @param myAssignmentsColumn the myAssignmentsColumn to set
+         */
+        public void setMyAssignmentsColumn(String myAssignmentsColumn) {
+                this.myAssignmentsColumn = myAssignmentsColumn;
+        }
+
-}

trunk/core/web/html/assignments/MyAssignments.html

@@ -47 +47 @@
-        var validationMessageForBlogComment = '${validationMessageForBlogComment}';
-        var noSelectionErrMes = 'Please select a node from tree before posting a blog entry.';
-a
+A
-        var projectOptionsData = ${projectOptionsString};
-        var businessOptionsData = ${businessOptionsString};
-        var treeViewParamerer ='${treeViewParamerer}';
+        var myAssignmentsColumn = ${myAssignmentsColumn};
-        
-        // About Timeline

trunk/core/web/src/components/myAssignment-treeGrid.js

@@ -45 +45 @@
-                        columns: [
-                                {id:'objectName', header: "Assignment Name", width: 310, sortable: true, dataIndex: 'objectName'},
-
-
+
+
+
-                        {id:'workRemaining', header: "Work Remaining", renderer: rederWorkRemaining, width: 95, sortable: true, dataIndex: 'workRemaining'},
-                        {id:'objectId', header: "ID", hidden: true, dataIndex: 'objectId'},
-                        {id:'objectType', header: "Type", hidden: true, sortable: true, dataIndex: 'objectType'},
-                        {id:'assigneeName', header: "Assignee", renderer: removeNull, hidden: true, sortable: true, dataIndex: 'assigneeName'},
-
+
+
+
-                    ],
-                        stripeRows: true,
@@ -78 +79 @@
-                                       handler : function(){
-                                                        if(collapsed){
-
+       
-                                                        }else {
-
+       
-                                                        }
-                                        }

trunk/core/web/src/components/myAssignments-dashboard.js

@@ -9 +9 @@
-var windowHeight = 0;
-var selectedTask;
-
+
+
-Ext.onReady(function(){
-        Ext.QuickTips.init();
@@ -15 +16 @@
-        
-        getWindowHeightWidth();
+        
-        blogPanel = new Ext.Panel({
-        id: 'blog',
@@ -62 +64 @@
-
-     assignmentPanel.render('assignmentPanelPosition');
-
+
+
-         initializeToggleButtons();
-
+
+
+
-         filterForm.on('expand',function(panel){
-                assignmentTreeGrid.setHeight(windowHeight-406);
@@ -72 +77 @@
-                assignmentTreeGrid.setHeight(windowHeight-175);
-         });
+
+        assignmentTreeGrid.addListener('rowdblclick', function(grid, rowIndex, e){
+                assignmentTreeNodeId = grid.getStore().getAt(rowIndex).get('objectId');
+                objectType=grid.getStore().getAt(rowIndex).get('objectType');
+                selectedTask=grid.getStore().getAt(rowIndex).get('objectName');
+                if(objectType.toString() == 'project'){
+                        extAlert('Error', 'Selected object is not an assignment, Please select an assignment to view detail.', Ext.MessageBox.ERROR);
+                } else{
+                window.location.href = JSPRootURL+'/servlet/AssignmentController/View?module='+moduleId+'&objectID='+assignmentTreeNodeId+'&personID='+userId +'&returnTo=/assignments/My?module='+moduleId;
+                }
+        });
+        
+        assignmentTreeGrid.addListener('rowclick', function(grid, rowIndex, e){
+                assignmentTreeNodeId = grid.getStore().getAt(rowIndex).get('objectId');
+                objectType=grid.getStore().getAt(rowIndex).get('objectType');
+                selectedTask=grid.getStore().getAt(rowIndex).get('objectName');
+                loadBlogEntriesForAssignment();
+        });
+        
+        assignmentTreeGrid.getColumnModel().addListener('hiddenchange', replaceMyAssignmentColumn);
+        
+        //-------------- Widget resizeing on browser window resize ------------
-        
-        window.onresize = resizeGrid;
@@ -83 +110 @@
-                   }catch(err){}
-        }
-
-        assignmentTreeGrid.addListener('rowdblclick', function(grid, rowIndex, e){
-                assignmentTreeNodeId = grid.getStore().getAt(rowIndex).get('objectId');
-                objectType=grid.getStore().getAt(rowIndex).get('objectType');
-                selectedTask=grid.getStore().getAt(rowIndex).get('objectName');
-                if(objectType.toString() == 'project'){
-                        extAlert('Error', 'Selected object is not an assignment, Please select an assignment to view detail.', Ext.MessageBox.ERROR);
-                } else{
-                window.location.href = JSPRootURL+'/servlet/AssignmentController/View?module='+moduleId+'&objectID='+assignmentTreeNodeId+'&personID='+userId +'&returnTo=/assignments/My?module='+moduleId;
-                }
-        });
-        
-        assignmentTreeGrid.addListener('rowclick', function(grid, rowIndex, e){
-                assignmentTreeNodeId = grid.getStore().getAt(rowIndex).get('objectId');
-                objectType=grid.getStore().getAt(rowIndex).get('objectType');
-                selectedTask=grid.getStore().getAt(rowIndex).get('objectName');
-                loadBlogEntriesForAssignment();
-        });
-});
-
-
-
@@ -182 +190 @@
-                                assignmentTreeGrid.getStore().reload();
-                                assignmentTreeGrid.getView().refresh();
-initializeProjectColumn();
+personalizeAssignmentColumn()
-                                toggleExpandCollapse.setIconClass('expandall-icon');
-                   },
@@ -201 +209 @@
-}
-
-function initializeProjectColumn(){
-        var hide = true;
-        if(treeViewParamerer == 'flat'){
-                hide = false;
-        }
-        var cm = assignmentTreeGrid.getColumnModel();
-        var count = cm.getColumnCount();
-        for(var i = 0; i < count; i++){
-        if('workSpace' == cm.getDataIndex(i)) {
-            cm.setHidden(i, hide);
-                 break;
-         }
-      }
-}
-
-function initializeToggleButtons(){
-        if(collapsed){
@@ -231 +224 @@
-}
-
+function replaceMyAssignmentColumn(thisColumnModel, columnIndex ,hidden){
+        var     value = 1 
+        if(hidden){
+                value = 0;
+        }
+        Ext.Ajax.request({
+                url: JSPRootURL+'/assignments/My/replaceMyAssignmentColumn',
+                params: {module: moduleId , column : thisColumnModel.getDataIndex(columnIndex), value: value},
+                method: 'POST',
+                success: function(result, request){
+                        myColumnViewRecord.set(thisColumnModel.getDataIndex(columnIndex), value);
+                },
+                failure: function(result, response){
+                        extAlert('Error', 'Server request failed please try again...', Ext.MessageBox.ERROR);
+                }
+        });
+}
+
+function personalizeAssignmentColumn(){
+        var cm = assignmentTreeGrid.getColumnModel();
+        var count = cm.getColumnCount();
+        for(var i = 0; i < count; i++){
+                cm.setHidden(i, getBoolean(cm.getDataIndex(i)));
+    }
+}
+
+function getBoolean(column){
+        value = myColumnViewRecord.get(column);
+        if(value == '0'){
+                return true;
+        } else if(value == '1'){
+                return false;
+        } else {
+                if(column == 'objectName'){
+                        return false;
+                }
+                else if(column == 'dueDate'){
+                        return false;
+                }
+                else if(column == 'workRemaining'){
+                        return false;
+                }
+                else if(column == 'workSpace' && treeViewParamerer == 'flat' ){
+                        return false;
+                } else{
+                        return true;
+                }
+        }
+}
+function initializeMyColumnViewRecord(){
+        var columnStore = new Ext.data.Store({
+                                autoLoad : true,
+                                reader: new Ext.data.JsonReader({id: '_id'},
+                                 Ext.data.Record.create([
+                                                {name: 'objectName'},
+                                                {name: 'workSpace'},
+                                        {name: 'dueDate'},
+                                        {name: 'workRemaining'},
+                                        {name: 'objectId'},
+                                        {name: 'objectType'},
+                                        {name: 'assigneeName'},
+                                        {name: 'assignorName'},
+                                        ])
+                                 ),
+                    data: myAssignmentsColumn
+           });
+           myColumnViewRecord = columnStore.getAt(0);
+}
-
-function getWindowHeightWidth(){