Changeset 17805

Timestamp:

07/31/08 11:44:25 (1 month ago)

Author:

ritesh

Message:

Some changes related to assignments.

Files:

• trunk/core/src/net/project/hibernate/service/impl/PnAssignmentServiceImpl.java (modified) (2 diffs)
• trunk/core/src/net/project/view/pages/assignments/MyAssignments.java (modified) (10 diffs)
• trunk/core/web/src/components/myAssignmentFilter-form.js (modified) (3 diffs)
• trunk/core/web/src/components/myAssignments-dashboard.js (modified) (5 diffs)

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

@@ -729 +729 @@
-                                        }
-                                        assignmentsTreeData += "{ objectId : '"+ assignment.getPnProjectSpace().getProjectId();
-
+.replaceAll("'", "´")
-                                        assignmentsTreeData += "</b></font>', dueDate : '', workRemaining : '',";               
-                                        assignmentsTreeData += " objectType: 'project', uiProvider : 'col', cls : 'master-task', iconCls : 'project'";
@@ -755 +755 @@
-                                }
-                                assignmentString += "{ objectId : '"+ assignment.getPnTask().getTaskId();
-
+.replaceAll("'", "&acute;")
-                                assignmentString += "', objectType : '" +assignment.getPnObjectType().getObjectType();
-                                //assignmentString += "', startDate : '"+ userDateFormat.formatDate(assignment.getStartDate(), "dd/MM/yyyy") ;

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

@@ -25 +25 @@
-import net.project.util.InvalidDateException;
-
+import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-import org.apache.tapestry.annotations.Inject;
@@ -168 +169 @@
-        }
-
-        /**
-         * @return
-        
-        private TextStreamResponse getAssignedToMeTreeData() {
-                Integer[] projectIds = null;
-                
-                IPnProjectSpaceService pnProjectSpaceService = ServiceFactory.getInstance().getPnProjectSpaceService();
-                List<PnProjectSpace> projects; = pnProjectSpaceService.getProjectsByUserId(Integer.parseInt(SessionManager.getUser().getID()));
-                int index = 0;
-                if(projects != null){
-                        projectIds = new Integer[projects.size()];
-                        for(PnProjectSpace projectSpace : projects){
-                                projectIds[index++] = projectSpace.getProjectId();
-                        }
-                }
-                IPnAssignmentService pnAssignmentService = ServiceFactory.getInstance().getPnAssignmentService();
-                
-                return new TextStreamResponse("text", pnAssignmentService.getResourceAssignmentsTreeData(Integer.parseInt(SessionManager.getUser()
-                                .getID()), projectIds, null, null, userDateFormat));
-        }
-         */
-        
-        public TextStreamResponse getAssignmentTreeData() {
@@ -268 +248 @@
-        }
-        
-
-
-
+
+
+
+
+
+
+
-                        setAssigneeOrassignorParameter("assignor");
-                } else {
-                        setAssignor(false);
-                        setAssigneeOrassignorParameter("assignee");
-                }
-
-request.getParameter("projects") != null && !request.getParameter("projects").equals(""
+StringUtils.isNotEmpty(request.getParameter("projects")
-                        String strProjectIds[] = request.getParameter("projects").split(",");
-                        if (strProjectIds != null && strProjectIds.length > 0) {
@@ -283 +266 @@
-                                int index = 0;
-                                for (String strProjectId : strProjectIds) {
-!strProjectId.equals(""
+StringUtils.isNotEmpty(strProjectId
-                                                projectIds[index++] = Integer.parseInt(strProjectId);
-                                        }
-                                }
-                        }
-
-                } else {
-                        projectIds = null;
-                }
-
-request.getParameter("assignmentTypes") != null && !request.getParameter("assignmentTypes").equals(""
+StringUtils.isNotEmpty(request.getParameter("assignmentTypes")
-                        assignmentTypes = request.getParameter("assignmentTypes").split(",");
-                } else {
@@ -299 +281 @@
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                        try {
-                                startDate = userDateFormat.parseDateString(request.getParameter("startDate"), "MM/dd/yyyy");
-                        } catch (InvalidDateException pnetEx) {
-
+
+
-                        }
-                } else {
@@ -333 +292 @@
-                }
-
-request.getParameter("endDate") != null && !request.getParameter("endDate").equals(""
+StringUtils.isNotEmpty(request.getParameter("endDate")
-                        try {
-                                endDate = userDateFormat.parseDateString(request.getParameter("endDate"), "MM/dd/yyyy");
-                        } catch (InvalidDateException pnetEx) {
-
+
+
-                        }
-                } else {
@@ -343 +303 @@
-                }
-
-request.getParameter("statusId") != null && !request.getParameter("statusId").equals(""
+StringUtils.isNotEmpty(request.getParameter("statusId")
-                        statusId = Integer.parseInt(request.getParameter("statusId"));
-                } else {
@@ -349 +309 @@
-                }
-
-
-
-
+
+
-                        percentComplete = Integer.parseInt(request.getParameter("percentComplete"));
-                        percentCompleteComparator = request.getParameter("percentCompleteComparator");
@@ -359 +318 @@
-                }
-
-
-
-
+
+
-                        assignmentName = request.getParameter("assignmentName");
-                        assignmentNameComparator = request.getParameter("assignmentNameComparator");
@@ -368 +326 @@
-                        assignmentNameComparator = null;
-                }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-

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

@@ -67 +67 @@
-                                                valueField : 'code',
-                                                displayField : 'desc',
+                                                editable : false,
-                                                typeAhead : true,
-                                                mode : 'local',
@@ -85 +86 @@
-                                                        displayField :'desc',
-                                                        value :'contains',
+                                                        editable : false,
-                                                        typeAhead : true,
-                                                        mode : 'local',
@@ -166 +168 @@
-                                                valueField :'code',
-                                                displayField : 'desc',
+                                                editable : false,
-                                                typeAhead : true,
-                                                mode : 'local',

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

@@ -14 +14 @@
-var assignorOrAssigneeCombo;
-
-
+
+
+
+
+
+
+
-Ext.Ajax.on('requestcomplete', function(conn, response, options){Ext.get(document.body).unmask()}, this);
-
@@ -31 +37 @@
-                id: 'assignmentTree',        
-        height: 400,
+        //autoHieght: true,
-        rootVisible: false,
-        autoScroll: true,
@@ -119 +126 @@
-                                                id: 'wiki',
-                                                title: 'Wiki',
-disabled: true
+html:'<b>Work in progress for this tab.</b>'
-                                            },{
-                                                id: 'links',
-                                                title: 'Links',
-disabled: true
+html:'<b>Work in progress for this tab.</b>'
-                                        }]
-                        });
@@ -167 +174 @@
-      viewport.setPagePosition(155,60);
-      assignmentTree.expandAll();
-      
-        function onItemCheck(item, checked){
-                Ext.example.msg('Item Check', 'You {1} the "{0}" menu item.', item.text, checked ? 'checked' : 'unchecked');
-        }
-      
-});
@@ -220 +223 @@
-                   method: 'POST',
-                   success: function(result, request){
+                                nodeSelect = false;
-                                assignmentTree.root.reload();
-                                assignmentTree.expandAll();