Changeset 20552

Timestamp:

03/09/10 00:51:30 (5 months ago)

Author:

ritesh

Message:

- applying charge code while work capture.

Files:

• trunk/core/src/net/project/resource/AssignmentWorkCaptureHelper.java (modified) (5 diffs)
• trunk/core/src/net/project/view/pages/assignments/Timesheet.java (modified) (5 diffs)
• trunk/core/web/html/assignments/Timesheet.tml (modified) (1 diff)
• trunk/core/web/src/workCapture.js (modified) (1 diff)

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

@@ -1251 +1251 @@
-                Set workLogsToStore = new HashSet();
-                        String comments = request.getParameter("comments");
+                        String chargeCodeId = request.getParameter("chargeCodeId");
-                        if(StringUtils.isNotBlank(comments)){
-                                this.comments = comments;
@@ -1265 +1266 @@
-                                log.error("Error occurred while parsing work assigned" + pnetEx.getMessage());
-                        }
-
+, chargeCodeId
-
-                // add the pervious work performed in the week to total work
@@ -1281 +1282 @@
-            }
-
-
+
+
-                if (!errors.errorsFound()) {
-                    DBBean db = new DBBean();
@@ -1294 +1296 @@
-                        for (Iterator it = workLogsToStore.iterator(); it.hasNext();) {
-                            List workLogs = (List) it.next();
-
+assignmentWorkId = 
-                        }
-                        //Converting Set tasksToStore to scheduleEntryToStoreArray array.
@@ -1357 +1359 @@
-                    }
-                }
+                // Assign charge code to assignment work capture.
+            if(StringUtils.isNotEmpty(chargeCodeId)){
+                for(Integer workCaptureId : assignmentWorkId){
+                        if(workCaptureId != null)
+                                ServiceFactory.getInstance().getPnObjectHasChargeCodeService().save(workCaptureId, Integer.valueOf(chargeCodeId), Integer.valueOf(SessionManager.getUser().getCurrentSpace().getID()));
+                }
+            }
-            }
-

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

@@ -30 +30 @@
-import net.project.calendar.workingtime.IWorkingTimeCalendar;
-import net.project.calendar.workingtime.WorkingTimeCalendarDefinition;
+import net.project.chargecode.ChargeCodeManager;
-import net.project.form.assignment.FormAssignment;
+import net.project.hibernate.model.PnChargeCode;
-import net.project.resource.ActivityAssignment;
-import net.project.resource.Assignment;
@@ -48 +50 @@
-import net.project.view.pages.base.BasePage;
-
+import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.ioc.annotations.Inject;
-
-/**
@@ -176 +180 @@
-        private boolean userAssigned;
-    
+    @Property
+    private List<PnChargeCode> chargeCodeList;
+    
+    @Property
+    private PnChargeCode chargeCode;
+
-    public void onActivate() {
-                if (net.project.security.SessionManager.getUser() == null) {
@@ -225 +235 @@
-                userAssigned = isUserHasAssignment(objectId);
-                
+                Integer spaceId = Integer.valueOf(getUser().getCurrentSpace().getID());
+                chargeCodeList = getPnChargeCodeService().getChargeCodeByProjectId(spaceId);
+                chargeCode = getPnChargeCodeService().getChargeCodeApliedOnTask(Integer.valueOf(objectId), spaceId);
+                if(chargeCode == null)
+                        chargeCode = getPnChargeCodeService().getChargeCodeAppliedOnPersonInSpace(Integer.valueOf(SessionManager.getUser().getID()), spaceId);
-        }
-
+
-        /**
-         * Get the Saved/Non Saved timeWorkedDiv for blogit.js for the first time only.
@@ -387 +402 @@
-        }
-    
+    /**
+     * To Check weather charge codes available for owning project of this assignment
+     * @return boolean
+     */
+    public boolean isChargeCodeAvailable() {
+        return CollectionUtils.isNotEmpty(chargeCodeList);      
+    }
+    
+    /**
+     * To check weather charge code is assigned to this assignment.
+     * @return boolean
+     */
+    public boolean isChargeCodeAssigned() {
+        return chargeCode != null;
+    }
-}

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

@@ -227 +227 @@
-                                                                        <td class="table-content-estimates-right"></td>
-                                                        </tr>                                                           
+                                                        <t:if test="chargeCodeAvailable">
+                                                                <tr class="oldWorkForDay-content" id="charge-code-row">
+                                                                        <t:if test="scrollTypeIsWeek">
+                                                                                        <td></td>  <!-- used extra td for week type only  -->
+                                                                                </t:if>
+                                                                                <td class="work-label"><t:Message value="prm.business.chargecode.label" /></td>
+                                                                                <td>
+                                                                        <t:if test="chargeCodeAssigned">
+                                                                                        <t:ComboBox id="chargeCodeList" displayField="codeName" valueField="codeId" 
+                                                                                        list="chargeCodeList" value="${chargeCode.codeId}" defaultOption="true" 
+                                                                                        defaultOptionText="prm.business.chargecode.dropdownlist.defaultoption.label" />
+                                                                        <t:parameter name="else">
+                                                                                                <t:ComboBox id="chargeCodeList" displayField="codeName" valueField="codeId" 
+                                                                                                list="chargeCodeList" defaultOption="true" 
+                                                                                                defaultOptionText="prm.business.chargecode.dropdownlist.defaultoption.label" />
+                                                                                        </t:parameter>                                                                                          
+                                                                                </t:if>
+                                                                                </td>
+                                                                                <td colspan="5" class="oldWorkForDay-border">
+                                                                                </td>
+                                                                </tr>
+                                                                </t:if>                                                  
-                                                </table> <!-- End of table timecard -->
-                                        

trunk/core/web/src/workCapture.js

@@ -311 +311 @@
-function submitTimeSheet(objectId) {    
-        var urlParams = ''+moduleId
+        var chargeCodeId;
+        if(document.getElementById('chargeCodeList'))
+                chargeCodeId = getSelectedValue(document.getElementById('chargeCodeList'));
-        urlParams += typeof hiddenElement != 'undefined' ? hiddenElement : '';
-        urlParams += typeof paramString != 'undefined' ? paramString : '';
-        Ext.Ajax.request({
-           url: JSPRootURL +'/assignments/My/Submit_Time_Sheet_Entries?module='+urlParams,
-
+, chargeCodeId: chargeCodeId
-           method: 'POST',
-           success: function(result, request){