Changeset 20526

Show
Ignore:
Timestamp:
03/04/10 08:28:11 (5 months ago)
Author:
nilesh
Message:

changes for configuring resource working time calendar as personal or schedule resource calendar.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/core/web/jsp/schedule/properties/ScheduleProperties.jsp

    r20514 r20526  
    3232            net.project.schedule.calc.TaskCalculationType, 
    3333            net.project.schedule.TaskDependency, 
    34             net.project.schedule.TaskConstraintType" 
     34            net.project.schedule.TaskConstraintType, 
     35            net.project.schedule.SchedulePropertiesHelper" 
    3536%> 
    3637<%@ include file="/base/taglibInclude.jsp"%> 
    …… 
    265266    </td> 
    266267</tr> 
     268<%-- Resource working ime calendar --%> 
     269<tr> 
     270    <td class="tableHeader"> 
     271        <display:get name="prm.schedule.properties.resourcecalendar.label"/> 
     272    </td> 
     273    <td class="tableContent"> 
     274        <input type="radio" name="resourceCalendar" value="<%=SchedulePropertiesHelper.PERSONAL_RESOURCE_CALENDAR %>" <jsp:getProperty name="schedulePropertiesHelper" property="checkedPersonalResourceCalendar" />>&nbsp;  
     275        <display:get name="prm.schedule.properties.resourcecalendar.personaloption.label"/> 
     276        &nbsp;&nbsp; 
     277        <input type="radio" name="resourceCalendar" value="<%=SchedulePropertiesHelper.SCHEDULE_RESOURCE_CALENDAR %>" <jsp:getProperty name="schedulePropertiesHelper" property="checkedScheduleResourceCalendar" />>&nbsp;  
     278        <display:get name="prm.schedule.properties.resourcecalendar.scheduleoption.label"/> 
     279    </td> 
     280</tr> 
    267281 
    268282<%-- Auto Calculate checkbox --%> 
    …… 
    293307    </td> 
    294308</tr> 
     309 
     310 
    295311</table> 
    296312 

  • trunk/core/web/jsp/schedule/properties/SchedulePropertiesProcessing.jsp

    r20514 r20526  
    109109        boolean inlineEditingWarning = "true".equals(request.getParameter("editingWarning")); 
    110110        boolean unAssignedWorkcapture = "true".equals(request.getParameter("unAssignedWorkcapture")); 
     111        String resourceCalendar = request.getParameter("resourceCalendar"); 
    111112    if (!errorReporter.errorsFound()) { 
    112113        if (!Validator.isBlankOrNull(onlyshiftworkplan) && onlyshiftworkplan.equals("true")) { 
    …… 
    123124            schedule.setEditingWarning(inlineEditingWarning); 
    124125            schedule.setUnAssignedWorkcapture(unAssignedWorkcapture); 
     126            schedule.setResourceCalendar(resourceCalendar); 
    125127             
    126128            schedule.store(); 

  • trunk/core/web/jsp/schedule/workingtime/Create.jsp

    r19162 r20526  
    3232            net.project.security.Action, 
    3333            net.project.gui.html.HTMLOptionList, 
    34             net.project.calendar.workingtime.WorkingTimeCalendarCreateHelper" 
     34            net.project.calendar.workingtime.WorkingTimeCalendarCreateHelper, 
     35            net.project.schedule.SchedulePropertiesHelper" 
    3536%> 
    3637<jsp:useBean id="createHelper" type="net.project.calendar.workingtime.WorkingTimeCalendarCreateHelper" scope="request" /> 
     38<jsp:useBean id="schedule" class="net.project.schedule.Schedule" scope="session" /> 
    3739<%@ include file="/base/taglibInclude.jsp"%> 
    3840 
    …… 
    153155            <td colspan="3">&nbsp;</td> 
    154156        </tr> 
     157        <% if((SchedulePropertiesHelper.PERSONAL_RESOURCE_CALENDAR).equals(schedule.getResourceCalendar())){%> 
    155158         
    156159        <tr class="tableContent"> 
    157160            <td colspan="3" class="fieldRequired" style="padding-left: 50px;"><display:get name="prm.schedule.workingtime.createpersonalresourcecalendar.note.label" /></td> 
    158161        </tr> 
    159  
    160         <%-- Resource Calendar  
     162        <%} else { %> 
     163        <%-- Resource Calendar --%> 
    161164        <tr class="tableContent"> 
    162165            <td><input type="radio" name="calendarType" id="calendarTypeResource" value="<%=WorkingTimeCalendarCreateHelper.CalendarType.RESOURCE.getID()%>" /></td> 
    …… 
    181184            </td> 
    182185        </tr> 
    183         --%> 
     186        <%}%> 
    184187    </table> 
    185188