Changeset 17932

Timestamp:

08/22/08 13:48:54 (3 months ago)

Author:

ritesh

Message:

Paging in Assignment(Beta) for tree view and flat view.

Files:

• trunk/core/db/oracle/create-scripts/versions/8.5.0/update_system_properties.sql (modified) (1 diff)
• trunk/core/src/net/project/hibernate/dao/IPnAssignmentDAO.java (modified) (1 diff)
• trunk/core/src/net/project/hibernate/dao/impl/PnAssignmentDAOImpl.java (modified) (4 diffs)
• trunk/core/src/net/project/hibernate/model/PnAssignment.java (modified) (4 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) (16 diffs)
• trunk/core/web/html/assignments/MyAssignments.html (modified) (2 diffs)
• trunk/core/web/src/components/BaseTreeGrid.js (added)
• trunk/core/web/src/components/myAssignment-treeGrid.js (modified) (4 diffs)
• trunk/core/web/src/components/myAssignmentFilter-form.js (modified) (1 diff)
• trunk/core/web/src/components/myAssignments-dashboard.js (modified) (5 diffs)

trunk/core/db/oracle/create-scripts/versions/8.5.0/update_system_properties.sql

@@ -248 +248 @@
-values (2000,'en','text','prm.wiki.edit.describe.label','Edit summary (describe the changes you have made):','','A',0,1);
-
+insert into PN_PROPERTY (CONTEXT_ID, LANGUAGE, PROPERTY_TYPE, PROPERTY, PROPERTY_VALUE, RECORD_STATUS, IS_SYSTEM_PROPERTY, IS_TRANSLATABLE_PROPERTY, PROPERTY_VALUE_CLOB)
+values (2000, 'en', 'text', 'prm.personal.assignments.defaultpagesize.value', '50', 'A', 0, 1, null);
+
-commit;
-prompt 0 records loaded

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

@@ -83 +83 @@
-                Date endDate,
-                Integer statusId,
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                String PercentCompleteComparator,
-                String assignmentName,

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

@@ -713 +713 @@
-                Date endDate,
-                Integer statusId,
-Integer
+Double
-                String PercentCompleteComparator,
-                String assignmentName,
-
+
+
+
-    ){
-        List<PnAssignment> assignments = new ArrayList<PnAssignment>();         
-
-
+
+
+
-                                        +" a.comp_id.spaceId, on1.name, "
-                                        +" o2.pnObjectType.objectType, " 
-                                        +" a.work, a.workUnits, a.workComplete, a.startDate, a.endDate, a.percentAllocated," 
-
-, " 
-        
+ 
+ left join  a.pnAssignor assignor, "
+               
-                                +" PnObjectName on1, PnObjectName on2, " 
-1
+
-                                        +" WHERE o1.objectId = a.comp_id.spaceId "
-                                        +" AND o2.objectId = a.comp_id.objectId "
@@ -736 +739 @@
-                                        +" AND o1.recordStatus = 'A' "
-                                        +" AND o2.recordStatus = 'A' "
-1
+
-
-                if(assigneeORAssignor.equalsIgnoreCase("assignor")){//assignor Assignment
@@ -865 +868 @@
-                        
-                        if (percentComplete != null && PercentCompleteComparator != null) {
-Integer
+Double
-                        }
-                        
@@ -875 +878 @@
-                                }
-                        }
+                        if(offset != 0){
+                                query.setFirstResult(offset);
+                        }
+                        if(range != 0){
+                                query.setMaxResults(range);
+                        }
-                        assignments = query.list();
-                } catch (Exception e) {
-resource assignment details
+person Assignment
-                }
-                return assignments;     
-    }
+    
+    public Integer getTotalAssignmentCountWithFilters(
+                Integer personId,
+                String assigneeORAssignor,
+                Integer[] projectIds,
+                Integer businessId,
+                String[] assignmentTypes,
+                boolean lateAssignment,
+                boolean comingDueDate,
+                boolean shouldHaveStart,
+                boolean inProgress,
+                Date startDate,
+                Date endDate,
+                Integer statusId,
+                Double percentComplete,
+                String PercentCompleteComparator,
+                String assignmentName,
+                String assignmentNameComparator
+    ){
+                Integer nAssignment = 0;
+        String sql = " SELECT count(a.comp_id.objectId) "
+                                        +" FROM PnAssignment a left join  a.pnAssignor assignor, "
+                                        +" PnObject o1, PnObject o2, " 
+                                +" PnObjectName on1, PnObjectName on2, " 
+                                +" PnPerson p "
+                                        +" WHERE o1.objectId = a.comp_id.spaceId "
+                                        +" AND o2.objectId = a.comp_id.objectId "
+                                        +" AND on1.objectId = a.comp_id.spaceId "
+                                        +" AND on2.objectId = a.comp_id.objectId "
+                                        +" AND a.recordStatus = 'A' " 
+                                        +" AND o1.recordStatus = 'A' "
+                                        +" AND o2.recordStatus = 'A' "
+                                        +" AND p.personId = a.comp_id.personId ";
+
+                if(assigneeORAssignor.equalsIgnoreCase("assignor")){//assignor Assignment
+                        sql += " AND a.pnAssignor.personId = :personId ";
+                        
+                } else if(assigneeORAssignor.equalsIgnoreCase("assignee")){//resource Assignment 
+                        sql += " AND a.comp_id.personId = :personId ";                                  
+                } else {
+                        sql += " AND( a.pnAssignor.personId = :personId OR a.comp_id.personId = :personId )";
+                }
+                
+                //project ids clause
+                if(projectIds != null){
+                        sql += " AND a.comp_id.spaceId IN( :projectIds )";
+                }
+                
+                if(businessId != null){
+                        sql += " AND a.comp_id.spaceId 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){
+                        sql += " AND o2.pnObjectType.objectType IN( :assignmentTypes )";
+                }
+ 
+                if(lateAssignment){
+                        sql += " AND ((a.percentComplete is null) OR " 
+                            +" (a.endDate <  :toDayDate AND " 
+                            +" (a.percentComplete < 1))) ";
+                }
+ 
+                if(comingDueDate){
+                        sql += " AND ((a.endDate <= :toDayDatePlus7 ) AND (a.endDate >= :toDayDate))";
+                }
+                
+                if(shouldHaveStart){
+                        sql += " AND ((a.percentComplete is null) OR " 
+                            +" (a.startDate <=  :toDayDate AND " 
+                            +" (a.percentComplete = 0))) ";
+                }
+                
+                if(inProgress){
+                        sql += " AND (a.percentComplete > 0 and a.percentComplete < 1)";
+                }
+
+                if(startDate != null && endDate != null){
+                        if(startDate.equals(endDate)){
+                                sql += " AND a.startDate <= :startDate ";
+                                sql += " AND a.endDate >= :endDate ";
+                        } else {
+                                sql += " AND ( a.startDate between :startDate and :endDate ";
+                                sql += " or a.endDate between :startDate and :endDate ) ";
+                        }
+                }
+                
+                if(statusId != null){
+                        sql += " AND a.statusId = :statusId";
+                }
+                
+                if( percentComplete!=null && PercentCompleteComparator != null){
+                        if(PercentCompleteComparator.equalsIgnoreCase("equals")){
+                                sql += " AND a.percentComplete = :percentComplete ";
+                        }
+                        if(PercentCompleteComparator.equalsIgnoreCase("notequals")){
+                                sql += " AND a.percentComplete != :percentComplete ";
+                        }
+                        if(PercentCompleteComparator.equalsIgnoreCase("lessthan")){
+                                sql += " AND a.percentComplete < :percentComplete ";    
+                        }
+                        if(PercentCompleteComparator.equalsIgnoreCase("greaterthan")){
+                                sql += " AND a.percentComplete > :percentComplete ";    
+                        }
+                }
+                if( assignmentName!=null && assignmentNameComparator != null){
+                        if(assignmentNameComparator.equalsIgnoreCase("equals")){
+                                sql += " AND on2.name = :assignmentName ";
+                        }
+                        if(assignmentNameComparator.equalsIgnoreCase("notequals")){
+                                sql += " AND on2.name != :assignmentName ";
+                        }
+                        if(assignmentNameComparator.equalsIgnoreCase("contains")){
+                                sql += " AND upper(on2.name) like upper(:assignmentName) ";     
+                        }
+                }
+                
+                sql += " ORDER BY on1.name , a.comp_id.spaceId ";
+                
+                try{
+                        Query query = getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery(sql);
+                        query.setInteger("personId", personId);
+                        
+                        if (projectIds != null) {
+                                query.setParameterList("projectIds", projectIds);
+                        }
+                        
+                        if(businessId != null){
+                                query.setParameter("businessId", businessId);
+                        }
+
+                        if (assignmentTypes != null) {
+                                query.setParameterList("assignmentTypes", assignmentTypes);
+                        }
+
+                        if (lateAssignment || comingDueDate || shouldHaveStart) {
+                                query.setDate("toDayDate", new Date());
+                        }
+
+                        if (comingDueDate) {
+                                Calendar cal = Calendar.getInstance();
+                                cal.add(Calendar.DATE, 8);
+                                query.setDate("toDayDatePlus7", cal.getTime());
+                        }
+
+                        if (startDate != null) {
+                                query.setDate("startDate", startDate);
+                        }
+
+                        if (endDate != null) {
+                                query.setDate("endDate", endDate);
+                        }
+
+                        if (statusId != null) {
+                                query.setInteger("statusId", statusId);
+                        }
+                        
+                        if (percentComplete != null && PercentCompleteComparator != null) {
+                                query.setDouble("percentComplete", percentComplete);
+                        }
+                        
+                        if (assignmentName != null && assignmentNameComparator != null) {
+                                if (assignmentNameComparator.equalsIgnoreCase("contains")) {
+                                        query.setParameter("assignmentName", "%" + assignmentName + "%");
+                                } else {
+                                        query.setParameter("assignmentName", assignmentName);
+                                }
+                        }
+                        nAssignment = Integer.parseInt(query.uniqueResult().toString());
+                
+                } catch (Exception e) {
+                        log.error("Error occured while getting count of Assignment "+e.getMessage());                   
+                }
+                return nAssignment;     
+    }
-
-}

trunk/core/src/net/project/hibernate/model/PnAssignment.java

@@ -102 +102 @@
-        
-        private net.project.hibernate.model.PnObjectType pnObjectType;
-        
-        private String assignorName;
-        
-        private net.project.hibernate.model.PnObjectName pnObjectName;
@@ -233 +231 @@
-            Integer percentAllocated, 
-            Integer assignmentId,
- 
+
-        this.personName = personName;
-
+
+
-        PnProjectSpace pnProjectSpace = new PnProjectSpace(projectId, projectName);
-        this.pnProjectSpace = pnProjectSpace;
@@ -644 +643 @@
-
-        /**
-         * @return the assignorName
-         */
-        public String getAssignorName() {
-                return assignorName;
-        }
-
-        /**
-         * @param assignorName the assignorName to set
-         */
-        public void setAssignorName(String assignorName) {
-                this.assignorName = assignorName;
-        }
-
-        /**
-         * @return the pnObjectName
-         */
@@ -670 +655 @@
-                this.pnObjectName = pnObjectName;
-        }
-        
-                
-
-}

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

@@ -59 +59 @@
-    public List<Assignment> getAssigmentsByAssignor(Integer assignorId);
-    
+    public Integer getTotalAssignmentCountWithFilters(
+                Integer personId,
+                String assigneeORAssignor,
+                Integer[] projectIds,
+                Integer businessId,
+                String[] assignmentTypes,
+                boolean lateAssignment,
+                boolean comingDueDate,
+                boolean shouldHaveStart,
+                boolean InProgress,
+                Date startDate,
+                Date endDate,
+                Integer statusId,
+                Double percentComplete,
+                String PercentCompleteComparator,
+                String assignmentName,
+                String assignmentNameComparator
+    );
+    
-    public String getAssignmentsTreeData(
-                Integer personId,
@@ -72 +91 @@
-                Date endDate,
-                Integer statusId,
-Integer
+Double
-                String PercentCompleteComparator,
-                String assignmentName,
-                String assignmentNameComparator,
-                DateFormat userDateFormat,
-
+
+
+
-    );
-    

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

@@ -665 +665 @@
-    }
-    
+    public Integer getTotalAssignmentCountWithFilters(
+                Integer personId,
+                String assigneeORAssignor,
+                Integer[] projectIds,
+                Integer businessId,
+                String[] assignmentTypes,
+                boolean lateAssignment,
+                boolean comingDueDate,
+                boolean shouldHaveStart,
+                boolean InProgress,
+                Date startDate,
+                Date endDate,
+                Integer statusId,
+                Double percentComplete,
+                String PercentCompleteComparator,
+                String assignmentName,
+                String assignmentNameComparator
+    ) {
+        return pnAssignmentDAO.getTotalAssignmentCountWithFilters(personId, assigneeORAssignor, projectIds, businessId,
+                                assignmentTypes, lateAssignment, comingDueDate, shouldHaveStart, InProgress, startDate, endDate,
+                                statusId, percentComplete, PercentCompleteComparator, assignmentName, assignmentNameComparator);
+        }
+    
-    public String getAssignmentsTreeData(
-                Integer personId,
@@ -678 +701 @@
-                Date endDate,
-                Integer statusId,
-Integer
+Double
-                String PercentCompleteComparator,
-                String assignmentName,
-                String assignmentNameComparator,
-                DateFormat userDateFormat,
-
+
+
+
-    ) {
-       
+    
-                                        projectIds, businessId, assignmentTypes, lateAssignment, comingDueDate, shouldHaveStart,
-                                        InProgress, startDate, endDate, statusId, percentComplete, PercentCompleteComparator,
-), userDateFormat, treeViewParamer
+, offset, range), userDateFormat, assignmentViewParamet
-        }
-        
@@ -707 +732 @@
-        }
-
-treeViewParamer
-        
+assignmentViewParamet
+               
-        columns.add("objectId");
-        columns.add("objectName");
@@ -725 +750 @@
-                        for (PnAssignment assignment : assignments) {
-                                if (isAssignableType(assignment.getPnObjectType().getObjectType())) {
-treeViewParamer
+assignmentViewParamet
-                                                parentNode = factory.nextNode();
-                                                parentNode.set("objectId", assignment.getPnProjectSpace().getProjectId());
@@ -744 +769 @@
-                                                        .getWorkComplete(), assignment.getWorkUnits()));
-                                        childNode.set("workSpace", assignment.getPnProjectSpace().getProjectName().replaceAll("'", "´"));
-Assignor
-Assignor
+PnAssignor().getDisplay
+PnAssignor().getDisplay
-                                        childNode.set("assigneeName", assignment.getPersonName().replaceAll("'", "´"));
-                                        if(parentNode!= null){
@@ -774 +799 @@
-            json.deleteCharAt(json.length()-1);
-        }
-"[" + json.toString() + "]"
+json.toString()
-    }
-        

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

@@ -23 +23 @@
-import net.project.hibernate.model.PnWeblogEntry;
-import net.project.hibernate.service.IBlogProvider;
+import net.project.hibernate.service.IPnAssignmentService;
-import net.project.hibernate.service.IPnAssignmentWorkService;
-import net.project.hibernate.service.IPnObjectTypeService;
@@ -84 +85 @@
-
-        @Persist
-
+ = new String [5] 
-
-        @Persist
@@ -108 +109 @@
-
-        @Persist
-Integer
+Double
-
-        @Persist
@@ -126 +127 @@
-        
-        @Persist
-treeViewParamer
+assignmentViewParamet
-        
-        @Persist
-        private String userId;
-        
-Project
-
-c
+Assignments
+
+C
-        
-        private String myAssignmentsColumn;
-
+
+
+
+
+
+
+
+
-        
-        private enum AssignmentsAction {
@@ -158 +166 @@
-                        validationMessageForBlogEntry = PropertyProvider.get("prm.blog.addweblogentry.validation.message");
-                        validationMessageForBlogComment = PropertyProvider.get("prm.blog.addweblogentrycomment.validation.message");
+                        defaultPageSize = PropertyProvider.get("prm.personal.assignments.defaultpagesize.value");
+                        pnAssignmentService = ServiceFactory.getInstance().getPnAssignmentService();
+                        
+                        //initializing defaut parameter for getting assignment data.
-                        assigneeOrAssignorParameter = "assignee";
-
+
+
+
+
+
-                } catch (Exception e) {
-                        log.error("Error occured while getting property tokens : " + e.getMessage());
@@ -169 +185 @@
-                createUserBusinessOptionsString();
-                createUserProjectOptionsString();
+                initializeMyTotalAssignmentsCount();
-                initializeMyAssignmentsColumn();
-        }
@@ -193 +210 @@
-                if (action != null) {
-                        if (action.equalsIgnoreCase(AssignmentsAction.SETVIEWPARAMETER.toString())) {
-TreeViewParamer
+AssignmentViewParamet
-                                                .getParameter("view") : "indent");
-                        }
-                        else if (action.equalsIgnoreCase(AssignmentsAction.SETFILTERPARAMETER.toString())) {
-                                setAllFilterParameter(request);
+                                initializeMyTotalAssignmentsCount();
-                        }
-                        else if (action.equalsIgnoreCase(AssignmentsAction.GETASSIGNMENTSTREEDATA.toString())) {
-
+request
-                        }                       
-                        else if (action.equalsIgnoreCase((AssignmentsAction.LOADBLOGENTRIES).toString())) {
@@ -256 +274 @@
-        }
-        
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        
@@ -446 +473 @@
-                if (StringUtils.isNotEmpty(request.getParameter("percentComplete"))
-                                && StringUtils.isNotEmpty(request.getParameter("percentCompleteComparator"))) {
-
+/100.0
-                        percentCompleteComparator = request.getParameter("percentCompleteComparator");
-                } else {
@@ -475 +502 @@
-        }
-        
+        private void initializeMyTotalAssignmentsCount() {
+                totalAssignment = pnAssignmentService.getTotalAssignmentCountWithFilters(Integer.parseInt(SessionManager
+                                .getUser().getID()), assigneeOrAssignorParameter, projectIds, businessId, assignmentTypes,
+                                lateAssignment, comingDueDate, shouldHaveStart, inProgress, startDate, endDate, statusId,
+                                percentComplete, percentCompleteComparator, assignmentName, assignmentNameComparator);
+        }
+        
-        private void initializeMyAssignmentsColumn(){
-                String columns[] = {"objectName","workSpace","dueDate","workRemaining","objectId","objectType","assigneeName","assignorName"};
-
+
+
+
+
-                for(String column : columns){
-                        if(!myAssignmentsColumn.equals("[{")){
-                                myAssignmentsColumn += ",";
-                        }
-
+, personProperty
-                }
-                myAssignmentsColumn += "}]";
-        }
-        
-
-
-
+
-                return (personProperty.get(COLUMN_PROPERTY_CONTEXT + "_" + column, PROPERTY) != null 
-                                && personProperty.get(COLUMN_PROPERTY_CONTEXT + "_" + column, PROPERTY).length > 0 
@@ -501 +536 @@
-                if (StringUtils.isNotEmpty(column) && StringUtils.isNotEmpty(value)) {
-                        PersonProperty personProperty = new PersonProperty();
+                        personProperty.setScope(ScopeType.GLOBAL.makeScope(SessionManager.getUser()));
-                        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) {
-
+
+
-                        }
-                }
@@ -655 +691 @@
-         * @return the percentComplete
-         */
-Integer
+Double
-                return percentComplete;
-        }
@@ -662 +698 @@
-         * @param percentComplete the percentComplete to set
-         */
-Integer
+Double
-                this.percentComplete = percentComplete;
-        }
@@ -788 +824 @@
-         * @return the treeViewParamerer
-         */
-TreeViewParamer
-treeViewParamer
+AssignmentViewParamet
+assignmentViewParamet
-        }
-
@@ -795 +831 @@
-         * @param treeViewParamerer the treeViewParamerer to set
-         */
-TreeViewParamerer(String treeViewParamer
-treeViewParamerer = treeViewParamer
+AssignmentViewParameter(String assignmentViewParamet
+assignmentViewParameter = assignmentViewParamet
-        }
-
@@ -827 +863 @@
-        }
-
+        /**
+         * @return the defaultPageSize
+         */
+        public String getDefaultPageSize() {
+                return defaultPageSize;
+        }
+
+        /**
+         * @param defaultPageSize the defaultPageSize to set
+         */
+        public void setDefaultPageSize(String defaultPageSize) {
+                this.defaultPageSize = defaultPageSize;
+        }
+
+        /**
+         * @return the totalAssignment
+         */
+        public Integer getTotalAssignment() {
+                return totalAssignment;
+        }
+
+        /**
+         * @param totalAssignment the totalAssignment to set
+         */
+        public void setTotalAssignment(Integer totalAssignment) {
+                this.totalAssignment = totalAssignment;
+        }
+
-}

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

@@ -50 +50 @@
-        var projectOptionsData = ${projectOptionsString};