Changeset 18298

Timestamp:

11/04/08 12:47:37 (2 months ago)

Author:

avinash

Message:

blog-it - work capture UI changes as per Dorothy mock up

Files:

• trunk/core/src/net/project/resource/AssignmentWorkCaptureHelper.java (modified) (8 diffs)
• trunk/core/src/net/project/view/pages/assignments/MyAssignments.java (modified) (2 diffs)
• trunk/core/src/net/project/view/pages/assignments/Timesheet.java (modified) (6 diffs)
• trunk/core/web/css/blog.css (modified) (3 diffs)
• trunk/core/web/html/assignments/Timesheet.html (modified) (1 diff)
• trunk/core/web/images/dialog-title-end.gif (added)
• trunk/core/web/images/icons/left-black-pointing.gif (added)
• trunk/core/web/images/icons/right-black-pointing.gif (added)
• trunk/core/web/images/menu/close.gif (added)
• trunk/core/web/images/menu/estimate-box-left.gif (added)
• trunk/core/web/images/menu/estimate-box-right-short.gif (added)
• trunk/core/web/src/blogit.js (modified) (16 diffs)
• trunk/core/web/src/workCapture.js (modified) (11 diffs)

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

@@ -26 +26 @@
-import javax.servlet.http.HttpSession;
-
-import net.project.base.Module;
-import net.project.base.ObjectType;
-import net.project.base.PnetRuntimeException;
@@ -89 +88 @@
-            private Date endDate;
-
-rivate
-
-rivate
+ublic
+
+ublic
-
-            private List assignments;
-
-rivate
+ublic
-
-            private Map summaryDateValues;
@@ -111 +110 @@
-            private TimeQuantity currentWork = assnWork;
-
-rivate
-
-rivate
+ublic
+
+ublic
-
-                private String objectId;
@@ -124 +123 @@
-
-                public String date;
+                
+                public Boolean isToday;
+                
+                public Boolean isTodaysDayInWeek;
+
+                        /**
+                         * @return the date
+                         */
+                        public String getDate() {
+                                return date;
+                        }
+
+                        /**
+                         * @return the dayOfWeek
+                         */
+                        public String getDayOfWeek() {
+                                return dayOfWeek;
+                        }
+
+                        /**
+                         * @return the isToday
+                         */
+                        public Boolean getIsToday() {
+                                return isToday;
+                        }
+
+                        /**
+                         * @param isToday the isToday to set
+                         */
+                        public void setIsToday(Boolean isToday) {
+                                this.isToday = isToday;
+                        }
+
+                        /**
+                         * @return the isTodaysDayInWeek
+                         */
+                        public Boolean getIsTodaysDayInWeek() {
+                                return isTodaysDayInWeek;
+                        }
+
+                        /**
+                         * @param isTodaysDayInWeek the isTodaysDayInWeek to set
+                         */
+                        public void setIsTodaysDayInWeek(Boolean isTodaysDayInWeek) {
+                                this.isTodaysDayInWeek = isTodaysDayInWeek;
+                        }
+                        
-            }
-            
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            /**
-                 * Return the String as array for time values as array in blogit.js for some validations 
@@ -326 +263 @@
-                }
-
-
-                // Get the column headers for each day
-                getDateHeaders(scrollType);
@@ -508 +444 @@
-             * assignments.
-             */ 
-void
+List
-                String objectID = objectID1;
-                String[] objectIDList = { objectID1 };
@@ -719 +655 @@
-                    }
-                }
+                return assignments;
-            }
-            
@@ -1712 +1649 @@
-                                        WorkingTimeCalendarDefinition def = calendarProvider.getForPlanID((String) planIDMap.get(id));
-                                        IWorkingTimeCalendar cal = new DefinitionBasedWorkingTimeCalendar(calendarProvider.getDefaultTimeZone(), def);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                        } else {
-
-
-
-
-
+
+
+
+
+
+
-                                        }
-                                        DateCalculatorHelper dateCalculatorHelper = new DateCalculatorHelper((DefinitionBasedWorkingTimeCalendar) cal);

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

@@ -352 +352 @@
-                        }
-                        
-                        // Action To generate the time sheet enteries from database ,if exist
-                        // otherwise generate a blank time sheet div for js and return
-                        else if (action.equalsIgnoreCase(WorkCaptureAction.GET_TIME_SHEET_ENTRIES.toString())) {
-                                String timeSheetTable = "";
-                                try {
-                                        String timeSheet = workCaptureHelper.getModifiedTimeSheetEntries(request);
-                                        if(StringUtils.isNotEmpty(timeSheet)){
-                                                timeSheetTable = workCaptureHelper.getModifiedTimeSheetEntries(request);
-                                                timeSheetTable += "TimesValueArray"
-                                                                + PropertyProvider.get("prm.resource.assignments.update.error.invalidwork.message", "0", "24");
-                                        } else {
-                                                timeSheetTable = "false";
-                                        }
-                                } catch (Exception e) {
-                                        log.error("Error occurred while getting time sheet entries : " + e.getMessage());
-                                        timeSheetTable = "Error occurred while getting time sheet entries";
-                                }
-                                return new TextStreamResponse("text", timeSheetTable);
-                        }
-                        // Action to update the time sheet entries 
-                        // Return js call : an error message call if error found
@@ -448 +429 @@
-                try {
-                        if (childTaskList.equals("-1")) {
-!
+
-                                blogEntries.setUserWeblogEntries(null);
-                                blogEntries.setTotalWorkDone("");

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

@@ -4 +4 @@
-package net.project.view.pages.assignments;
-
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
+import java.util.Date;
+import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
+import net.project.base.Module;
+import net.project.base.property.PropertyProvider;
+import net.project.form.assignment.FormAssignment;
+import net.project.resource.ActivityAssignment;
+import net.project.resource.Assignment;
+import net.project.resource.AssignmentWorkCaptureHelper;
+import net.project.resource.ScheduleEntryAssignment;
+import net.project.resource.AssignmentWorkCaptureHelper.DateHeader;
+import net.project.resource.AssignmentWorkCaptureHelper.DateLongName;
+import net.project.resource.mvc.handler.AssignmentDate;
-import net.project.security.SessionManager;
-import net.project.util.DateFormat;
+import net.project.util.NumberFormat;
+import net.project.util.TimeQuantity;
+import net.project.util.TimeQuantityUnit;
-
-import org.apache.commons.lang.StringUtils;
@@ -47 +64 @@
-        @Inject
-        private RequestGlobals requestGlobals;
+            
+    private AssignmentWorkCaptureHelper assignmentWorkCaptureHelper;
+    
+    private String scrollType;
+    
+    private Boolean scrollTypeIsWeek;
+    
+    private String strTDwidth;
+    
+    private String strPercentComplete;
+    
+    private String strWork = TimeQuantity.O_HOURS.toShortString(0, 2);
+    
+    private String strWorkComplete = TimeQuantity.O_HOURS.toShortString(0, 2);
+    
+    private String strWorkRemaining = TimeQuantity.O_HOURS.toShortString(0, 2);
+    
+    private Long scrollBackStartDate;
+
+    private Long scrollForwardStartDate;
+    
+    private List dateHeaders;
+    
+    private DateHeader dateHeader;
+    
+    private List dateLongNames;
+    
+    private List<DateLongName> dateLongNamesList;
+    
+    private DateLongName dateLongName;
+    
+    private String assignmentObjectId;
+
+        private int moduleId;
+        
+        private String timesValueArray;
+
+        private String invalidErrorKey;
-
-        public void onActivate() {
@@ -54 +109 @@
-
-                JSPRootURL = SessionManager.getJSPRootURL();
+                moduleId = Module.PERSONAL_SPACE;
-
-                HttpServletRequest request = requestGlobals.getHTTPServletRequest();
@@ -64 +120 @@
-                date = userDateFormat.formatDate(Calendar.getInstance().getTime(), "EEEEE, MMM dd, yyyy");
-
-
+/*
-                for (int hourIndex = 1; hourIndex <= 12; hourIndex++) {
-                        hoursModel.add(hourIndex < 10 ? "0" + hourIndex : "" + hourIndex);
@@ -72 +128 @@
-                for (int minuteIndex = 0; minuteIndex <= 59; minuteIndex++) {
-                        minutesModel.add(minuteIndex < 10 ? "0" + minuteIndex : "" + minuteIndex);
+                }*/
+                
+                String objectId = request.getParameter("objectId");
+                scrollType = StringUtils.isEmpty(request.getParameter("scrollType")) ? "week" : request.getParameter("scrollType");
+                
+                List assignments = null;
+                if(StringUtils.isNotEmpty(objectId)){
+                        assignmentWorkCaptureHelper = new AssignmentWorkCaptureHelper();
+                        // Get the assignments that we are displaying
+                        try {
+                                assignments = assignmentWorkCaptureHelper.getAssignments(objectId);
+                        } catch (Exception e) {
+                                log.error("Error occured while getting assignments:" + e.getMessage());
+                        }
+                        if(org.apache.commons.collections.CollectionUtils.isNotEmpty(assignments)){
+                                getModifiedTimeSheetEntries(objectId, assignments, request);
+                        }
-                }
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        /**
-         * @return the fromHours
@@ -138 +309 @@
-        }
-
+        /**
+         * @return the dateHeader
+         */
+        public DateHeader getDateHeader() {
+                return dateHeader;
+        }
+
+        /**
+         * @return the dateHeaders
+         */
+        public List getDateHeaders() {
+                return dateHeaders;
+        }
+
+        /**
+         * @return the scrollTypeIsWeek
+         */
+        public Boolean getScrollTypeIsWeek() {
+                return scrollTypeIsWeek;
+        }
+
+        /**
+         * @return the moduleId
+         */
+        public int getModuleId() {
+                return moduleId;
+        }
+
+        /**
+         * @return the scrollBackStartDate
+         */
+        public Long getScrollBackStartDate() {
+                return scrollBackStartDate;
+        }
+
+        /**
+         * @return the scrollForwardStartDate
+         */
+        public Long getScrollForwardStartDate() {
+                return scrollForwardStartDate;
+        }
+
+        /**
+         * @return the scrollType
+         */
+        public String getScrollType() {
+                return scrollType;
+        }
+
+        /**
+         * @return the strPercentComplete
+         */
+        public String getStrPercentComplete() {
+                return strPercentComplete;
+        }
+
+        /**
+         * @return the strTDwidth
+         */
+        public String getStrTDwidth() {
+                return strTDwidth;
+        }
+
+        /**
+         * @return the strWork
+         */
+        public String getStrWork() {
+                return strWork;
+        }
+
+        /**
+         * @return the strWorkComplete
+         */
+        public String getStrWorkComplete() {
+                return strWorkComplete;
+        }
+
+        /**
+         * @return the strWorkRemaining
+         */
+        public String getStrWorkRemaining() {
+                return strWorkRemaining;
+        }
+
+        /**
+         * @return the dateLongNamesList
+         */
+        public List getDateLongNamesList() {
+                return dateLongNamesList;
+        }
+
+        /**
+         * @return the assignmentObjectId
+         */
+        public String getAssignmentObjectId() {
+                return assignmentObjectId;
+        }
+
+        /**
+         * @return the timesValueArray
+         */
+        public String getTimesValueArray() {
+                return timesValueArray;
+        }
+
+        /**
+         * @return the invalidErrorKey
+         */
+        public String getInvalidErrorKey() {
+                return invalidErrorKey;
+        }
+
+        /**
+         * @return the dateLongName
+         */
+        public DateLongName getDateLongName() {
+                return dateLongName;
+        }
+
+        /**
+         * @param dateHeader the dateHeader to set
+         */
+        public void setDateHeader(DateHeader dateHeader) {
+                this.dateHeader = dateHeader;
+        }
+
+        /**
+         * @param dateLongName the dateLongName to set
+         */
+        public void setDateLongName(DateLongName dateLongName) {
+                this.dateLongName = dateLongName;
+        }
+
-}

trunk/core/web/css/blog.css

@@ -25 +25 @@
-        padding: 0px;
-        z-index: 12;
+        
-}
-#blogPopupbody {
@@ -142 +143 @@
-        font-family: Arial,Helvetica;
-}
-.timeSheetHeader {
-        background-color: #FFFFFF;
-        color: #666666;
-        font-weight: bold;
-        font-size: 12px;
-}
-.setTitle{
-        font-family: Arial,Verdana,Helvetica;
@@ -513 +508 @@
-        font-size: 12px;
-}
+.week-date {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 11px;
+        font-weight: bold;
+        padding-left: 10px;
+}
+
+/ * Work capture related css */
+.calendar-table {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 11px;