Changeset 18355

Timestamp:

11/14/08 11:05:33 (2 months ago)

Author:

ritesh

Message:

Bug Fixes:
- bug428 Date field caption in New Assignment dialog is inappropriate
- bug323 No validation on the numeric characters for the Phone and the Mobile fields
- bug317 Double clicking a meeting opens the View assignment page instead of the Meeting page
- bug326 Invalid error message while the user who is Space Administrator of a business tries to remove himself
- bug498 Task with large number of hours gives error, but still appears on workplan
- bug478 Schedule Dates in Workplan not changed as per the Task created in Assignments page
- bug501 HTTP Status 404 error on choosing Add to Workflow in the form data page
- bug284 Improper alert message from assignment module

Files:

• trunk/core/db/oracle/create-scripts/versions/8.5.0/update_system_properties.sql (modified) (1 diff)
• trunk/core/src/net/project/resource/AssignmentStoreDataFactory.java (modified) (1 diff)
• trunk/core/src/net/project/resource/Roster.java (modified) (2 diffs)
• trunk/core/src/net/project/view/pages/assignments/MyAssignments.java (modified) (9 diffs)
• trunk/core/src/net/project/view/pages/resource/management/Directory.java (modified) (3 diffs)
• trunk/core/web/html/assignments/MyAssignments.html (modified) (1 diff)
• trunk/core/web/jsp/calendar/MeetingManager.jsp (modified) (1 diff)
• trunk/core/web/jsp/form/FormList.jsp (modified) (3 diffs)
• trunk/core/web/jsp/form/FormListProcessing.jsp (modified) (1 diff)
• trunk/core/web/src/components/myAssignments-dashboardPanel.js (modified) (1 diff)
• trunk/core/web/src/components/myAssignments-filterForm.js (modified) (2 diffs)
• trunk/core/web/src/components/myAssignments-taskAssignWindow.js (modified) (9 diffs)
• trunk/core/web/src/components/myAssignments-timeline.js (modified) (2 diffs)
• trunk/core/web/src/directory-Panel.js (modified) (3 diffs)

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

@@ -1205 +1205 @@
-values (2000, 'en', 'text', 'prm.project.process.deletedeliverable.label', '{@all.global.toolbar.channel.remove} Deliverable', 'A', 0, 1, null);
-
-
+
+
+
+
+
-
-commit;

trunk/core/src/net/project/resource/AssignmentStoreDataFactory.java

@@ -244 +244 @@
-                                                        // +"','image': '"+
-                                                        // +"','link': '"+
+                                                        + "','spaceId': '"+ assignment.getSpaceId()
-                                                        + "','workSpace': '"+ assignment.getSpaceName().replaceAll("'", "´")
-                                                        + "','objectId': '"+ assignment.getPnObjectName().getObjectId()

trunk/core/src/net/project/resource/Roster.java

@@ -27 +27 @@
-
-import net.project.base.DefaultDirectory;
+import net.project.base.ObjectType;
-import net.project.base.property.PropertyProvider;
-import net.project.database.DBBean;
@@ -669 +670 @@
-                if (spaceAdmin.isMember(personID) &&
-                        spaceAdmin.getPersonMembers().size() == 1) {
-
-
+
+
+
+
+
-
-                }

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

@@ -188 +188 @@
-        private List<PnAssignment> assignments;
-        
-am
+ma
-        
-        private String startDisplayFrom;
@@ -266 +266 @@
-                //Some user properties
-                userDateFormat = SessionManager.getUser().getDateFormatter();
-am
+ma
-                userId = SessionManager.getUser().getID();
-                userDisplayName = SessionManager.getUser().getDisplayName().replaceAll("'", "&acute;");
@@ -314 +314 @@
-                                setAssignmentViewParameter(StringUtils.isNotEmpty(request.getParameter("view")) ? request
-                                                .getParameter("view") : "indent");
+                                return new TextStreamResponse("text", "");
-                        } else if (action.equalsIgnoreCase(AssignmentsAction.SETFILTERPARAMETER.toString())) {
-                                setAllFilterParameter(request);
@@ -335 +336 @@
-                                                        + request.getParameter("column"), PROPERTY, request.getParameter("value"));
-                                }
+                                return new TextStreamResponse("text", "");
-                        } else if (action.equalsIgnoreCase(AssignmentsAction.SETGROUPINGPARAMETER.toString())){
-                                initializeGroupingParameter(request);
+                                return new TextStreamResponse("text", "");
-                        } else if (action.equalsIgnoreCase(AssignmentsAction.GETRESOURCESTOASSIGN.toString())){
-                                return getResourceAssignGridData(request);
@@ -343 +346 @@
-                        } else if (action.equalsIgnoreCase(AssignmentsAction.REPLACEMYASSIGNMENTSPANELSTATE.toString())) {
-                                replaceMyAssignmentsPanelPropetry(PANELCOLLAPSED_PROPERTY_CONTEXT, PROPERTY, request.getParameter("value"));
+                                return new TextStreamResponse("text", "");
-                        } else if (action.equalsIgnoreCase(AssignmentsAction.REPLACEMYASSIGNMENTSPANELRESIZESTATE.toString())) {
-                                replaceMyAssignmentsPanelPropetry(PANELWIDTH_PROPERTY_CONTEXT, PROPERTY, request.getParameter("value"));
+                                return new TextStreamResponse("text", "");
-                        } else if (action.equalsIgnoreCase(AssignmentsAction.REPLACEMYASSIGNMENTSCOLUMNSIZE.toString())) {
-                                replaceMyAssignmentsColumnSize(request);
+                                return new TextStreamResponse("text", "");
-                        } else if (action.equalsIgnoreCase(AssignmentsAction.GETTIMELINEDATA.toString())){
-                                return getTimeLineData();       
@@ -685 +691 @@
-                        scheduleEntry.setName(request.getParameter("taskName"));
-                        scheduleEntry.setDescription(request.getParameter("taskDescription"));
-false
+schedule.isAutocalculateTaskEndpoints()
-                        schedule.loadAll();
-                        ServiceFactory.getInstance().getAssignResourceService().assignResourcesToSingleTask(scheduleEntry,
@@ -761 +767 @@
-                }
-                JSONStringer jsonStringer = new JSONStringer();
-                //creaing and calculating schedule entry
-                //IAddTaskService addTaskService = ServiceFactory.getInstance().getAddTaskService();
-                try {
-                        Date date = userDateFormat.parseDateString(dateString);
-                        scheduleEntry = addTaskService.reCalculateScheduleEntry(schedule, scheduleEntry, work, workUnit, date, calculateBy, SessionManager.getUser());
-                        jsonStringer.object();
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        jsonStringer.endObject();
-                } catch (JSONException pnetEx) {
-
-
-
-
-
-
+
+
-                return new TextStreamResponse("text/json", jsonStringer.toString());
-        }
@@ -1223 +1235 @@
-         * @return the userDateForamtString
-         */
-am
-am
+ma
+ma
-        }
-
@@ -1230 +1242 @@
-         * @param userDateForamtString the userDateForamtString to set
-         */
-amtString(String userDateForam
-amtString = userDateForam
+matString(String userDateForma
+matString = userDateForma
-        }
-        /**

trunk/core/src/net/project/view/pages/resource/management/Directory.java

@@ -35 +35 @@
-import net.project.util.Version;
-
+import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
@@ -775 +776 @@
-                                                +"', spaceName : '"+ spaceName.replaceAll("'", "´");
-                
-
-
-
+
-                        configString += "', role : '"+ getPersonRolesBySpaceID(spaceId)
-                                                +"', checked : true";
@@ -908 +907 @@
-                return ((string == null || string.equals("null")) ? returnString : string);
-        }
+        
+        private boolean personIsMemberOfThisSpace(String spaceId){
+                boolean personInSpace = false;
+                if (CollectionUtils.isNotEmpty(personBusinessesList)) {
+                        for(BusinessSpace business : personBusinessesList){
+                                personInSpace = business.getID().equals(spaceId);
+                                if(personInSpace) break;
+                        }
+                }
+                if(!personInSpace && CollectionUtils.isNotEmpty(personProjectList)){
+                        for(PnProjectSpace project : personProjectList){
+                                personInSpace = project.getProjectId() == Integer.parseInt(spaceId);
+                                if(personInSpace) break;
+                        }
+                }
+                return personInSpace; 
+        }
-
-        @CleanupRender

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

@@ -86 +86 @@
-        var isAgileWorkRemainingEnabled = ${isAgileWorkRemainingEnabled};
-        var actionsIconEnabled = ${actionsIconEnabled};
-amtString = '${userDateForam
+matString = '${userDateForma
-        var userDisplayName = '${userDisplayName}';
-

trunk/core/web/jsp/calendar/MeetingManager.jsp

@@ -297 +297 @@
-        <tb:band name="action">
-                
-tb:button type="cancel" show="<%=showCancelButton%>" /
+!-- tb:button type="cancel" show="<%=showCancelButton%>" /--
-                <tb:button type="submit" show="<%=showSubmitButton%>" />
-        </tb:band>

trunk/core/web/jsp/form/FormList.jsp

@@ -25 +25 @@
-            net.project.persistence.*,
-                        net.project.base.*,
-
+
+
-%>
-<%@ include file="/base/taglibInclude.jsp" %>
@@ -35 +36 @@
-<title><display:get name="prm.global.application.title" /></title>
-<%
+        boolean isPersonalSpace=user.getCurrentSpace().isTypeOf(Space.PERSONAL_SPACE);
-        form.setUser(user);
-        form.setSpace(user.getCurrentSpace());
@@ -307 +309 @@
-                                <a href="javascript:notify();"><%= PropertyProvider.get("all.global.toolbar.standard.notify") %></a>
-                              </span>
-
+<%if(!isPersonalSpace) {%>
-                              <span>
-                                <a href="javascript:workflow();"><%= PropertyProvider.get("all.global.toolbar.standard.workflow") %></a>
-                              </span>
-
+<%}%>
-                              <span>
-                                <a href="javascript:search();"><%= PropertyProvider.get("prm.form.list.search.button.tooltip") %></a>

trunk/core/web/jsp/form/FormListProcessing.jsp

@@ -97 +97 @@
-        } else if ((request.getParameter("theAction") != null) && request.getParameter("theAction").equals("workflow"))
-        {
-SessionManager.getJSPRootURL() + 
+
-        }
-%>

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

@@ -509 +509 @@
-                window.location.href = JSPRootURL+'/form/FormEdit.jsp?id='+assignmentTreeNodeId+'&module=30&action=1&redirectedFromSpace=true';
-        } else if(objectType.toString() == 'meeting' || objectType.toString() == 'activity'){
- = JSPRootURL+'/servlet/AssignmentController/View?module='+moduleId+'&objectID='+assignmentTreeNodeId+'&personID='+userId +'&returnTo=/assignments/My?module='+moduleId+'&refLink=/assignments/My?module='+moduleId
+=JSPRootURL+'/calendar/MeetingManager.jsp?id='+assignmentTreeNodeId+'&action=1&module=70'
-        } else {
-                extAlert('Error', 'Details are not available for this object.', Ext.MessageBox.ERROR);

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

@@ -102 +102 @@
-                                                labelWidth:30,
-                                                value : startDateValue,
+                                                emptyText : 'Start Date',
-                                                format:'m/d/Y',
-                                                invalidText:'Current date is not a valid date. It must be in the format mm/dd/yyyy',
@@ -140 +141 @@
-                                        toDate = new Ext.form.DateField({
-                                                hideLabel : true,
+                                                emptyText : 'Due Date',
-                                                value : endDateValue,
-                                                format:'m/d/Y',

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

@@ -8 +8 @@
-var dueDate;
-
-
-
-
-
+
+
+
+
+
-
-String.prototype.trim = function(){
@@ -199 +200 @@
-                                                        name : 'startDate',
-                                                        labelWidth:30,
-am
+ma
-                                                        width : 100,
+                                                        invalidText:'Current date is not a valid date. It must be in the format '+ getDateFormatExample(userDateFormatString),
-                                                        labelSeparator : ':',
-                                                    listeners : {'change':calculateTask}
@@ -209 +211 @@
-                                                        name : 'End Date',
-                                                        labelWidth:30,
-am
+ma
-                                                        width : 100,
+                                                        invalidText:'Current date is not a valid date. It must be in the format '+ getDateFormatExample(userDateFormatString),
-                                                        labelSeparator : ':',
-                                                        listeners : {'change':calculateTask}
@@ -219 +222 @@
-                        buttons:[{
-                         text:'Submit',
-
+
+
+
+
-                         },
-                         { text: 'Close',
@@ -297 +303 @@
-
-function calculateTask(thisField, newValue, oldValue) {
+        taskCalculated = false
-        if(!taskWork.isValid(false)){
-                extAlert('Error', 'Please enter valid work.', Ext.MessageBox.ERROR);
@@ -302 +309 @@
-        }
-        var startDateString = '';
-
-
-
-
-
+
+
+
+
+
+
-                date = dueDate.getValue();
-
+
+
+
+
+
-        }
-        
@@ -323 +335 @@
-                success: function(result, request){
-                        var responseObject = eval("(" +result.responseText +")" );
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                },
-                failure: function(result, response){
+                        taskCalculated = true;
-                        extAlert('Error', 'Server request failed please try again...', Ext.MessageBox.ERROR);
-                }
@@ -360 +379 @@
-        }
-        return splitedDate[0]+'/'+splitedDate[1]+'/'+splitedDate[2];
+}
+
+function getDateFormatExample(dateFormatString){
+        var splitedDateFormat = dateFormatString.split('/');
+        if(splitedDateFormat[0].length == 1){
+                splitedDateFormat[0] = splitedDateFormat[0] + splitedDateFormat[0];
+        }
+        if(splitedDateFormat[1].length == 1){
+                splitedDateFormat[1] = splitedDateFormat[1] + splitedDateFormat[1];
+        }
+        if(splitedDateFormat[2].length == 1){
+                splitedDateFormat[2] = splitedDateFormat[2] + splitedDateFormat[2];
+        }
+        return splitedDateFormat[0]+'/'+splitedDateFormat[1]+'/'+splitedDateFormat[2];
-}
-
@@ -373 +406 @@
-
-function create(){
+        //If no data in assignment grid
+        if (assignmentTreeGrid.getStore().getCount() == 0){
+                extAlert('Error', 'No any project or task avilable to create new assignment.', Ext.MessageBox.ERROR);
+                return;
+        }
-        if(assignmentTreeNodeId != 0 && (objectType == 'task' || objectType == 'summary' || objectType == 'project')){
+                taskCalculated = true;
-                selectedTaskId = assignmentTreeNodeId;
-                if(objectType == 'project'){

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

@@ -42 +42 @@
-        Timeline.DurationEventPainter.prototype._onClickDurationEvent = function(domEvt,evt,target){
-                assignmentTreeNodeId = childTaskList = evt.getProperty("objectId");
+                taskSpaceId = evt.getProperty("spaceId");
-                objectType = evt.getProperty("objectType");
-                objectName = evt.getProperty("title");
@@ -47 +48 @@
-                loadBlogEntriesForAssignment();
-                loadWikiForAssignment( objectName, assignmentTreeNodeId);
-
+//
-                
-                domEvt.cancelBubble=true;

trunk/core/web/src/directory-Panel.js

@@ -911 +911 @@
-                return false;
-            }
+            if((gridStore.getAt(3).get('value').search(/[a-zA-Z]+/))> -1) {
+                extAlert('Error', 'Invalid office phone number', Ext.MessageBox.ERROR);
+                return false;
+            }
+                
+                if((gridStore.getAt(4).get('value').search(/[a-zA-Z]+/))> -1 ) {
+                extAlert('Error', 'Invalid Mobile numbers', Ext.MessageBox.ERROR);
+                return false;
+            }
-                var resourceProperty = '[{ "displayName" : "'+ gridStore.getAt(0).get('value')
-                                                                +'", "firstName" : "'+ gridStore.getAt(1).get('value')
@@ -918 +927 @@
-                                                                +'", "fax" : "'+ gridStore.getAt(5).get('value')
-                                                                +'", "email" : "'+ gridStore.getAt(6).get('value')+'"}]';
+                
-                //Updating Resource
-                document.getElementById('messageDiv').innerHTML 
@@ -1023 +1033 @@
-                        function(btn){
-                                if(btn=='yes'){
-
+s
-                                }else{
-                                        return false;