Changeset 20550
- Timestamp:
- 03/09/10 00:47:37 (5 months ago)
- Files:
-
- trunk/core/web/jsp/roster/MemberEdit.jsp (modified) (3 diffs)
- trunk/core/web/jsp/roster/MemberEditProcessing.jsp (modified) (2 diffs)
- trunk/core/web/jsp/roster/MemberView.jsp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/core/web/jsp/roster/MemberEdit.jsp
r19824 r20550 43 43 org.apache.commons.lang.StringUtils, 44 44 net.project.security.Action, 45 net.project.resource.PersonStatus" 45 net.project.resource.PersonStatus, 46 org.apache.commons.collections.CollectionUtils, 47 net.project.chargecode.ChargeCodeManager, 48 net.project.hibernate.service.ServiceFactory, 49 net.project.space.SpaceTypes, 50 net.project.hibernate.model.PnChargeCode" 46 51 %> 47 52 … … 97 102 personalImagePath = SessionManager.getJSPRootURL()+"/images/NoPicture.gif"; 98 103 } 104 105 ChargeCodeManager chargeCodeManager = new ChargeCodeManager(); 106 Integer spaceId = Integer.valueOf(SessionManager.getUser().getCurrentSpace().getID()); 107 String space; 108 boolean root; 109 String chargeCodeId = null; 110 PnChargeCode chargeCode = ServiceFactory.getInstance().getPnChargeCodeService().getChargeCodeAppliedOnPersonInSpace(Integer.valueOf(rosterPerson.getID()), spaceId); 111 if(chargeCode != null) 112 chargeCodeId = chargeCode.getCodeId().toString(); 113 if(SessionManager.getUser().getCurrentSpace().getSpaceType().equals(SpaceTypes.BUSINESS)){ 114 root = ServiceFactory.getInstance().getPnBusinessSpaceService().isRootBusines(spaceId); 115 space = "business"; 116 } else { 117 root = ServiceFactory.getInstance().getPnProjectSpaceService().isRootProject(spaceId); 118 space = "project"; 119 } 99 120 %> 100 121 <title><display:get name="prm.global.application.title" /></title> … … 233 254 </td> 234 255 </tr> 256 257 <% 258 if(space.equals("business") && root) 259 chargeCodeManager.setChargeCodeList(ServiceFactory.getInstance().getPnChargeCodeService().getChargeCodeByBusinessId(spaceId)); 260 else if (space.equals("business")) 261 chargeCodeManager.setChargeCodeList(ServiceFactory.getInstance().getPnChargeCodeService().getRootBusinessChargeCodeBySubBusinessId(spaceId)); 262 else 263 chargeCodeManager.setChargeCodeList(ServiceFactory.getInstance().getPnChargeCodeService().getChargeCodeByProjectId(spaceId)); 264 if(chargeCodeManager.isChargeCodeAvailable()){ 265 %> 266 <tr align="left" valign="middle"> 267 <th nowrap align="left" width="18%" class="fieldRequired"><display:get name="prm.business.chargecode.label" /></th> 268 <td align="left" class="tableContent"> 269 <select id="chargecode" name="chargecode"> 270 <%=chargeCodeManager.getChargeCodeHtml(chargeCodeId)%> 271 </select> 272 </td> 273 </tr> 274 <% } %> 275 235 276 <tr> 236 277 <td class="tableContent"> </td> trunk/core/web/jsp/roster/MemberEditProcessing.jsp
r20386 r20550 33 33 net.project.notification.EventCodes, 34 34 net.project.resource.Roster, 35 org.apache.log4j.Logger" 35 org.apache.log4j.Logger, 36 org.apache.commons.lang.StringUtils, 37 net.project.hibernate.service.ServiceFactory" 36 38 %> 37 39 <jsp:useBean id="roster" class="net.project.resource.RosterBean" scope="session" /> … … 133 135 roster.storePersonRosterProperties(person, true); 134 136 137 String chargeCodeId = request.getParameter("chargecode"); 138 if(StringUtils.isNotEmpty(chargeCodeId)) 139 ServiceFactory.getInstance().getPnObjectHasChargeCodeService().save(Integer.valueOf(person.getID()), Integer.valueOf(chargeCodeId), Integer.valueOf(SessionManager.getUser().getCurrentSpace().getID())); 140 141 135 142 // Create notification for member edit event 136 143 net.project.project.ProjectEvent event = new net.project.project.ProjectEvent(); trunk/core/web/jsp/roster/MemberView.jsp
r19824 r20550 36 36 net.project.security.group.GroupTypeID, 37 37 org.apache.commons.lang.StringUtils, 38 net.project.resource.PersonStatus" 38 net.project.resource.PersonStatus, 39 net.project.chargecode.ChargeCodeManager, 40 net.project.hibernate.service.ServiceFactory, 41 net.project.space.SpaceTypes, 42 net.project.hibernate.model.PnChargeCode" 39 43 %> 40 44 <%@ include file="/base/taglibInclude.jsp" %> … … 188 192 </tr> 189 193 194 <% 195 ChargeCodeManager chargeCodeManager = new ChargeCodeManager(); 196 Integer spaceId = Integer.valueOf(SessionManager.getUser().getCurrentSpace().getID()); 197 String space; 198 boolean root; 199 String chargeCodeId = null; 200 PnChargeCode chargeCode = ServiceFactory.getInstance().getPnChargeCodeService().getChargeCodeAppliedOnPersonInSpace(Integer.valueOf(rosterPerson.getID()), spaceId); 201 if(SessionManager.getUser().getCurrentSpace().getSpaceType().equals(SpaceTypes.BUSINESS)){ 202 root = ServiceFactory.getInstance().getPnBusinessSpaceService().isRootBusines(spaceId); 203 space = "business"; 204 } else { 205 root = ServiceFactory.getInstance().getPnProjectSpaceService().isRootProject(spaceId); 206 space = "project"; 207 } 208 if(space.equals("business") && root) 209 chargeCodeManager.setChargeCodeList(ServiceFactory.getInstance().getPnChargeCodeService().getChargeCodeByBusinessId(spaceId)); 210 else if (space.equals("business")) 211 chargeCodeManager.setChargeCodeList(ServiceFactory.getInstance().getPnChargeCodeService().getRootBusinessChargeCodeBySubBusinessId(spaceId)); 212 else if (space.equals("project") && root) 213 chargeCodeManager.setChargeCodeList(ServiceFactory.getInstance().getPnChargeCodeService().getChargeCodeByProjectId(spaceId)); 214 else 215 chargeCodeManager.setChargeCodeList(ServiceFactory.getInstance().getPnChargeCodeService().getChargeCodeByProjectId(spaceId)); 216 if(chargeCodeManager.isChargeCodeAvailable()){ 217 %> 218 <tr> 219 <th nowrap align="left" width="18%" class="fieldRequired"><display:get name="prm.business.chargecode.label" /></th> 220 <td align="left" class="tableContent" colspan="3"> 221 <% if(chargeCode != null){ %> 222 <%=chargeCode.getCodeName()%> 223 <% } else {%> 224 <display:get name="prm.business.chargecode.dropdownlist.defaultoption.label" /> 225 <%}%> 226 </td> 227 </tr> 228 <%}%> 190 229 <tr> 191 230 <td class="tableContent"> </td>
