Changeset 17838

Timestamp:

08/06/08 10:42:49 (2 months ago)

Author:

ritesh

Message:

Added additional filtering conditions
sorting, resizing and hiding column facility in tree view.

Files:

• trunk/core/src/net/project/hibernate/dao/IPnAssignmentDAO.java (modified) (1 diff)
• trunk/core/src/net/project/hibernate/dao/impl/PnAssignmentDAOImpl.java (modified) (3 diffs)
• trunk/core/src/net/project/hibernate/service/IPnAssignmentService.java (modified) (2 diffs)
• trunk/core/src/net/project/hibernate/service/impl/PnAssignmentServiceImpl.java (modified) (6 diffs)
• trunk/core/src/net/project/view/pages/assignments/MyAssignments.java (modified) (9 diffs)
• trunk/core/web/css/editable-column-tree.css (deleted)
• trunk/core/web/html/assignments/MyAssignments.html (modified) (3 diffs)
• trunk/core/web/images/default/tree/stree (added)
• trunk/core/web/images/default/tree/stree/elbow-end-minus-nl.gif (added)
• trunk/core/web/images/default/tree/stree/elbow-end-minus.gif (added)
• trunk/core/web/images/default/tree/stree/elbow-end-plus-nl.gif (added)
• trunk/core/web/images/default/tree/stree/elbow-end-plus.gif (added)
• trunk/core/web/images/default/tree/stree/elbow-end.gif (added)
• trunk/core/web/images/default/tree/stree/elbow-line.gif (added)
• trunk/core/web/images/default/tree/stree/elbow-minus-nl.gif (added)
• trunk/core/web/images/default/tree/stree/elbow-minus.gif (added)
• trunk/core/web/images/default/tree/stree/elbow-plus-nl.gif (added)
• trunk/core/web/images/default/tree/stree/elbow-plus.gif (added)
• trunk/core/web/images/default/tree/stree/elbow.gif (added)
• trunk/core/web/src/components/myAssignment-treeGrid.js (added)
• trunk/core/web/src/components/myAssignmentFilter-form.js (modified) (4 diffs)
• trunk/core/web/src/components/myAssignments-columnNodeUI.js (deleted)
• trunk/core/web/src/components/myAssignments-dashboard.js (modified) (6 diffs)

trunk/core/src/net/project/hibernate/dao/IPnAssignmentDAO.java

@@ -74 +74 @@
-                boolean assignor,
-                Integer[] projectIds,
+                Integer businessId,
-                String[] assignmentTypes,
-                boolean lateAssignment,

trunk/core/src/net/project/hibernate/dao/impl/PnAssignmentDAOImpl.java

@@ -702 +702 @@
-                boolean assignor,
-                Integer[] projectIds,
+                Integer businessId,
-                String[] assignmentTypes,
-                boolean lateAssignment,
@@ -740 +741 @@
-                        sql += " AND ps.projectId IN( :projectIds )";
-                }
+                
+                if(businessId != null){
+                        sql += " AND ps.projectId IN("
+                                +" select distinct shs.comp_id.childSpaceId from PnSpaceHasSpace shs " 
+                                +" where shs.parentSpaceType = 'business' "
+                                +" and  shs.comp_id.parentSpaceId = :businessId and shs.recordStatus = 'A')";
+                }
+                
-                //Assignment type clause
-                if(assignmentTypes != null){
@@ -815 +824 @@
-                                query.setParameterList("projectIds", projectIds);
-                        }
+                        
+                        if(businessId != null){
+                                query.setParameter("businessId", businessId);
+                        }
-
-                        if (assignmentTypes != null) {

trunk/core/src/net/project/hibernate/service/IPnAssignmentService.java

@@ -69 +69 @@
-                boolean assignor,
-                Integer[] projectIds,
+                Integer businessId,
-                String[] assignmentTypes,
-                boolean lateAssignment,
@@ -87 +88 @@
-                boolean assignor,
-                Integer[] projectIds,
+                Integer businessId,
-                String[] assignmentTypes,
-                boolean lateAssignment,

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

@@ -662 +662 @@
-    
-    public String getAssignorAssignmentsTreeData(Integer assignorId, DateFormat userDateFormat){
-createAssignmentsTree
+getTreeGrid
-    }
-    
-    public String getResourceAssignmentsTreeData(Integer resourceId, Integer[] projectIds, Date startDate, Date endDate, DateFormat userDateFormat){
-createAssignmentsTree
+getTreeGrid
-    }
-    
@@ -673 +673 @@
-                boolean assignor,
-                Integer[] projectIds,
+                Integer businessId,
-                String[] assignmentTypes,
-                boolean lateAssignment,
@@ -686 +687 @@
-                String assignmentNameComparator
-    ){
-
+ businessId,
-                        assignmentTypes, lateAssignment, comingDueDate, shouldHaveStart, inProgress, startDate, endDate,
-                        statusId, percentComplete, PercentCompleteComparator, assignmentName, assignmentNameComparator );
@@ -695 +696 @@
-                boolean assignor,
-                Integer[] projectIds,
+                Integer businessId,
-                String[] assignmentTypes,
-                boolean lateAssignment,
@@ -709 +711 @@
-                DateFormat userDateFormat
-    ){
-createAssignmentsTreeData(getAssignmentDetailsWithFilters(personId, assignor, projectIds
+getTreeGridData(getAssignmentDetailsWithFilters(personId, assignor, projectIds, businessId
-                        assignmentTypes, lateAssignment, comingDueDate, shouldHaveStart, InProgress, startDate, endDate,
-                        statusId, percentComplete, PercentCompleteComparator, assignmentName, assignmentNameComparator ), userDateFormat);
-    }
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        private String getWorkRemainingString(Integer work, Integer workComplete, Integer workUnit) {
-                String strWorkRemaining = "";
@@ -829 +776 @@
-        }
-        
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}

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

@@ -13 +13 @@
-import net.project.base.Module;
-import net.project.base.property.PropertyProvider;
+import net.project.business.BusinessSpace;
+import net.project.business.BusinessSpaceFinder;
-import net.project.hibernate.model.PnProjectSpace;
-import net.project.hibernate.model.PnWeblogComment;
@@ -20 +22 @@
-import net.project.hibernate.service.IPnProjectSpaceService;
-import net.project.hibernate.service.ServiceFactory;
+import net.project.persistence.PersistenceException;
-import net.project.security.SessionManager;
-import net.project.space.Space;
@@ -70 +73 @@
-
-        @Persist
+        private Integer businessId;
+        
+        @Persist
-        private Integer[] projectIds;
-
@@ -107 +113 @@
-        @Persist
-        private String assignmentNameComparator;
+        
+        @Persist
+        private String businessOptionsString;
-        
-        @Persist
@@ -129 +138 @@
-        @SetupRender
-        void setValues(){
+                createUserBusinessOptionsString();
-                createUserProjectOptionsString();
-        }
@@ -172 +182 @@
-        public TextStreamResponse getAssignmentTreeData() {
-                IPnAssignmentService pnAssignmentService = ServiceFactory.getInstance().getPnAssignmentService();
-
-
+/json
+businessId, 
-                                comingDueDate, shouldHaveStart, inProgress, startDate, endDate, statusId, percentComplete,
-                                percentCompleteComparator, assignmentName, assignmentNameComparator, userDateFormat));
@@ -231 +241 @@
-        }
-        
+        private void createUserBusinessOptionsString() {
+                businessOptionsString = "[";
+                List<BusinessSpace> businesses = null;
+                BusinessSpaceFinder bFinder = new BusinessSpaceFinder();
+                try {
+                        businesses = bFinder.findByUser(net.project.security.SessionManager.getUser(), "A");
+                } catch (PersistenceException e) {
+                        log.error("Error occured while generating list values for Businesses model: MyAssignments.createUserBusinessOptionsString()");
+                }
+                if (businesses != null && businesses.size() > 0) {
+                        for (BusinessSpace business : businesses) {
+                                if (!businessOptionsString.equals("[")) {
+                                        businessOptionsString += ",";
+                                } else {
+                                        businessOptionsString += "['','All'],";
+                                }
+                                businessOptionsString += "['" + business.getID() + "','" + business.getName() + "']";
+                        }
+                }
+                businessOptionsString += "]";
+        }
+        
-        private void createUserProjectOptionsString(){
-                projectOptionsString = "[";
@@ -259 +291 @@
-                        setAssigneeOrassignorParameter("assignee");
-                }
+                
+                if (StringUtils.isNotEmpty(request.getParameter("business"))) {
+                        businessId = Integer.parseInt(request.getParameter("business"));
+                } else {
+                        businessId = null;
+                }
-
-                if (StringUtils.isNotEmpty(request.getParameter("projects"))) {
@@ -617 +655 @@
-        }
-
+        /**
+         * @return the businessOptionsString
+         */
+        public String getBusinessOptionsString() {
+                return businessOptionsString;
+        }
+
+        /**
+         * @param businessOptionsString the businessOptionsString to set
+         */
+        public void setBusinessOptionsString(String businessOptionsString) {
+                this.businessOptionsString = businessOptionsString;
+        }
+
-}

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

@@ -3 +3 @@
-<t:BlogLayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">   
-<style>
+.x-date-middle {
+    padding-top:2px;padding-bottom:2px;
+    width:130px; /* FF3 */
+}
+.filter-icon {
+    background-image:url(../images/default/search.gif) !important;
+}
+
-html, body {
-        font:normal 12px verdana;
@@ -21 +29 @@
-    }
-  
-
-
-
-
-
+
-        position: absolute;
-left: 0
-z-index: 1
+top: 100px
+left: 185px
-}
-</style>
-tyles/editable-column-tree
+rc/extjs/resources/css/TreeGrid
-        <link rel="stylesheet" type="text/css" href="${jSPRootURL}/styles/Multiselect.css" />
-        
@@ -44 +48 @@
-                var assigneeOrassignorParameter = '${assigneeOrassignorParameter}';
-                var projectOptionsData = ${projectOptionsString};
-
-
-
+
-                
-        </script>               
-
+
+
-        <script type="text/javascript" src="${jSPRootURL}/src/components/Multiselect.js"></script>
-        <script type="text/javascript" src="${jSPRootURL}/src/components/DDView.js"></script>
-        <script type="text/javascript" src="${jSPRootURL}/src/components/myAssignmentFilter-form.js"></script>
+        <script type="text/javascript" src="${jSPRootURL}/src/components/myAssignment-treeGrid.js"></script>
-        <script type="text/javascript" src="${JSPRootURL}/src/components/myAssignments-dashboard.js"></script>
-        <script type="text/javascript" src="${JSPRootURL}/src/blogit.js" />
-
-
+
-        <t:SpaceMainMenu />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        <script type="text/javascript">
-
-
-
+
-        </script>
-</t:BlogLayout>

trunk/core/web/src/components/myAssignmentFilter-form.js

@@ -10 +10 @@
-var percentCompleteComparator;
-var statusFilter;
+var businessCombo;
-
-var allAssignments;
@@ -32 +33 @@
-        labelAlign      : 'left',
-        title           : '<b>Filters</b>',
-3
+5
-        width           : 560,
-        items           : [{            
@@ -141 +142 @@
-                                border : false,                                                                                         
-                                items : [
+                                        businessCombo = new Ext.form.ComboBox({
+                                                store : new Ext.data.SimpleStore({
+                                                        fields :        ['code', 'desc'], 
+                                                        data : businessOptionsData
+                                                }),
+                                                fieldLabel : '<b>Business</b>',
+                                                listClass: 'x-combo-list-small',
+                                                valueField :'code',
+                                                displayField : 'desc',
+                                                editable : false,
+                                                typeAhead : true,
+                                                mode : 'local',
+                                                triggerAction : 'all',
+                                                value : '',
+                                                selectOnFocus : true,
+                                                labelSeparator : ':',
+                                                listWidth : 140,
+                                                width : 100,
+                                                listeners:{'select' : function (thisCombo, record, index){
+                                                        if(thisCombo.value != ''){
+                                                                workSpace.setDisabled(true);
+                                                        }else{
+                                                                workSpace.setDisabled(false);
+                                                        }
+                                                }}
+                                        }),
-                                   assignorOrAssigneeCombo = new Ext.form.ComboBox({
-                                        store: new Ext.data.SimpleStore({
@@ -215 +242 @@
-                                        iconCls : 'filter-icon',
-                                        handler : function(){
-
-
+
+
+
+
-                                                                        statusFilter.getValue(), 
-                                                                        lateAssignment.getValue(),

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

@@ -34 +34 @@
-    });
-    
-    assignmentTree = new Ext.tree.ColumnTree({
-                id: 'assignmentTree',        
-        height: 400,
-        //autoHieght: true,
-        rootVisible: false,
-        autoScroll: true,
-                expandable: true,
-        title: 'Assignments',
-        columns:[{
-            header: '<b>Assignment Name</b>',
-            width: 360,
-            dataIndex: 'objectName'
-        },{
-            header: '<b>Due Date</b>',
-            width: 95,
-            dataIndex: 'dueDate'
-        },{
-            header: '<b>Work Remaining</b>',
-            width: 95,
-            dataIndex: 'workRemaining'
-        },{
-            header: '#',
-            width: 5,
-            dataIndex: 'objectId'
-        }],
-
-        loader: new Ext.tree.TreeLoader({
-                //dataUrl: JSPRootURL+'/src/components/AssignmentsTreeData.json?module=160',
-            dataUrl: JSPRootURL+'/assignments/My/getAssignmentsTreeData?module='+moduleId,
-            uiProviders:{
-                'col': Ext.tree.ColumnNodeUI
-            }
-        }),
-        listeners: {
-                    'dblclick' : function(node, e){
-                        assignmentTreeNodeId = node.attributes.objectId;
-                        blogit();
-                },
-                'expandnode' : function(node, e){
-                        if(!nodeSelect){
-                                assignmentTree.root.childNodes[0].select();
-                                nodeSelect = true;
-                        }
-                },
-                        scope:this
-                },
-                
-        root: new Ext.tree.AsyncTreeNode({
-                                text: 'Assignments'
-                })
-    });
-    
-        var te = new Ext.tree.ColumnTreeEditor(assignmentTree,{
-            //completeOnEnter: true,
-            //autosize: true,
-            //ignoreNoChange: true
-    });
-    
-    assignmentTree.getSelectionModel().on({
-        'beforeselect' : function(sm, node){
-        },
-        'selectionchange' : function(sm, node){
-                if(node != null && !isNaN(node.attributes.objectId)){
-                        assignmentTreeNodeId = node.attributes.objectId;
-                                loadBlogEntriesForAssignment();
-                        }
-        }
-    });
-    
-    var leftPanel = new Ext.TabPanel({
-                                region : 'west',
-                                                deferredRender : false,
-                            activeTab: 0,
-
-
+
+
+
-                            collapsible : true,
-                                    
-                    items:[assignmentTree
-tbar:[ filterForm 
+                               
+        tbar:[ filterForm 
+items:[assignmentTreeGrid
-                        });
-                                
-        var rightPanel = new Ext.TabPanel({
-                                region : 'center',
-                                                deferredRender : false,
-                            activeTab : 0,
-                                   width: '33
-35
+                           width:'31
+42
-                            items:[
-                                        blogPanel,
@@ -133 +64 @@
-                                        }]
-                        });
+        
+        var assignmentPanel = new Ext.Panel({
+            resizable :true,
+            width:810,
+            height:420,
+            layout: 'border',
+            items: [leftPanel, rightPanel,{region:'east', width: 2}]
+        });
+        assignmentPanel.render('assignmentPanelPosition');
+      
+        assignmentTreeGrid.addListener('rowdblclick', function(grid, rowIndex, e){
+                assignmentTreeNodeId = grid.getStore().getAt(rowIndex).get('objectId');
+                blogit();
+        });
+        assignmentTreeGrid.addListener('rowclick', function(grid, rowIndex, e){
+                assignmentTreeNodeId = grid.getStore().getAt(rowIndex).get('objectId');
+                loadBlogEntriesForAssignment();
+        });
+});
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-function loadBlogEntriesForAssignment(){
@@ -192 +103 @@
-}
-
-
+business, 
-        var startDateString = '';
-                var endDateString = '';
@@ -202 +113 @@
-                        endDateString = (endDate.getMonth()+1)+'/'+endDate.getDate()+'/'+endDate.getFullYear()
-                }
-
+
+
+
-        Ext.Ajax.request({
-                   url: JSPRootURL+'/assignments/My/setFilterParameter',
-                   params: {module: moduleId, 
-                                        assigneeOrAssignor: assignorOrAssigneeCombo.value,
+                                        business: business,
-                                        projects: projects,
-                                        assignmentTypes : assignmentTypes,
@@ -224 +138 @@
-                   success: function(result, request){
-                                nodeSelect = false;
-
-
-
+
+
-                   },
-                   failure: function(result, response){
@@ -238 +151 @@
-                blogit();
-        } else{
- assignme
+n assignmen
-                return;
-        }