|
From: Tomas M. <to...@us...> - 2011-01-18 14:17:00
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/webutil/timegrid In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv24798/JavaSource/org/unitime/timetable/webutil/timegrid Modified Files: ExamGridTable.java Log Message: Examination Timetable: Date filter corrected for the case when session start date is in a different year than the period. Index: ExamGridTable.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/webutil/timegrid/ExamGridTable.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** ExamGridTable.java 1 Dec 2010 11:10:48 -0000 1.17 --- ExamGridTable.java 18 Jan 2011 14:16:52 -0000 1.18 *************** *** 388,392 **** cal.setLenient(true); cal.add(Calendar.DAY_OF_YEAR, day); ! return 1+cal.get(Calendar.WEEK_OF_YEAR)-iForm.getSessionBeginWeek(); } --- 388,399 ---- cal.setLenient(true); cal.add(Calendar.DAY_OF_YEAR, day); ! int week = 1; ! while (cal.getTime().after(iForm.getSessionBeginDate()) && cal.get(Calendar.WEEK_OF_YEAR) != iForm.getSessionBeginWeek()) { ! cal.add(Calendar.DAY_OF_YEAR, -7); week ++; ! } ! while (cal.getTime().before(iForm.getSessionBeginDate()) && cal.get(Calendar.WEEK_OF_YEAR) != iForm.getSessionBeginWeek()) { ! cal.add(Calendar.DAY_OF_WEEK, 7); week --; ! } ! return week; } |