Changeset 17897

Timestamp:

08/14/08 11:20:31 (3 months ago)

Author:

avinash

Message:

blog :
- added work capture for single day on blog it popup from Assignments (Beta) page
- added scrolling functionality for single day and capturing single day work

Files:

• trunk/core/src/net/project/hibernate/service/IPnAssignmentWorkService.java (modified) (4 diffs)
• trunk/core/src/net/project/hibernate/service/impl/PnAssignmentWorkServiceImpl.java (modified) (14 diffs)
• trunk/core/src/net/project/view/pages/assignments/MyAssignments.java (modified) (3 diffs)
• trunk/core/web/css/blog.css (modified) (3 diffs)
• trunk/core/web/html/assignments/MyAssignments.html (modified) (4 diffs)
• trunk/core/web/src/blogit.js (modified) (11 diffs)
• trunk/core/web/src/components/myAssignments-dashboard.js (modified) (3 diffs)

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

@@ -52 +52 @@
-         * @param request a <code>HttpServletRequest</code> object that we can use
-     * to look up what time the user has entered.
-     * @param ObjectID
-     * @param dateToStart to load the date list according to scrolling 
-     * null for first time.
-     * The date value list has been set according to this paramaeter and pass it to
-     * getTimeValueForJS method to set the date value list.
-     * and after that in session.
-         */
-String objectId ,String dateToStart,
-
-
-em
+
+
+
+me
-         * while updating the time sheet. 
-
+
+
+
-         * and null for First time load.
-         */
-
+,String scrollType,String objectId
-        
-        /**
@@ -77 +76 @@
-     * the database.
-     */
-
+String objectId,String scrollType
-        
-        /**
@@ -84 +83 @@
-         * and set to dateHeaders and dateLongNames list.
-         */
-
+String scrollType
-        
-        /**
@@ -129 +128 @@
-     *  
-         */
-, String id
+
-        
-        /**

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

@@ -119 +119 @@
-        private TimeQuantity currentWork = assnWork;
-    
-
+private 
-    
-
+private 
-    
-        private TaskFinder finder = new TaskFinder();
@@ -161 +161 @@
-         * @see net.project.hibernate.service.IPnAssignmentWorkService#getModifiedTimeSheetEntries(java.lang.String, java.lang.String, javax.servlet.http.HttpServletRequest)
-         */
-
-
+
+
+
-                NumberFormat nf = NumberFormat.getInstance();
+                String scrollType=request.getParameter("scrollType")==null?"week":request.getParameter("scrollType");
+                
-                // Get Get/Set Date values List while scrolling and first Time Laod.
-getTimeValueForJS(dateToStart
+String jsTimesValueArray=getTimeValueForJS(dateToStart,scrollType,objectId
-
-                // Get the assignments that we are displaying
@@ -176 +179 @@
-                String strTDwidth = "52px";
-                String timeSheetTable = "";
-
-
-
-
-
+
+
+
+
-                                + SessionManager.getJSPRootURL()
-icons/prev_page_sm
-);'/></td>
+leftsingle
+,\""+scrollType+"\");'/></td>\n
-
-                for (Iterator it = dateHeaders.iterator(); it.hasNext();) {
-                        DateHeader dateHeader = (DateHeader) it.next();
-
+\t\t\t
-                                        + "'>" + dateHeader.dayOfWeek + "<br>" + dateHeader.date
-
-
-
-<td width='15'
+\n
+
+
+\t\t\t<td
-                                + SessionManager.getJSPRootURL()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                double percenComplete = 1.0;
-                int forcount = 0;
@@ -266 +265 @@
-                                String valueValue = (request.getParameter(valueName) == null ? " "
-                                                : " value='" + request.getParameter(valueName) + "' ");
-
-
+\t\t\t
+\n
-                                timeSheetTable += work.toShortString(0, 2);
-<br>
-
-
+\t\t\t\t<br>\n
+
+\t\t\t\t
-                                                + forcount
-                                                + "' name='"
@@ -283 +282 @@
-                                                + "','"
-                                                + Module.PERSONAL_SPACE
-
+
+
-                                                + forcount
-                                                + "');\"><img src='"
-                                                + SessionManager.getJSPRootURL()
-
+\n
-                                forcount++;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                // Put some date objects into the session that we'll use repeatedly
@@ -322 +316 @@
-                                        + e.getMessage());
-                }
-
++"TimesValueArray"+jsTimesValueArray
-        }
-        
@@ -328 +322 @@
-         * @see net.project.hibernate.service.IPnAssignmentWorkService#getTimeValueForJS(java.lang.String)
-         */
-
+,String scrollType,String objectId
-                PnCalendar cal = new PnCalendar();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                // Get the column headers for each day
-
+scrollType
-                // Figure out how many hours were worked on each day
-
+objectId,scrollType
-                String timesValueString = "";
-                for (Iterator it = dateLongNames.iterator(); it.hasNext();) {
@@ -362 +374 @@
-         * @see net.project.hibernate.service.IPnAssignmentWorkService#setDateValues()
-         */
-
+String objectId,String scrollType
-        dateValues = new HashMap();
-        summaryDateValues = new HashMap();
@@ -450 +462 @@
-                                .get(dateID.date);
-                if (existingSummaryWork == null) {
-
+this.
-                } else {
-
+this.
-                }
-
@@ -466 +478 @@
-         * @see net.project.hibernate.service.IPnAssignmentWorkService#getDateHeaders()
-         */
-
+String scrollType
-                PnCalendar cal = new PnCalendar();
-                dateHeaders = new LinkedList();
@@ -477 +489 @@
-                dayOfWeekFormatter.setTimeZone(cal.getTimeZone());
-                cal.setTime(startDate);
-
+
+
+
+
+
+
+
+
+
+
+
-                        DateHeader dh = new DateHeader();
-                        dh.date = dateFormat.formatDate(cal.getTime(),
@@ -719 +741 @@
-         * @see net.project.hibernate.service.IPnAssignmentWorkService#findUpdatedPercentComplete(javax.servlet.http.HttpServletRequest, java.lang.String)
-         */
-,
-       String id) throws ParseException {
+) throws ParseException {
+String id = request.getParameter("objectId");
-                errorReporter = new ErrorReporter();
+                String scrollType=request.getParameter("scrollType")==null?"week":request.getParameter("scrollType");
+                int for_cnt;
+                if(scrollType.equalsIgnoreCase("week")){
+                        for_cnt=7;
+                }else{
+                        for_cnt=1;
+                }
-                Date earliestStartDate = null;
-                Date latestStartDate = null;
@@ -734 +763 @@
-                List workCompleteStrings = new ArrayList();
-                //Total work check. It should not be below zero.
+                
-                double totalRowWork = 0;
-7
+for_cnt
-                        String workString = request.getParameter("wc" + i);
-                        Date startDate = new Date(Long.parseLong(request.getParameter("tv" + i)));
@@ -768 +798 @@
-                                continue;
-                        } else if (!Validator.isNumeric(workString)) {
-                                //this is verified above
-                                //errorReporter.addError(new ErrorDescription(PropertyProvider.get("prm.resource.updatework.error.invalid.message", workString, DateFormat.getInstance().formatDate(workDate))));
-                                continue;
-                        }
-                        totalColumnWork += Double.parseDouble(workString);
-                }
-                //if(Validator.isNegative(""+totalColumnWork)) {
-                //      errorReporter.addError(new ErrorDescription(PropertyProvider.get("prm.resource.updatework.total.negative.error.message")));
-                //}
-
-                //String percentComplete = null;
-                //TimeQuantity assnWork = TimeQuantity.O_HOURS;
-                //TimeQuantity currentWork = assnWork;
-                NumberFormat nf = NumberFormat.getInstance();
-                assignmentMap = (Map) request.getSession().getAttribute("updateAssignmentsMap");

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

@@ -201 +201 @@
-                        // otherwise generate a blank time sheet div for js and return
-                        else if (action.equalsIgnoreCase(WorkCaptureAction.GET_TIME_SHEET_ENTRIES.toString())) {
-
-
-
-
+
-                                return new TextStreamResponse("text", timeSheetTable);
-                        }
@@ -211 +208 @@
-                        //                                      update time sheet call if no error found                         
-                        else if (action.equalsIgnoreCase(WorkCaptureAction.UPDATE_TIME_SHEET_ENTRIES.toString())) {
-                                String objectId = request.getParameter("objectId");
-                                String updatedJSCall = "";
-                                try {
-, objectId
+
-                                } catch (Exception e) {
-                                        log.error("Error occured while updating the work caputre" + e.getMessage());
@@ -221 +217 @@
-
-                        }
-                        // Get the times value array for js array variable
-                        // to do some validations while updating the hours of work done on each day.
-                        else if (action.equalsIgnoreCase(WorkCaptureAction.GET_TIME_VALUES_ARRAY.toString())) {
-                                String dateToStart = request.getParameter("scroll");
-                                return new TextStreamResponse("text", pnAssignmentWorkService.getTimeValueForJS(dateToStart));
-
-                        }                       
-                         // Action to save the time sheet in database if error free,
-                         // otherwise return a js error message call like not a working day.                     

trunk/core/web/css/blog.css

@@ -42 +42 @@
-        text-decoration: none;
-}
+.blogEntryTitle {
+         padding-left:80px;
+         font-family: Verdana,Arial,Helvetica;
+         font-size: 12px;
+         font-weight: bold;
+         width: 30%;
+
+}
-.blogEntryLabel {
-         font-family: Verdana,Arial,Helvetica;
@@ -47 +55 @@
-         font-weight: bold;
-         width: 30%;
+         color:#999999;
-}
-#weblogEntryContents 
@@ -74 +83 @@
-        padding:0pt;
-}
+.blogbar2 {
+        background-color:#CC99FF;
+        border-collapse:collapse;
+        height:1px;
+        padding:0pt;
+}
-.redlink{
-
+color:#CC0000;
-}
-.bluelink{
-
+color:#005CB9;
-}
+.timeSheetHeader {
+background-color:#FFFFFF;
+color:#666666;
+font-weight: bold;
+}

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

@@ -4 +4 @@
-<style>
-.x-date-middle {
-2px;padding-bottom:
-
+ 2px; padding-bottom: 
+ 
-}
-.filter-icon {
@@ -12 +12 @@
-
-html, body {
-        font:
-        margin:
-        padding:
-        border:
-        overflow:
-        height:
-    
-       
-           margin:
-       
-    
-    
-    
-    
-    
-    
+       font: 
+       margin: 
+       padding: 
+       border: 
+       overflow: 
+       height: 
+
+
+    margin: 
+
+
+
+
+
+
+
-  
-#assignmentPanelPosition{
@@ -39 +39 @@
-        
-        <script type="text/javascript">
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        <script type='text/javascript' src='${JSPRootURL}/src/RowExpander.js'></script>
-        <script type="text/javascript" src="${jSPRootURL}/src/extjs/extensions/treeGrid.js"></script>
@@ -64 +109 @@
-        
-        <t:PersonalMenu />
-    
+
-        
-
+
+
+
+
+
-</t:BlogLayout>

trunk/core/web/src/blogit.js

@@ -58 +58 @@
-var paramString = '';
-
-
+,scrolltype
-        Ext.Ajax.request({
-           url: JSPRootURL +'/assignments/My/Get_Time_Sheet_Entries?module='+moduleId,
-
+, scrollType:scrolltype
-           method: 'POST',
-           success: function(result, request){
-               var responseText = result.responseText;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-           },
-           failure: function(result, response){                           
@@ -88 +77 @@
-}
-
-
+,scrolltype
-        Ext.Ajax.request({
-           url: JSPRootURL +'/assignments/My/Get_Time_Sheet_Entries?module='+moduleId,
-
+,scrollType:scrolltype
-           method: 'POST',
-           success: function(result, request){
-               var responseText = result.responseText;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-           },
-           failure: function(result, response){                           
@@ -142 +120 @@
-        }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-}
-
@@ -218 +186 @@
-                timeSheetTable += '<table align="left" border="0" width="100%">';
-            timeSheetTable += '<tr>';
-
-
+
-            timeSheetTable += '</tr>';
-2
+1
-            timeSheetTable += '<tr>';
-
-
+
-            timeSheetTable += '</tr></table>';
-                timeSheetTable += '</td></tr><tr><td>';
-                        timeSheetTable += '<table width="100%"><tr><td width="100%">';
-
+:
-