Changeset 18347

Timestamp:

11/13/08 12:16:32 (2 months ago)

Author:

avinash

Message:

blog-it :
- some work capture related changes
- now work capture time sheet will show current user's submitted work hours for a day in addition to work hours for assignment.

Files:

• trunk/core/src/net/project/resource/AssignmentWorkCaptureHelper.java (modified) (7 diffs)
• trunk/core/src/net/project/view/pages/assignments/Timesheet.java (modified) (4 diffs)
• trunk/core/web/css/blog.css (modified) (2 diffs)
• trunk/core/web/html/assignments/Timesheet.html (modified) (7 diffs)
• trunk/core/web/src/blogit.js (modified) (2 diffs)
• trunk/core/web/src/workCapture.js (modified) (8 diffs)

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

@@ -34 +34 @@
-import net.project.base.property.PropertyProvider;
-import net.project.calendar.PnCalendar;
-import net.project.calendar.workingtime.DateCalculatorHelper;
-import net.project.calendar.workingtime.DefinitionBasedWorkingTimeCalendar;
-import net.project.calendar.workingtime.IWorkingTimeCalendar;
@@ -96 +95 @@
-            public Map dateValues;
-
-rivate
+ublic
-
-            public Map assignmentMap;
@@ -213 +212 @@
-                public Boolean isNonWorkingDay; 
-                
+                public String oldWorkForDay; 
+                        
-                        /**
-                         * @return the forcount
@@ -274 +275 @@
-                        public void setIsNonWorkingDay(Boolean isNonWorkingDay) {
-                                this.isNonWorkingDay = isNonWorkingDay;
+                        }
+                        
+                        /**
+                         * @return the oldWorkForDay
+                         */
+                        public String getOldWorkForDay() {
+                                return oldWorkForDay;
+                        }
+
+                        /**
+                         * @param oldWorkForDay the oldWorkForDay to set
+                         */
+                        public void setOldWorkForDay(String oldWorkForDay) {
+                                this.oldWorkForDay = oldWorkForDay;
-                        }
-            }
@@ -316 +331 @@
-                    cal.add(PnCalendar.DATE, 1);
-                    scrollForwardStartDate = cal.getTime();
-getTime
+endOfDay
-                }
-
@@ -1706 +1721 @@
-                                        //as work logged here can be more that work that can be done between working times
-                                        Date dateStart = calendar.startOfDay(date);
-
+
+
+
-                                        WorkingTimeCalendarDefinition def = calendarProvider.getForPlanID((String) planIDMap.get(id));
-                                        IWorkingTimeCalendar cal = new DefinitionBasedWorkingTimeCalendar(calendarProvider.getDefaultTimeZone(), def);
@@ -1718 +1735 @@
-                                                }
-                                        }
-                                        Date dateEnd = calendar.endOfDay();
-                                        map.put(id, new DateUpdate(work, dateStart, dateEnd));
-                                    }
-                                }

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

@@ -16 +16 @@
-import net.project.base.Module;
-import net.project.base.property.PropertyProvider;
-import net.project.calendar.PnCalendar;
-import net.project.calendar.workingtime.DefinitionBasedWorkingTimeCalendar;
-import net.project.calendar.workingtime.IWorkingTimeCalendar;
@@ -172 +171 @@
-        invalidErrorKey = PropertyProvider.get("prm.resource.assignments.update.error.invalidwork.message", "0", "24");
-        
-4
+5
-        scrollBackStartDate = assignmentWorkCaptureHelper.scrollBackStartDate.getTime();
-        scrollForwardStartDate = assignmentWorkCaptureHelper.scrollForwardStartDate.getTime();
@@ -185 +184 @@
-                                                        .get(objectId));
-        }catch (Exception e) {
-
+getting 
-                }
-        for (Iterator it = dateHeaders.iterator(); it.hasNext();) {
@@ -282 +281 @@
-                                dateLongName.setIsNonWorkingDay(true); 
-                        }
+                        //To get total work done by user on particular day 
+                        TimeQuantity oldWorkForDay = (TimeQuantity)assignmentWorkCaptureHelper.summaryDateValues.get(date);
+                        oldWorkForDay = (oldWorkForDay == null ? new TimeQuantity(0, TimeQuantityUnit.HOUR) : oldWorkForDay);
+                        dateLongName.setOldWorkForDay(oldWorkForDay.toShortString(0, 2));       
-                }catch(Exception e){
-                        log.error("Error occured while setting non working day flag to highlight" + e.getMessage());

trunk/core/web/css/blog.css

@@ -718 +718 @@
-}
-#entry-time {
-5
-10
+2
+2
-}
-#entry-time .title {
@@ -856 +856 @@
-        font-size: 14px;
-}
+
+.oldWorkForDay{
+        color: #9B5379;
+}

trunk/core/web/html/assignments/Timesheet.html

@@ -18 +18 @@
-                                                        </t:if>
-                                                        </span>
+                                                        <span id="loadingDiv" class="loadingText"></span>
-                                                </div>
-
-" width="100%">
+ visibility: visible;
+ visibility:visible;" width="100%">&nbsp;
-                                                
-                                                <div id="timeWorkedDiv" width="100%">
@@ -111 +112 @@
-                                                                                                <input type='text' size='1' maxlength='5' id='timesheetbox${dateLongName.forcount}' 
-                                                                                                                name='${dateLongName.valueName}' value='${dateLongName.valueValue}' 
-
+
+
-                                                                                        </td>
-                                                                                                        <t:parameter name="else">
@@ -118 +120 @@
-                                                                                                        <input type='text' size='1' maxlength='5' id='timesheetbox${dateLongName.forcount}' 
-                                                                                                                        name='${dateLongName.valueName}' value='${dateLongName.valueValue}' 
-
+
+
-                                                                                                </td>
-                                                                                                        </t:parameter>
@@ -128 +131 @@
-                                                                                                        <input type='text' size='1' maxlength='5' id='timesheetbox${dateLongName.forcount}' 
-                                                                                                                        name='${dateLongName.valueName}' value='${dateLongName.valueValue}' 
-
+
+
-                                                                                                </td>
-                                                                                                <t:parameter name="else">
@@ -135 +139 @@
-                                                                                                        <input type='text' size='1' maxlength='5' id='timesheetbox${dateLongName.forcount}' 
-                                                                                                                        name='${dateLongName.valueName}' value='${dateLongName.valueValue}' 
-
+
+
-                                                                                                </td>
-                                                                                                </t:parameter>
@@ -146 +151 @@
-                                                                                        <input type='text' size='1' maxlength='5' id='timesheetbox${dateLongName.forcount}' 
-                                                                                                        name='${dateLongName.valueName}' value='${dateLongName.valueValue}' 
-
+
+
-                                                                                </td>
-                                                                        </t:parameter>
@@ -177 +183 @@
-                                                        </t:if>
-                                                                <td width="8%" id="estReported" class="table-content-estimates" nowrap="nowrap" bgcolor="#f3f3fa" style="padding-left:6px;"></td>
-mouseout="estimatedRemainingChanged();" on
-mouseout="totalEstimatesChanged();" on
+
+
-                                                                        <td width="10%" id="estPctComplete" class="table-content-estimates-right" nowrap="nowrap" style="padding-left:10px;"></td>
-                                                                        <td></td>

trunk/core/web/src/blogit.js

@@ -384 +384 @@
-                        document.getElementsByTagName('html')[0].style.overflowY = 'scroll';
-                        document.getElementsByTagName('body')[0].style.overflowY = 'hidden';
+                        document.getElementsByTagName('html')[0].style.overflowX = 'auto';
-                }
-                showHtmlSelectTags();
@@ -515 +516 @@
-                                }
-                        }
+                        else if(typeof document.getElementById("timeWorkedDiv") == 'undefined' || document.getElementById("timeWorkedDiv") == null){
+                                document.getElementsByTagName('body')[0].appendChild(blogActionDiv);
+                                saveBlogEntry();
+                        }
-                        // to save blog entry without any work capture or work remaining div changes
-                        else {
- && workSubmitted != 0
+
-                                        return false;
-                                }

trunk/core/web/src/workCapture.js

@@ -34 +34 @@
-                                        timeValues = new Array();
-                                    timeValues = timesValueArray.split(",");
+                                    validTimeSheet = true;
+                            } else {
+                                validTimeSheet = false;
-                            }
-                                                        
-                                if(document.getElementById('timeSheet') != null){
-                                        document.getElementById('timeSheet').innerHTML = timesheetHTMLText;                                     
@@ -68 +70 @@
-function scroll(scrollby, scrolltype) {
-        try{
-timecard
-timecard").innerHTML = '<tr><td>Loading Timesheet
+loadingDiv
+loadingDiv").innerHTML = 'Loading
-                }
-
-
+
-}
-
@@ -80 +81 @@
-        paramString = '';
-        var errorMessage = '';
-
+&nbsp;
-    for (var i = 0; i < timeValues.length; i++) {
-                var element = document.getElementsByName("dateupdX" + objectId + "X" + timeValues[i]);
@@ -98 +99 @@
-                                if(invalidErrorKey != ''){//invalid Error Key is get set while getting time sheet entries
-                                        errorMessage = invalidErrorKey.replace(/0/, value);
-
+"&nbsp;"+
-                                        validTimeSheet = false;
-                                }
@@ -130 +131 @@
-           },
-           failure: function(result, response){                           
-
-
+
+
+
-           }
-        });
@@ -147 +149 @@
-                var time = ((totalToMinutes) - (totalFromMinutes));
-                document.getElementById(currentbox).value = time/60;
-
+&nbsp;
-                // getting dayTimeValue for selected timebox to change work
-                var dayTimeValue = document.getElementById('timesheetbox0').name.split('X')[2];
@@ -177 +179 @@
-function changeScrollType(scrolltype) {
-        try{
-timecard
-timecard").innerHTML = '<tr><td>Loading Timesheet
+loadingDiv
+loadingDiv").innerHTML = 'Loading
-                }
-        }catch(err){}
@@ -199 +201 @@
-
-function showErrorDiv(errorMessage) {
-
+"&nbsp;"+
-}
-