Changeset 20525

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

some more changes related to an assigned task work capture configuration.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/core/src/net/project/resource/ScheduleEntryAssignment.java

    r20305 r20525  
    3838import net.project.hibernate.model.PnAssignment; 
    3939import net.project.persistence.PersistenceException; 
     40import net.project.schedule.SchedulePropertiesHelper; 
    4041import net.project.schedule.ScheduleTimeQuantity; 
    4142import net.project.schedule.calc.IDateCalculator; 
     43import net.project.security.SessionManager; 
    4244import net.project.security.User; 
    4345import net.project.util.NumberFormat; 
    …… 
    11701172            // A real assignment; use the assignee's calendar 
    11711173             
    1172             //If schedule calender is defined for resource get sechedule resource calender. 
    1173             workingTimeCal = provider.getForResourceID(getPersonID()); 
    1174              
    1175             //If schedule calender is not defined for resource get personal Working time calendr of resource. 
    1176             if (workingTimeCal == null) { 
     1174                 
     1175            //If schedule is configured for schedule resource calender get sechedule resource calender. 
     1176                if(SchedulePropertiesHelper.SCHEDULE_RESOURCE_CALENDAR.equals(SessionManager.getSchedule().getResourceCalendar())){ 
     1177                        workingTimeCal = provider.getForResourceID(getPersonID()); 
     1178                } else { 
     1179            //else get personal resource working time calendar. 
    11771180                try { 
    11781181                    workingTimeCal = ResourceWorkingTimeCalendarProvider.make(new User(new Person(getPersonID()))) 

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

    r20515 r20525  
    211211                                 
    212212                                if(assignments.size() == 1){ 
    213                                         ScheduleEntryAssignment sea = (ScheduleEntryAssignment)assignments.get(0); 
    214                                         dummayAssignment = sea.getAssignorID() == null; 
     213                                        Assignment ass = (Assignment) assignments.get(0); 
     214                                        dummayAssignment = ass.getAssignorID() == null; 
    215215                                } 
    216216                                if(dummayAssignment && !unAssignedWorkCapture){