Changeset 20549

Timestamp:

03/09/10 00:44:27 (5 months ago)

Author:

ritesh

Message:

- applying charge code to resource while inviting in project and business space.
- changes for getting spring services from base page.

Files:

• trunk/core/src/net/project/resource/Invitee.java (modified) (2 diffs)
• trunk/core/src/net/project/view/pages/base/BasePage.java (modified) (2 diffs)
• trunk/core/src/net/project/view/pages/directory/AddResponsibility.java (modified) (7 diffs)
• trunk/core/web/html/directory/AddResponsibility.tml (modified) (2 diffs)

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

@@ -170 +170 @@
-    private Space space;
-    
+    private String chargeCodeId;
+    
-    /**
-     * Sets this invitee's first name.
@@ -653 +655 @@
-                }
-         }
+
+        /**
+         * @return the chargeCodeId
+         */
+        public String getChargeCodeId() {
+                return chargeCodeId;
+        }
+
+        /**
+         * @param chargeCodeId the chargeCodeId to set
+         */
+        public void setChargeCodeId(String chargeCodeId) {
+                this.chargeCodeId = chargeCodeId;
+        }
-}

trunk/core/src/net/project/view/pages/base/BasePage.java

@@ -20 +20 @@
-import net.project.hibernate.service.IPnAssignmentWorkService;
-import net.project.hibernate.service.IPnBusinessHasViewService;
+import net.project.hibernate.service.IPnBusinessSpaceService;
+import net.project.hibernate.service.IPnChargeCodeService;
+import net.project.hibernate.service.IPnObjectHasChargeCodeService;
-import net.project.hibernate.service.IPnObjectNameService;
-import net.project.hibernate.service.IPnPersonService;
-import net.project.hibernate.service.IPnProjectSpaceService;
+import net.project.hibernate.service.IPnSpaceHasSpaceService;
-import net.project.hibernate.service.IPnSpaceViewContextService;
-import net.project.hibernate.service.IUtilService;
@@ -214 +218 @@
-        }
-        
+        public IPnChargeCodeService getPnChargeCodeService(){
+                return ServiceFactory.getInstance().getPnChargeCodeService();
+        }
+
+        public IPnSpaceHasSpaceService getPnSpaceHasSpaceService(){
+                return ServiceFactory.getInstance().getPnSpaceHasSpaceService();
+        }
+
+        public IPnObjectHasChargeCodeService getPnObjectHasChargeCodeService(){
+                return ServiceFactory.getInstance().getPnObjectHasChargeCodeService();
+        }
+
+        public IPnBusinessSpaceService getPnBusinessSpaceService(){
+                return ServiceFactory.getInstance().getPnBusinessSpaceService();
+        }
+
-        public String getParameter(String parameter) {
-        return request.getParameter(parameter);

trunk/core/src/net/project/view/pages/directory/AddResponsibility.java

@@ -17 +17 @@
-import net.project.directory.GroupWrapper;
-import net.project.events.EventType;
+import net.project.hibernate.model.PnChargeCode;
+import net.project.hibernate.model.PnObjectHasChargeCode;
-import net.project.hibernate.model.project_space.Teammate;
-import net.project.hibernate.service.ServiceFactory;
-import net.project.notification.EventCodes;
-import net.project.persistence.PersistenceException;
-import net.project.resource.Invitee;
-import net.project.resource.Roster;
-import net.project.resource.SpaceInvitationManager;
-import net.project.security.SessionManager;
@@ -87 +86 @@
-        @Property
-        private int inviteeListSize;
+        
+        private Integer spaceId;
+
+        @Property
+        private List<PnChargeCode> chargeCodeList = null;
+                
+        private List<PnObjectHasChargeCode> objectHasChargeCodeList = null;
-        
-        /**
@@ -102 +108 @@
-                versionNumber = StringUtils.deleteWhitespace(Version.getInstance().getAppVersion());
-                userRoles = new ArrayList<GroupWrapper>();
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                displayInvitiesList();
-                getAllRoleOptionList();
@@ -156 +176 @@
-                                        }
-                                        invitee.setSpace(SessionManager.getUser().getCurrentSpace());
+
+                                        String chargeCodeId = page.getRequestParameter("chargecode_"+invitee.getEmail());
+                                        if(StringUtils.isNotEmpty(chargeCodeId))
+                                                page.getPnObjectHasChargeCodeService().save(Integer.valueOf(invitee.getID()), Integer.valueOf(chargeCodeId), spaceId);
-                                                
-                                }catch(Exception e){
@@ -196 +220 @@
-                if(spaceInvitationWizard != null){
-                        net.project.resource.InviteeList inviteeList =  spaceInvitationWizard.getInviteeList();
-                
-                        List<Teammate> onlineTeammates = ServiceFactory.getInstance().getPnPersonService().getOnlineMembers();
-                        Iterator iterator = inviteeList.iterator();
@@ -210 +233 @@
-                                                        }
-                                                }
+                                        invitee.setChargeCodeId(getInviteeDefaultChargeCodeFromParent(invitee.getID()));
-                                }
-                                inviteesList.add(invitee);
@@ -264 +288 @@
-        }
-        
+        /**
+         * To get the invitee's charge code assigned in parent space of current space.
+         * if current space is project and there is not parent project then
+         *  charge code assigned in parent business will be returned.
+         * @return charge code id of invitee
+         */
+        public String getInviteeDefaultChargeCodeFromParent(String inviteeId){
+                String chargeCodeId = "";
+                if(CollectionUtils.isNotEmpty(objectHasChargeCodeList)){
+                        for(PnObjectHasChargeCode chargeCode : objectHasChargeCodeList){
+                                if(inviteeId.equals(chargeCode.getComp_id().getObjectId().toString())){
+                                        chargeCodeId = chargeCode.getPnChargeCode().getCodeId().toString();
+                                        break;
+                                }
+                        }
+                }
+                return chargeCodeId;
+        }
+        
+        public boolean isChargeCodeAvailable(){
+                return CollectionUtils.isNotEmpty(chargeCodeList);
+        }
-}

trunk/core/web/html/directory/AddResponsibility.tml

@@ -93 +93 @@
-                                                                <td width="15%" class="cell-right-border table-header" style="color:gray;font-weight:bold;"><t:Message value="prm.directory.directorypage.roster.column.titles"/></td>
-                                                                <td width="15%" class="cell-right-border table-header" style="color:gray;font-weight:bold;"><t:Message value="prm.directory.directorypage.roster.column.responsilities"/></td>
+                                                                <t:if test="chargeCodeAvailable">
+                                                                        <td width="10%" class="cell-right-border table-header" style="color:gray;font-weight:bold;"><t:Message value="prm.business.chargecode.label"/></td>
+                                                                </t:if>
-                                                                <td class="cell-right-border" align="center" nowrap="nowrap;"><t:Message value="prm.directory.directorypage.roster.column.teammember"/></td>
-                                                                <t:loop source="userRoles" value="userRole">
@@ -111 +114 @@
-                                                                                <td><input type="text" name="msg_${invitees.email}" size="25" maxlength="100"/></td>
-                                                                                <td><input type="text" name="resp_${invitees.email}" size="25" maxlength="500"/></td>
+                                                                                <t:if test="chargeCodeAvailable">
+                                                                                        <td>
+                                                                                                <t:ComboBox id="chargecode_${invitees.email}" displayField="codeName" 
+                                                                                                 valueField="codeId" list="chargeCodeList" value="${invitees.chargeCodeId}" 
+                                                                                                 defaultOption="true" defaultOptionText="prm.business.chargecode.dropdownlist.defaultoption.label" />
+                                                                                        </td>
+                                                                                </t:if>                                                  
-                                                                                <td align="center"><input type="checkbox" checked="checked" disabled="disabled"/></td>
-                                                                                <t:loop source="userRoles" value="userRole" volatile="true">