Menu
▾
▴
unitime-cvs — CVS changes
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(275) |
Jul
(81) |
Aug
(19) |
Sep
(26) |
Oct
(190) |
Nov
(118) |
Dec
(16) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(9) |
Feb
(318) |
Mar
(251) |
Apr
(354) |
May
(209) |
Jun
(261) |
Jul
(226) |
Aug
(136) |
Sep
(156) |
Oct
(30) |
Nov
(5) |
Dec
(13) |
| 2009 |
Jan
(26) |
Feb
(35) |
Mar
(63) |
Apr
(21) |
May
(26) |
Jun
(33) |
Jul
(55) |
Aug
(71) |
Sep
(23) |
Oct
(40) |
Nov
(18) |
Dec
(13) |
| 2010 |
Jan
(17) |
Feb
(98) |
Mar
(39) |
Apr
(25) |
May
(107) |
Jun
(257) |
Jul
(270) |
Aug
(206) |
Sep
(237) |
Oct
(187) |
Nov
(302) |
Dec
(187) |
| 2011 |
Jan
(63) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
Update of /cvsroot/unitime/UniTime/Documentation/Interfaces In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/Documentation/Interfaces Modified Files: AcademicAreaReservation.dtd CourseOfferingReservation.dtd Student.dtd CourseTimetable.dtd PosMinor.dtd PosMajorReservation.dtd Department.dtd CourseOfferingExport.dtd Staff.dtd EventLoad.dtd StudentSectioning.dtd AcademicArea.dtd StudentGroupReservation.dtd SubjectArea.dtd StudentAccomodation.dtd CourseCatalog.dtd EventImport.dtd PosMajor.dtd BuildingRoom.dtd StudentGroup.dtd StudentCourse.dtd Session.dtd AcademicClassification.dtd StudentEnrollment.dtd Added Files: Curricula_3_2.dtd Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: EventImport.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/EventImport.dtd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EventImport.dtd 17 Jun 2008 21:24:51 -0000 1.3 --- EventImport.dtd 1 Dec 2010 11:10:48 -0000 1.4 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: EventLoad.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/EventLoad.dtd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EventLoad.dtd 28 Jan 2009 18:50:12 -0000 1.1 --- EventLoad.dtd 1 Dec 2010 11:10:48 -0000 1.2 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: AcademicClassification.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/AcademicClassification.dtd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AcademicClassification.dtd 17 Jun 2008 21:24:51 -0000 1.3 --- AcademicClassification.dtd 1 Dec 2010 11:10:48 -0000 1.4 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: CourseTimetable.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/CourseTimetable.dtd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CourseTimetable.dtd 17 Jun 2008 21:24:51 -0000 1.4 --- CourseTimetable.dtd 1 Dec 2010 11:10:48 -0000 1.5 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: StudentEnrollment.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/StudentEnrollment.dtd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** StudentEnrollment.dtd 17 Jun 2008 21:24:51 -0000 1.4 --- StudentEnrollment.dtd 1 Dec 2010 11:10:48 -0000 1.5 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: StudentGroup.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/StudentGroup.dtd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** StudentGroup.dtd 17 Jun 2008 21:24:51 -0000 1.3 --- StudentGroup.dtd 1 Dec 2010 11:10:48 -0000 1.4 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: Staff.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Staff.dtd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Staff.dtd 17 Jun 2008 21:24:51 -0000 1.5 --- Staff.dtd 1 Dec 2010 11:10:48 -0000 1.6 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: PosMinor.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/PosMinor.dtd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PosMinor.dtd 17 Jun 2008 21:24:51 -0000 1.3 --- PosMinor.dtd 1 Dec 2010 11:10:48 -0000 1.4 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: PosMajorReservation.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/PosMajorReservation.dtd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PosMajorReservation.dtd 17 Jun 2008 21:24:51 -0000 1.3 --- PosMajorReservation.dtd 1 Dec 2010 11:10:48 -0000 1.4 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: CourseOfferingExport.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/CourseOfferingExport.dtd,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CourseOfferingExport.dtd 17 Jun 2008 21:24:51 -0000 1.9 --- CourseOfferingExport.dtd 1 Dec 2010 11:10:48 -0000 1.10 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: Department.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Department.dtd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Department.dtd 17 Jun 2008 21:24:51 -0000 1.4 --- Department.dtd 1 Dec 2010 11:10:48 -0000 1.5 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: PosMajor.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/PosMajor.dtd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PosMajor.dtd 17 Jun 2008 21:24:51 -0000 1.3 --- PosMajor.dtd 1 Dec 2010 11:10:48 -0000 1.4 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: StudentCourse.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/StudentCourse.dtd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** StudentCourse.dtd 29 Mar 2009 15:04:03 -0000 1.5 --- StudentCourse.dtd 1 Dec 2010 11:10:48 -0000 1.6 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: Student.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Student.dtd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Student.dtd 17 Jun 2008 21:24:51 -0000 1.3 --- Student.dtd 1 Dec 2010 11:10:48 -0000 1.4 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: Session.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Session.dtd,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Session.dtd 14 Oct 2009 20:03:04 -0000 1.6 --- Session.dtd 1 Dec 2010 11:10:48 -0000 1.7 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: BuildingRoom.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/BuildingRoom.dtd,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** BuildingRoom.dtd 17 Jun 2008 21:24:51 -0000 1.6 --- BuildingRoom.dtd 1 Dec 2010 11:10:48 -0000 1.7 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> *************** *** 41,46 **** <!ATTLIST room externalId CDATA #IMPLIED > <!ATTLIST room instructional ( false | False | true | True ) #REQUIRED > ! <!ATTLIST room locationX CDATA #REQUIRED > ! <!ATTLIST room locationY CDATA #REQUIRED > <!ATTLIST room roomClassification CDATA #REQUIRED > <!ATTLIST room roomNumber CDATA #REQUIRED > --- 41,46 ---- <!ATTLIST room externalId CDATA #IMPLIED > <!ATTLIST room instructional ( false | False | true | True ) #REQUIRED > ! <!ATTLIST room locationX CDATA #IMPLIED > ! <!ATTLIST room locationY CDATA #IMPLIED > <!ATTLIST room roomClassification CDATA #REQUIRED > <!ATTLIST room roomNumber CDATA #REQUIRED > Index: AcademicArea.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/AcademicArea.dtd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AcademicArea.dtd 17 Jun 2008 21:24:51 -0000 1.3 --- AcademicArea.dtd 1 Dec 2010 11:10:48 -0000 1.4 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: StudentSectioning.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/StudentSectioning.dtd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** StudentSectioning.dtd 23 Jan 2009 03:10:00 -0000 1.4 --- StudentSectioning.dtd 1 Dec 2010 11:10:48 -0000 1.5 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,24 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> <!ELEMENT acadArea ( major*, minor* ) > ! <!ATTLIST acadArea abbv NMTOKEN #REQUIRED > ! <!ATTLIST acadArea classification NMTOKEN #REQUIRED > <!ELEMENT acknowledgement ( message* ) > --- 14,24 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> <!ELEMENT acadArea ( major*, minor* ) > ! <!ATTLIST acadArea abbv CDATA #REQUIRED > ! <!ATTLIST acadArea classification CDATA #REQUIRED > <!ELEMENT acknowledgement ( message* ) > *************** *** 26,32 **** <!ELEMENT alternative EMPTY > ! <!ATTLIST alternative courseNumber NMTOKEN #REQUIRED > ! <!ATTLIST alternative subjectArea NMTOKEN #REQUIRED > ! <!ATTLIST alternative title NMTOKEN #IMPLIED > <!ELEMENT cancelStudent EMPTY > --- 26,32 ---- <!ELEMENT alternative EMPTY > ! <!ATTLIST alternative courseNumber CDATA #REQUIRED > ! <!ATTLIST alternative subjectArea CDATA #REQUIRED > ! <!ATTLIST alternative title CDATA #IMPLIED > <!ELEMENT cancelStudent EMPTY > *************** *** 35,74 **** <!ATTLIST choice available ( false | true ) #IMPLIED > <!ATTLIST choice date CDATA #IMPLIED > ! <!ATTLIST choice days NMTOKEN #IMPLIED > ! <!ATTLIST choice endTime NMTOKEN #IMPLIED > ! <!ATTLIST choice id NMTOKEN #REQUIRED > <!ATTLIST choice instructor CDATA #IMPLIED > <!ATTLIST choice selection ( select | wait ) #IMPLIED > ! <!ATTLIST choice startTime NMTOKEN #IMPLIED > <!ATTLIST choice time CDATA #IMPLIED > <!ELEMENT class ( choice* ) > ! <!ATTLIST class assignmentId NMTOKEN #REQUIRED > <!ATTLIST class date CDATA #IMPLIED > ! <!ATTLIST class days NMTOKEN #IMPLIED > ! <!ATTLIST class endTime NMTOKEN #IMPLIED > ! <!ATTLIST class id NMTOKEN #REQUIRED > <!ATTLIST class instructor CDATA #IMPLIED > <!ATTLIST class location CDATA #IMPLIED > ! <!ATTLIST class name NMTOKEN #IMPLIED > <!ATTLIST class note CDATA #IMPLIED > ! <!ATTLIST class parent NMTOKEN #IMPLIED > ! <!ATTLIST class startTime NMTOKEN #IMPLIED > <!ATTLIST class time CDATA #IMPLIED > <!ELEMENT courseOffering ( alternative | class )* > <!ATTLIST courseOffering alternative ( false | true ) #IMPLIED > ! <!ATTLIST courseOffering courseNumber NMTOKEN #REQUIRED > ! <!ATTLIST courseOffering credit NMTOKEN #IMPLIED > ! <!ATTLIST courseOffering subjectArea NMTOKEN #REQUIRED > ! <!ATTLIST courseOffering title NMTOKEN #IMPLIED > <!ATTLIST courseOffering waitlist ( false | true ) #IMPLIED > <!ELEMENT courseRequests ( courseOffering | freeTime )* > ! <!ATTLIST courseRequests distribution ( dense | spread ) #REQUIRED > <!ELEMENT depends ( depends* ) > ! <!ATTLIST depends choice NMTOKEN #REQUIRED > ! <!ATTLIST depends class NMTOKEN #REQUIRED > <!ATTLIST depends selection ( select | wait ) #IMPLIED > --- 35,74 ---- <!ATTLIST choice available ( false | true ) #IMPLIED > <!ATTLIST choice date CDATA #IMPLIED > ! <!ATTLIST choice days CDATA #IMPLIED > ! <!ATTLIST choice endTime CDATA #IMPLIED > ! <!ATTLIST choice id CDATA #REQUIRED > <!ATTLIST choice instructor CDATA #IMPLIED > <!ATTLIST choice selection ( select | wait ) #IMPLIED > ! <!ATTLIST choice startTime CDATA #IMPLIED > <!ATTLIST choice time CDATA #IMPLIED > <!ELEMENT class ( choice* ) > ! <!ATTLIST class assignmentId CDATA #REQUIRED > <!ATTLIST class date CDATA #IMPLIED > ! <!ATTLIST class days CDATA #IMPLIED > ! <!ATTLIST class endTime CDATA #IMPLIED > ! <!ATTLIST class id CDATA #REQUIRED > <!ATTLIST class instructor CDATA #IMPLIED > <!ATTLIST class location CDATA #IMPLIED > ! <!ATTLIST class name CDATA #IMPLIED > <!ATTLIST class note CDATA #IMPLIED > ! <!ATTLIST class parent CDATA #IMPLIED > ! <!ATTLIST class startTime CDATA #IMPLIED > <!ATTLIST class time CDATA #IMPLIED > <!ELEMENT courseOffering ( alternative | class )* > <!ATTLIST courseOffering alternative ( false | true ) #IMPLIED > ! <!ATTLIST courseOffering courseNumber CDATA #REQUIRED > ! <!ATTLIST courseOffering credit CDATA #IMPLIED > ! <!ATTLIST courseOffering subjectArea CDATA #REQUIRED > ! <!ATTLIST courseOffering title CDATA #IMPLIED > <!ATTLIST courseOffering waitlist ( false | true ) #IMPLIED > <!ELEMENT courseRequests ( courseOffering | freeTime )* > ! <!ATTLIST courseRequests distribution ( dense | spread ) #IMPLIED > <!ELEMENT depends ( depends* ) > ! <!ATTLIST depends choice CDATA #REQUIRED > ! <!ATTLIST depends class CDATA #REQUIRED > <!ATTLIST depends selection ( select | wait ) #IMPLIED > *************** *** 80,115 **** <!ELEMENT freeTime EMPTY > ! <!ATTLIST freeTime days NMTOKEN #REQUIRED > ! <!ATTLIST freeTime endTime NMTOKEN #REQUIRED > ! <!ATTLIST freeTime length NMTOKEN #IMPLIED > ! <!ATTLIST freeTime startTime NMTOKEN #REQUIRED > <!ATTLIST freeTime time CDATA #IMPLIED > <!ELEMENT groupAffiliation EMPTY > ! <!ATTLIST groupAffiliation code NMTOKEN #REQUIRED > <!ELEMENT major EMPTY > ! <!ATTLIST major code NMTOKEN #REQUIRED > <!ELEMENT message ( #PCDATA ) > ! <!ATTLIST message type NMTOKEN #REQUIRED > <!ELEMENT minor EMPTY > ! <!ATTLIST minor code NMTOKEN #REQUIRED > <!ELEMENT name EMPTY > ! <!ATTLIST name first NMTOKEN #REQUIRED > ! <!ATTLIST name last NMTOKEN #REQUIRED > ! <!ATTLIST name middle NMTOKEN #REQUIRED > <!ELEMENT notification ( student ) > ! <!ATTLIST notification campus NMTOKEN #REQUIRED > ! <!ATTLIST notification year NMTOKEN #REQUIRED > ! <!ATTLIST notification term NMTOKEN #REQUIRED > ! <!ELEMENT request ( student ) > ! <!ATTLIST request campus NMTOKEN #REQUIRED > ! <!ATTLIST request year NMTOKEN #REQUIRED > ! <!ATTLIST request term NMTOKEN #REQUIRED > <!ELEMENT requestSchedule ( courseOffering )* > --- 80,115 ---- <!ELEMENT freeTime EMPTY > ! <!ATTLIST freeTime days CDATA #REQUIRED > ! <!ATTLIST freeTime endTime CDATA #REQUIRED > ! <!ATTLIST freeTime length CDATA #IMPLIED > ! <!ATTLIST freeTime startTime CDATA #REQUIRED > <!ATTLIST freeTime time CDATA #IMPLIED > <!ELEMENT groupAffiliation EMPTY > ! <!ATTLIST groupAffiliation code CDATA #REQUIRED > <!ELEMENT major EMPTY > ! <!ATTLIST major code CDATA #REQUIRED > <!ELEMENT message ( #PCDATA ) > ! <!ATTLIST message type CDATA #REQUIRED > <!ELEMENT minor EMPTY > ! <!ATTLIST minor code CDATA #REQUIRED > <!ELEMENT name EMPTY > ! <!ATTLIST name first CDATA #REQUIRED > ! <!ATTLIST name last CDATA #REQUIRED > ! <!ATTLIST name middle CDATA #REQUIRED > <!ELEMENT notification ( student ) > ! <!ATTLIST notification campus CDATA #REQUIRED > ! <!ATTLIST notification year CDATA #REQUIRED > ! <!ATTLIST notification term CDATA #REQUIRED > ! <!ELEMENT request ( student+ ) > ! <!ATTLIST request campus CDATA #REQUIRED > ! <!ATTLIST request year CDATA #REQUIRED > ! <!ATTLIST request term CDATA #REQUIRED > <!ELEMENT requestSchedule ( courseOffering )* > *************** *** 117,123 **** <!ELEMENT response ( student ) > ! <!ATTLIST response campus NMTOKEN #REQUIRED > ! <!ATTLIST response year NMTOKEN #REQUIRED > ! <!ATTLIST response term NMTOKEN #REQUIRED > <!ELEMENT retrieveCourseRequests EMPTY > --- 117,123 ---- <!ELEMENT response ( student ) > ! <!ATTLIST response campus CDATA #REQUIRED > ! <!ATTLIST response year CDATA #REQUIRED > ! <!ATTLIST response term CDATA #REQUIRED > <!ELEMENT retrieveCourseRequests EMPTY > *************** *** 127,135 **** <!ELEMENT student ( updateDemographics?, updateCourseRequests?, requestSchedule?, retrieveCourseRequests?, cancelStudent?, acknowledgement?, courseRequests?, schedule?, message* ) > ! <!ATTLIST student key NMTOKEN #REQUIRED > <!ELEMENT updateCourseRequests ( courseOffering | freeTime )* > <!ATTLIST updateCourseRequests commit ( false | true ) #REQUIRED > ! <!ATTLIST updateCourseRequests distribution ( dense | spread ) #REQUIRED > <!ELEMENT updateDemographics ( name, email?, acadArea+, major*, minor*, disability*, groupAffiliation* ) > --- 127,135 ---- <!ELEMENT student ( updateDemographics?, updateCourseRequests?, requestSchedule?, retrieveCourseRequests?, cancelStudent?, acknowledgement?, courseRequests?, schedule?, message* ) > ! <!ATTLIST student key CDATA #REQUIRED > <!ELEMENT updateCourseRequests ( courseOffering | freeTime )* > <!ATTLIST updateCourseRequests commit ( false | true ) #REQUIRED > ! <!ATTLIST updateCourseRequests distribution ( dense | spread ) #IMPLIED > <!ELEMENT updateDemographics ( name, email?, acadArea+, major*, minor*, disability*, groupAffiliation* ) > Index: SubjectArea.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/SubjectArea.dtd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SubjectArea.dtd 17 Jun 2008 21:24:51 -0000 1.4 --- SubjectArea.dtd 1 Dec 2010 11:10:48 -0000 1.5 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: CourseCatalog.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/CourseCatalog.dtd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CourseCatalog.dtd 17 Jun 2008 21:24:51 -0000 1.3 --- CourseCatalog.dtd 1 Dec 2010 11:10:48 -0000 1.4 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: StudentGroupReservation.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/StudentGroupReservation.dtd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** StudentGroupReservation.dtd 17 Jun 2008 21:24:51 -0000 1.3 --- StudentGroupReservation.dtd 1 Dec 2010 11:10:48 -0000 1.4 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: AcademicAreaReservation.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/AcademicAreaReservation.dtd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AcademicAreaReservation.dtd 17 Jun 2008 21:24:51 -0000 1.3 --- AcademicAreaReservation.dtd 1 Dec 2010 11:10:48 -0000 1.4 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: StudentAccomodation.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/StudentAccomodation.dtd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** StudentAccomodation.dtd 17 Jun 2008 21:24:51 -0000 1.3 --- StudentAccomodation.dtd 1 Dec 2010 11:10:48 -0000 1.4 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: CourseOfferingReservation.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/CourseOfferingReservation.dtd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CourseOfferingReservation.dtd 17 Jun 2008 21:24:51 -0000 1.3 --- CourseOfferingReservation.dtd 1 Dec 2010 11:10:48 -0000 1.4 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> --- NEW FILE: Curricula_3_2.dtd --- <!-- * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * --> <!ELEMENT curricula ( curriculum+ ) > <!ATTLIST curricula campus CDATA #REQUIRED > <!ATTLIST curricula term CDATA #REQUIRED > <!ATTLIST curricula year CDATA #REQUIRED > <!ATTLIST curricula created CDATA #IMPLIED > <!ELEMENT curriculum ( academicArea, department?, major*, classification* ) > <!ATTLIST curriculum abbreviation CDATA #IMPLIED > <!ATTLIST curriculum name CDATA #IMPLIED > <!ELEMENT academicArea EMPTY > <!ATTLIST academicArea externalId CDATA #IMPLIED > <!ATTLIST academicArea abbreviation CDATA #REQUIRED > <!ELEMENT department EMPTY > <!ATTLIST department externalId CDATA #IMPLIED > <!ATTLIST department code CDATA #REQUIRED > <!ELEMENT major EMPTY > <!ATTLIST major externalId CDATA #IMPLIED > <!ATTLIST major code CDATA #REQUIRED > <!ELEMENT classification ( academicClassification, course* ) > <!ATTLIST classification name CDATA #IMPLIED > <!ATTLIST classification enrollment NMTOKEN #REQUIRED > <!ELEMENT academicClassification EMPTY > <!ATTLIST academicClassification externalId CDATA #IMPLIED > <!ATTLIST academicClassification code CDATA #REQUIRED > <!ELEMENT course ( group* ) > <!ATTLIST course externalId CDATA #IMPLIED > <!ATTLIST course subject CDATA #REQUIRED > <!ATTLIST course courseNbr CDATA #REQUIRED > <!ATTLIST course share NMTOKEN #IMPLIED > <!ELEMENT group EMPTY > <!ATTLIST group id CDATA #REQUIRED > <!ATTLIST group name CDATA #IMPLIED > <!ATTLIST group type ( OPT | REQ | opt | req ) #IMPLIED > |
|
From: Tomas M. <to...@us...> - 2010-12-01 11:11:27
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/course/ui In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/JavaSource/org/unitime/timetable/solver/course/ui Modified Files: ClassInstructorInfo.java ClassTimeInfo.java ClassInfo.java ClassAssignment.java ClassAssignmentInfo.java ClassRoomInfo.java ClassProposedChange.java ClassInfoModel.java Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: ClassInstructorInfo.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/course/ui/ClassInstructorInfo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ClassInstructorInfo.java 12 Jul 2009 15:53:56 -0000 1.1 --- ClassInstructorInfo.java 1 Dec 2010 11:10:48 -0000 1.2 *************** *** 7,11 **** public class ClassInstructorInfo implements Serializable, Comparable<ClassInstructorInfo> { ! protected Long iId; protected String iExternalUniqueId = null; protected String iName = null; --- 7,12 ---- public class ClassInstructorInfo implements Serializable, Comparable<ClassInstructorInfo> { ! private static final long serialVersionUID = 8576391767085203451L; ! protected Long iId; protected String iExternalUniqueId = null; protected String iName = null; Index: ClassAssignment.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/course/ui/ClassAssignment.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ClassAssignment.java 14 Jul 2009 18:38:47 -0000 1.2 --- ClassAssignment.java 1 Dec 2010 11:10:48 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.course.ui; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.course.ui; *************** *** 35,38 **** --- 35,39 ---- */ public class ClassAssignment extends ClassInfo implements Serializable { + private static final long serialVersionUID = -5426079388298794551L; protected Vector<ClassRoomInfo> iRooms = new Vector<ClassRoomInfo>(); protected ClassTimeInfo iTime = null; Index: ClassInfo.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/course/ui/ClassInfo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ClassInfo.java 12 Jul 2009 15:53:56 -0000 1.1 --- ClassInfo.java 1 Dec 2010 11:10:48 -0000 1.2 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.course.ui; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.course.ui; *************** *** 35,39 **** */ public class ClassInfo implements Serializable, Comparable<ClassInfo> { ! protected String iClassName = null; protected String iClassTitle = null; protected Long iClassId = null; --- 35,40 ---- */ public class ClassInfo implements Serializable, Comparable<ClassInfo> { ! private static final long serialVersionUID = 7324981486913342471L; ! protected String iClassName = null; protected String iClassTitle = null; protected Long iClassId = null; *************** *** 64,70 **** iDatePatternHtml = "Default ("+iDatePatternHtml+")"; iDatePatternHtml += ! "<img style=\"cursor: pointer;\" src=\"scripts/jscalendar/calendar_1.gif\" border=\"0\" "+ ! "onclick=\"window.open('user/dispDatePattern.jsp?id="+clazz.effectiveDatePattern().getUniqueId()+"&class="+clazz.getUniqueId()+"',"+ ! "'datepatt','width=800,height=410,resizable=no,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no');\">"; Class_ parent = clazz.getParentClass(); while (parent!=null) { --- 65,71 ---- iDatePatternHtml = "Default ("+iDatePatternHtml+")"; iDatePatternHtml += ! " <img style=\"cursor: pointer;\" src=\"scripts/jscalendar/calendar_1.gif\" border=\"0\" "+ ! "onclick=\"showGwtDialog('Preview of "+clazz.effectiveDatePattern().getName()+"', 'user/dispDatePattern.jsp?id="+clazz.effectiveDatePattern().getUniqueId()+"&class="+clazz.getUniqueId()+"','840','520');" + ! "\">"; Class_ parent = clazz.getParentClass(); while (parent!=null) { Index: ClassInfoModel.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/course/ui/ClassInfoModel.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ClassInfoModel.java 23 Jul 2010 11:00:31 -0000 1.10 --- ClassInfoModel.java 1 Dec 2010 11:10:49 -0000 1.11 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2009 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2009 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,24 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.course.ui; import java.io.Serializable; import java.util.Calendar; import java.util.Collection; --- 15,25 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.course.ui; import java.io.Serializable; + import java.util.ArrayList; import java.util.Calendar; import java.util.Collection; *************** *** 73,76 **** --- 74,78 ---- import org.unitime.timetable.model.RoomSharingModel; import org.unitime.timetable.model.SchedulingSubpart; + import org.unitime.timetable.model.StudentSectioningQueue; import org.unitime.timetable.model.TimePatternModel; import org.unitime.timetable.model.TimePref; *************** *** 86,90 **** */ public class ClassInfoModel implements Serializable { ! private static Log sLog = LogFactory.getLog(ClassInfoModel.class); private ClassInfo iClass = null; private ClassInfoForm iForm = null; --- 88,93 ---- */ public class ClassInfoModel implements Serializable { ! private static final long serialVersionUID = 1373805772613891251L; ! private static Log sLog = LogFactory.getLog(ClassInfoModel.class); private ClassInfo iClass = null; private ClassInfoForm iForm = null; *************** *** 92,96 **** private Collection<ClassAssignment> iTimes = null; private Vector<ClassRoomInfo> iRooms = null; - private int iTimesTableOrd = 0; private String iManagerExternalId = null; private boolean iShowStudentConflicts = "true".equalsIgnoreCase(ApplicationProperties.getProperty("tmtbl.classAssign.showStudentConflicts", "true")); --- 95,98 ---- *************** *** 208,218 **** } ! public String assign() { if (iChange==null) return "Nothing to assign."; sLog.info("About to be assigned: "+iChange); org.hibernate.Session hibSession = Class_DAO.getInstance().getSession(); String message = null; for (ClassAssignment assignment : iChange.getConflicts()) { try { String m = assignment.getClazz(hibSession).unassignCommited(iManagerExternalId, hibSession); if (m!=null) message = (message==null?"":message+"\n")+m; --- 210,222 ---- } ! public String assign(Long sessionId) { if (iChange==null) return "Nothing to assign."; sLog.info("About to be assigned: "+iChange); org.hibernate.Session hibSession = Class_DAO.getInstance().getSession(); String message = null; + List<Long> classIds = new ArrayList<Long>(); for (ClassAssignment assignment : iChange.getConflicts()) { try { + classIds.add(assignment.getClassId()); String m = assignment.getClazz(hibSession).unassignCommited(iManagerExternalId, hibSession); if (m!=null) message = (message==null?"":message+"\n")+m; *************** *** 223,226 **** --- 227,231 ---- for (ClassAssignment assignment : iChange.getAssignments()) { try { + classIds.add(assignment.getClassId()); String m = assignment.getClazz(hibSession).assignCommited(getAssignmentInfo(assignment), iManagerExternalId, hibSession); if (m!=null) message = (message==null?"":message+"\n")+m; *************** *** 229,233 **** } } ! // TODO: Update student sectioning information return message; } --- 234,241 ---- } } ! ! StudentSectioningQueue.classAssignmentChanged(hibSession, sessionId, classIds); ! hibSession.flush(); ! return message; } *************** *** 339,344 **** public void apply(HttpServletRequest request, ClassInfoForm form) { - if (request.getParameter("pord")!=null) - iTimesTableOrd = Integer.parseInt(request.getParameter("pord")); iForm = form; } --- 347,350 ---- *************** *** 350,354 **** public String getTimesTable() { try { - ClassAssignmentInfo current = getClassAssignment(); String ret = ""; ret += "<script language='javascript'>"; --- 356,359 ---- *************** *** 472,476 **** public String getStudentConflictTable() { ! String ret = "<table border='0' width='95%' cellspacing='0' cellpadding='3'>"; ret += "<tr>"; ret += "<td><i>Students</i></td>"; --- 477,481 ---- public String getStudentConflictTable() { ! String ret = "<table border='0' width='100%' cellspacing='0' cellpadding='3'>"; ret += "<tr>"; ret += "<td><i>Students</i></td>"; *************** *** 535,539 **** times: for (int day=0;day<pattern.getNrDays(); day++) { String pref = pattern.getPreference(day,time); - Iterator startSlotsIterator = pattern.getStartSlots(day,time).iterator(); if (onlyReq && !pref.equals(PreferenceLevel.sRequired)) { pref = PreferenceLevel.sProhibited; --- 540,543 ---- *************** *** 947,965 **** bounds[0], bounds[1], RoomAvailabilityInterface.sClassType); ! Collection<TimeBlock> timesToCheck = null; ! if ("true".equals(ApplicationProperties.getProperty("tmtbl.classAssign.ignorePastMeetings", "true"))) { ! timesToCheck = new Vector(); ! for (TimeBlock time: times) { ! if (time.getEndTime().compareTo(today) > 0) ! timesToCheck.add(time); ! } ! } else { ! timesToCheck = times; ! } ! TimeBlock time = period.overlaps(timesToCheck); ! if (time!=null) { ! if (room.getLabel().equals(filter)) iForm.setMessage("Room "+room.getLabel()+" is not available for "+period.getLongName()+" due to "+time); ! sLog.info("Room "+room.getLabel()+" is not available for "+period.getLongName()+" due to "+time); ! continue rooms; } } --- 951,971 ---- bounds[0], bounds[1], RoomAvailabilityInterface.sClassType); ! if (times != null && !times.isEmpty()) { ! Collection<TimeBlock> timesToCheck = null; ! if ("true".equals(ApplicationProperties.getProperty("tmtbl.classAssign.ignorePastMeetings", "true"))) { ! timesToCheck = new Vector(); ! for (TimeBlock time: times) { ! if (time.getEndTime().compareTo(today) > 0) ! timesToCheck.add(time); ! } ! } else { ! timesToCheck = times; ! } ! TimeBlock time = period.overlaps(timesToCheck); ! if (time!=null) { ! if (room.getLabel().equals(filter)) iForm.setMessage("Room "+room.getLabel()+" is not available for "+period.getLongName()+" due to "+time); ! sLog.info("Room "+room.getLabel()+" is not available for "+period.getLongName()+" due to "+time); ! continue rooms; ! } } } Index: ClassAssignmentInfo.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/course/ui/ClassAssignmentInfo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ClassAssignmentInfo.java 12 Jul 2009 15:53:56 -0000 1.1 --- ClassAssignmentInfo.java 1 Dec 2010 11:10:49 -0000 1.2 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.course.ui; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.course.ui; *************** *** 38,41 **** --- 38,42 ---- */ public class ClassAssignmentInfo extends ClassAssignment implements Serializable { + private static final long serialVersionUID = -4277344877497509285L; private TreeSet<StudentConflict> iStudentConflicts = new TreeSet(); *************** *** 91,95 **** public String getConflictTable(boolean header) { ! String ret = "<table border='0' width='95%' cellspacing='0' cellpadding='3'>"; if (header) { ret += "<tr>"; --- 92,96 ---- public String getConflictTable(boolean header) { ! String ret = "<table border='0' width='100%' cellspacing='0' cellpadding='3'>"; if (header) { ret += "<tr>"; *************** *** 115,118 **** --- 116,120 ---- public class StudentConflict implements Serializable, Comparable<StudentConflict> { + private static final long serialVersionUID = -4480647127446582658L; private ClassAssignment iOtherClass = null; private Set<Long> iConflictingStudents = null; Index: ClassProposedChange.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/course/ui/ClassProposedChange.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ClassProposedChange.java 12 Jul 2009 15:53:56 -0000 1.1 --- ClassProposedChange.java 1 Dec 2010 11:10:49 -0000 1.2 *************** *** 9,20 **** public class ClassProposedChange implements Serializable, Comparable<ClassProposedChange> { ! private Vector<ClassAssignmentInfo> iAssignments = null; private Vector<ClassAssignment> iConflicts = null; private Hashtable<Long,ClassAssignment> iInitials = null; private Long iSelectedClassId = null; - private double iValue = 0; - private int iNrAssigned = 0; - public ClassProposedChange() { iAssignments = new Vector(); iConflicts = new Vector(); iInitials = new Hashtable(); --- 9,18 ---- public class ClassProposedChange implements Serializable, Comparable<ClassProposedChange> { ! private static final long serialVersionUID = 1510362646798301408L; ! private Vector<ClassAssignmentInfo> iAssignments = null; private Vector<ClassAssignment> iConflicts = null; private Hashtable<Long,ClassAssignment> iInitials = null; private Long iSelectedClassId = null; public ClassProposedChange() { iAssignments = new Vector(); iConflicts = new Vector(); iInitials = new Hashtable(); Index: ClassTimeInfo.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/course/ui/ClassTimeInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ClassTimeInfo.java 14 Jul 2009 18:38:47 -0000 1.2 --- ClassTimeInfo.java 1 Dec 2010 11:10:48 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,25 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.course.ui; import java.io.Serializable; - import java.text.SimpleDateFormat; import java.util.BitSet; import java.util.Calendar; --- 15,24 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.course.ui; import java.io.Serializable; import java.util.BitSet; import java.util.Calendar; *************** *** 46,51 **** */ public class ClassTimeInfo implements Serializable, Comparable<ClassTimeInfo> { ! private static SimpleDateFormat sDateFormatShort = new SimpleDateFormat("MM/dd", Locale.US); ! private int iStartSlot; private int iPreference; --- 45,51 ---- */ public class ClassTimeInfo implements Serializable, Comparable<ClassTimeInfo> { ! private static final long serialVersionUID = -342155197631035341L; ! ! private int iStartSlot; private int iPreference; *************** *** 271,275 **** public class DummyTimeBlock implements TimeBlock { ! private Date iD1, iD2; private DummyTimeBlock(Date d, int breakTimeStart, int breakTimeStop) { Calendar c = Calendar.getInstance(Locale.US); --- 271,276 ---- public class DummyTimeBlock implements TimeBlock { ! private static final long serialVersionUID = -3806087343289917036L; ! private Date iD1, iD2; private DummyTimeBlock(Date d, int breakTimeStart, int breakTimeStop) { Calendar c = Calendar.getInstance(Locale.US); Index: ClassRoomInfo.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/course/ui/ClassRoomInfo.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ClassRoomInfo.java 6 Nov 2009 14:51:52 -0000 1.4 --- ClassRoomInfo.java 1 Dec 2010 11:10:49 -0000 1.5 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.course.ui; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.course.ui; *************** *** 22,25 **** --- 22,28 ---- import java.io.Serializable; + import net.sf.cpsolver.ifs.util.DistanceMetric; + + import org.unitime.timetable.ApplicationProperties; import org.unitime.timetable.model.Location; import org.unitime.timetable.model.PreferenceLevel; *************** *** 38,42 **** private int iPreference = 0; private int iCapacity; ! private int iX = -1, iY = -1; private boolean iIgnoreTooFar; private transient Location iLocation = null; --- 41,45 ---- private int iPreference = 0; private int iCapacity; ! private Double iX = null, iY = null; private boolean iIgnoreTooFar; private transient Location iLocation = null; *************** *** 44,47 **** --- 47,51 ---- private boolean iIgnoreRoomChecks; private String iRoomType = null; + private transient static DistanceMetric sDistanceMetric = null; public ClassRoomInfo(Location location, int preference) { *************** *** 51,56 **** iCapacity = location.getCapacity(); iPreference = preference; ! iX = (location.getCoordinateX()==null?-1:location.getCoordinateX().intValue()); ! iY = (location.getCoordinateY()==null?-1:location.getCoordinateY().intValue()); iIgnoreTooFar = location.isIgnoreTooFar().booleanValue(); iIgnoreRoomChecks = location.isIgnoreRoomCheck(); --- 55,60 ---- iCapacity = location.getCapacity(); iPreference = preference; ! iX = location.getCoordinateX(); ! iY = location.getCoordinateY(); iIgnoreTooFar = location.isIgnoreTooFar().booleanValue(); iIgnoreRoomChecks = location.isIgnoreRoomCheck(); *************** *** 113,125 **** } ! public int getCoordX() { return iX; } ! public int getCoordY() { return iY; } ! public int getDistance(ClassRoomInfo other) { if (isIgnoreTooFar() || other.isIgnoreTooFar()) return 0; ! if (getCoordX()<0 || getCoordY()<0 || other.getCoordX()<0 || other.getCoordY()<0) return 10000; ! int dx = getCoordX()-other.getCoordX(); ! int dy = getCoordY()-other.getCoordY(); ! return (int)Math.sqrt(dx*dx+dy*dy); } --- 117,130 ---- } ! public Double getCoordX() { return iX; } ! public Double getCoordY() { return iY; } ! public double getDistance(ClassRoomInfo other) { if (isIgnoreTooFar() || other.isIgnoreTooFar()) return 0; ! if (sDistanceMetric == null) { ! sDistanceMetric = new DistanceMetric( ! DistanceMetric.Ellipsoid.valueOf(ApplicationProperties.getProperty("unitime.distance.ellipsoid", DistanceMetric.Ellipsoid.LEGACY.name()))); ! } ! return sDistanceMetric.getDistanceInMeters(getCoordX(), getCoordY(), other.getCoordX(), other.getCoordY()); } |
|
From: Tomas M. <to...@us...> - 2010-12-01 11:11:27
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/reports/enrollment In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/JavaSource/org/unitime/timetable/reports/enrollment Modified Files: MultipleCourseEnrollmentsAuditReport.java PdfEnrollmentAuditReport.java EnrollmentsViolatingCourseStructureAuditReport.java MissingCourseEnrollmentsAuditReport.java Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: MultipleCourseEnrollmentsAuditReport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/reports/enrollment/MultipleCourseEnrollmentsAuditReport.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MultipleCourseEnrollmentsAuditReport.java 27 Mar 2010 11:11:41 -0000 1.1 --- MultipleCourseEnrollmentsAuditReport.java 1 Dec 2010 11:10:49 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.reports.enrollment; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.reports.enrollment; *************** *** 32,36 **** import org.unitime.timetable.model.dao.StudentClassEnrollmentDAO; ! import com.lowagie.text.DocumentException; /** --- 32,36 ---- import org.unitime.timetable.model.dao.StudentClassEnrollmentDAO; ! import com.itextpdf.text.DocumentException; /** *************** *** 50,54 **** @Override public void printReport() throws DocumentException { - int n = iNrLines - 3; setHeader(buildHeaderString()); List results = getAuditResults(getSubjectAreas()); --- 50,53 ---- *************** *** 164,168 **** private class MultipleCourseEnrollmentsAuditResult extends EnrollmentAuditResult { - private String itype; private Long studentUniqueId; private Long subpartId; --- 163,166 ---- *************** *** 173,177 **** super(result); if (result[7] != null) this.studentUniqueId = new Long(result[7].toString()); - if (result[8] != null) this.itype = result[8].toString(); if (result[9] != null) this.subpartId = new Long(result[9].toString()); findClasses(); --- 171,174 ---- *************** *** 195,201 **** } - public String itypeString(){ - return(itype); - } public String classesListStr(){ --- 192,195 ---- Index: EnrollmentsViolatingCourseStructureAuditReport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/reports/enrollment/EnrollmentsViolatingCourseStructureAuditReport.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EnrollmentsViolatingCourseStructureAuditReport.java 4 Oct 2010 20:30:49 -0000 1.3 --- EnrollmentsViolatingCourseStructureAuditReport.java 1 Dec 2010 11:10:49 -0000 1.4 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ *************** *** 31,35 **** import org.unitime.timetable.model.SubjectArea; ! import com.lowagie.text.DocumentException; /** --- 31,35 ---- import org.unitime.timetable.model.SubjectArea; ! import com.itextpdf.text.DocumentException; /** *************** *** 51,55 **** @Override public void printReport() throws DocumentException { - int n = iNrLines - 3; setHeader(buildHeaderString()); List results = getAuditResults(getSubjectAreas()); --- 51,54 ---- Index: PdfEnrollmentAuditReport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/reports/enrollment/PdfEnrollmentAuditReport.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PdfEnrollmentAuditReport.java 27 Mar 2010 11:11:41 -0000 1.1 --- PdfEnrollmentAuditReport.java 1 Dec 2010 11:10:49 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.reports.enrollment; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.reports.enrollment; *************** *** 31,35 **** import org.unitime.timetable.reports.PdfLegacyReport; ! import com.lowagie.text.DocumentException; /** --- 31,35 ---- import org.unitime.timetable.reports.PdfLegacyReport; ! import com.itextpdf.text.DocumentException; /** Index: MissingCourseEnrollmentsAuditReport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/reports/enrollment/MissingCourseEnrollmentsAuditReport.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MissingCourseEnrollmentsAuditReport.java 27 Mar 2010 11:11:41 -0000 1.1 --- MissingCourseEnrollmentsAuditReport.java 1 Dec 2010 11:10:49 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.reports.enrollment; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.reports.enrollment; *************** *** 30,34 **** import org.unitime.timetable.model.SubjectArea; ! import com.lowagie.text.DocumentException; /** --- 30,34 ---- import org.unitime.timetable.model.SubjectArea; ! import com.itextpdf.text.DocumentException; /** *************** *** 49,53 **** @Override public void printReport() throws DocumentException { - int n = iNrLines - 3; setHeader(buildHeaderString()); List results = getAuditResults(getSubjectAreas()); --- 49,52 ---- |
|
From: Tomas M. <to...@us...> - 2010-12-01 11:11:27
|
Update of /cvsroot/unitime/UniTime/WebContent/solver In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/WebContent/solver Modified Files: solver.jnlp index.jsp Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: index.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/solver/index.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index.jsp 17 Jun 2008 21:24:56 -0000 1.2 --- index.jsp 1 Dec 2010 11:10:49 -0000 1.3 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <% --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <% Index: solver.jnlp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/solver/solver.jnlp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** solver.jnlp 17 Jun 2008 21:24:56 -0000 1.2 --- solver.jnlp 1 Dec 2010 11:10:49 -0000 1.3 *************** *** 1,10 **** <?xml version="1.0" encoding="UTF-8"?> <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- <?xml version="1.0" encoding="UTF-8"?> <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> <jnlp spec="1.0+" codebase="https://@host@:18443/UniTime/solver"> --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> <jnlp spec="1.0+" codebase="https://@host@:18443/UniTime/solver"> |
|
From: Tomas M. <to...@us...> - 2010-12-01 11:11:26
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/exam/ui In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/JavaSource/org/unitime/timetable/solver/exam/ui Modified Files: ExamInfo.java ExamProposedChange.java ExamAssignment.java ExamSuggestionsInfo.java ExamAssignmentInfo.java ExamInfoModel.java ExamConflictStatisticsInfo.java ExamRoomInfo.java Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: ExamConflictStatisticsInfo.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/exam/ui/ExamConflictStatisticsInfo.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ExamConflictStatisticsInfo.java 17 Jun 2008 21:24:50 -0000 1.4 --- ExamConflictStatisticsInfo.java 1 Dec 2010 11:10:47 -0000 1.5 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.exam.ui; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.exam.ui; *************** *** 22,35 **** import java.io.PrintWriter; import java.io.Serializable; ! import java.text.SimpleDateFormat; ! import java.util.*; import javax.servlet.jsp.JspWriter; - import org.dom4j.Element; - import org.unitime.timetable.model.PreferenceLevel; - import org.unitime.timetable.solver.ui.TimetableInfo; - import org.unitime.timetable.webutil.timegrid.ExamGridTable; - import net.sf.cpsolver.exam.model.Exam; import net.sf.cpsolver.exam.model.ExamDistributionConstraint; --- 22,38 ---- import java.io.PrintWriter; import java.io.Serializable; ! import java.util.Collection; ! import java.util.Collections; ! import java.util.Enumeration; ! import java.util.HashSet; ! import java.util.Hashtable; ! import java.util.Iterator; ! import java.util.Map; ! import java.util.Set; ! import java.util.TreeSet; ! import java.util.Vector; import javax.servlet.jsp.JspWriter; import net.sf.cpsolver.exam.model.Exam; import net.sf.cpsolver.exam.model.ExamDistributionConstraint; *************** *** 43,51 **** import net.sf.cpsolver.ifs.model.Constraint; /** * @author Tomas Muller */ public class ExamConflictStatisticsInfo implements TimetableInfo, Serializable { - private static SimpleDateFormat sDateFormatShort = new SimpleDateFormat("MM/dd", Locale.US); private static final long serialVersionUID = 7L; public static int sVersion = 7; // to be able to do some changes in the future --- 46,58 ---- import net.sf.cpsolver.ifs.model.Constraint; + import org.dom4j.Element; + import org.unitime.timetable.model.PreferenceLevel; + import org.unitime.timetable.solver.ui.TimetableInfo; + import org.unitime.timetable.webutil.timegrid.ExamGridTable; + /** * @author Tomas Muller */ public class ExamConflictStatisticsInfo implements TimetableInfo, Serializable { private static final long serialVersionUID = 7L; public static int sVersion = 7; // to be able to do some changes in the future *************** *** 552,556 **** String onClick = null; if (clickable) ! onClick = "onclick=\"window.open('examInfo.do?examId="+variable.getId()+"&op=Reset','exams','width=1000,height=600,resizable=yes,scrollbars=yes,toolbar=no,location=no,directories=no,status=yes,menubar=no,copyhistory=no').focus();\""; menu_item(out, menuId, variable.getCounter() + "× " + name, description, onClick, true); } --- 559,563 ---- String onClick = null; if (clickable) ! onClick = "onclick=\"showGwtDialog('Examination Assignment', 'examInfo.do?examId="+variable.getId()+"&op=Reset','900','90%');\""; menu_item(out, menuId, variable.getCounter() + "× " + name, description, onClick, true); } *************** *** 569,573 **** String onClick = null; if (clickable) ! onClick = "onclick=\"window.open('examInfo.do?examId="+value.variable().getId()+"&period="+value.getPeriodId()+"&room="+roomLink+"&op=Try&reset=1','exams','width=1000,height=600,resizable=yes,scrollbars=yes,toolbar=no,location=no,directories=no,status=yes,menubar=no,copyhistory=no').focus();\""; menu_item(out, menuId, value.getCounter() + "× " + name, description, onClick, true); } --- 576,580 ---- String onClick = null; if (clickable) ! onClick = "onclick=\"showGwtDialog('Examination Assignment', 'examInfo.do?examId="+value.variable().getId()+"&period="+value.getPeriodId()+"&room="+roomLink+"&op=Try&reset=1','900','90%');\""; menu_item(out, menuId, value.getCounter() + "× " + name, description, onClick, true); } *************** *** 617,621 **** String onClick = null; if (clickable) ! onClick = "onclick=\"window.open('examInfo.do?examId="+assignment.getId()+"&period="+assignment.getPeriodId()+"&room="+roomLink+"&op=Try&reset=1','suggestions','width=1000,height=600,resizable=yes,scrollbars=yes,toolbar=no,location=no,directories=no,status=yes,menubar=no,copyhistory=no').focus();\""; leaf_item(out, assignment.getCounter()+"× "+name, null, onClick); } --- 624,628 ---- String onClick = null; if (clickable) ! onClick = "onclick=\"showGwtDialog('Examination Assignment', 'examInfo.do?examId="+assignment.getId()+"&period="+assignment.getPeriodId()+"&room="+roomLink+"&op=Try&reset=1','900','90%');\""; leaf_item(out, assignment.getCounter()+"× "+name, null, onClick); } Index: ExamProposedChange.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/exam/ui/ExamProposedChange.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ExamProposedChange.java 4 May 2010 16:47:21 -0000 1.4 --- ExamProposedChange.java 1 Dec 2010 11:10:47 -0000 1.5 *************** *** 1,7 **** package org.unitime.timetable.solver.exam.ui; import java.io.Serializable; import java.util.Collection; - import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; --- 1,25 ---- + /* + * UniTime 3.2 (University Timetabling Application) + * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors + * as indicated by the @authors tag. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ package org.unitime.timetable.solver.exam.ui; import java.io.Serializable; import java.util.Collection; import java.util.Hashtable; import java.util.Vector; *************** *** 16,20 **** public class ExamProposedChange implements Serializable, Comparable<ExamProposedChange> { ! private Vector<ExamAssignmentInfo> iAssignments = null; private Vector<ExamAssignment> iConflicts = null; private Hashtable<Long,ExamAssignment> iInitials = null; --- 34,39 ---- public class ExamProposedChange implements Serializable, Comparable<ExamProposedChange> { ! private static final long serialVersionUID = -5497603865422857068L; ! private Vector<ExamAssignmentInfo> iAssignments = null; private Vector<ExamAssignment> iConflicts = null; private Hashtable<Long,ExamAssignment> iInitials = null; *************** *** 46,51 **** } } ! for (Enumeration e=model.assignedVariables().elements();e.hasMoreElements();) { ! Exam exam = (Exam)e.nextElement(); if (resolvedExams.contains(exam)) continue; ExamPlacement current = (ExamPlacement)exam.getAssignment(); --- 65,69 ---- } } ! for (Exam exam: model.assignedVariables()) { if (resolvedExams.contains(exam)) continue; ExamPlacement current = (ExamPlacement)exam.getAssignment(); Index: ExamRoomInfo.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/exam/ui/ExamRoomInfo.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ExamRoomInfo.java 22 May 2008 21:44:45 -0000 1.5 --- ExamRoomInfo.java 1 Dec 2010 11:10:47 -0000 1.6 *************** *** 1,6 **** --- 1,26 ---- + /* + * UniTime 3.2 (University Timetabling Application) + * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors + * as indicated by the @authors tag. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ package org.unitime.timetable.solver.exam.ui; import java.io.Serializable; + import org.unitime.timetable.ApplicationProperties; import org.unitime.timetable.model.Exam; import org.unitime.timetable.model.Location; *************** *** 9,20 **** import net.sf.cpsolver.exam.model.ExamRoom; public class ExamRoomInfo implements Serializable, Comparable<ExamRoomInfo>{ ! private Long iId = null; private String iName = null; private int iPreference = 0; private int iCapacity, iExamCapacity = 0; ! private int iX = -1, iY = -1; private transient Location iLocation = null; public ExamRoomInfo(ExamRoom room, int preference) { --- 29,43 ---- import net.sf.cpsolver.exam.model.ExamRoom; + import net.sf.cpsolver.ifs.util.DistanceMetric; public class ExamRoomInfo implements Serializable, Comparable<ExamRoomInfo>{ ! private static final long serialVersionUID = -5882156641099610154L; ! private Long iId = null; private String iName = null; private int iPreference = 0; private int iCapacity, iExamCapacity = 0; ! private Double iX = null, iY = null; private transient Location iLocation = null; + private transient static DistanceMetric sDistanceMetric = null; public ExamRoomInfo(ExamRoom room, int preference) { *************** *** 34,39 **** iExamCapacity = (location.getExamCapacity()==null?location.getCapacity()/2:location.getExamCapacity()); iPreference = preference; ! iX = (location.getCoordinateX()==null?-1:location.getCoordinateX().intValue()); ! iY = (location.getCoordinateY()==null?-1:location.getCoordinateY().intValue()); } --- 57,62 ---- iExamCapacity = (location.getExamCapacity()==null?location.getCapacity()/2:location.getExamCapacity()); iPreference = preference; ! iX = location.getCoordinateX(); ! iY = location.getCoordinateY(); } *************** *** 77,88 **** } ! public int getCoordX() { return iX; } ! public int getCoordY() { return iY; } ! public int getDistance(ExamRoomInfo other) { ! if (getCoordX()<0 || getCoordY()<0 || other.getCoordX()<0 || other.getCoordY()<0) return 10000; ! int dx = getCoordX()-other.getCoordX(); ! int dy = getCoordY()-other.getCoordY(); ! return (int)Math.sqrt(dx*dx+dy*dy); } --- 100,112 ---- } ! public Double getCoordX() { return iX; } ! public Double getCoordY() { return iY; } ! public double getDistance(ExamRoomInfo other) { ! if (sDistanceMetric == null) { ! sDistanceMetric = new DistanceMetric( ! DistanceMetric.Ellipsoid.valueOf(ApplicationProperties.getProperty("unitime.distance.ellipsoid", DistanceMetric.Ellipsoid.LEGACY.name()))); ! } ! return sDistanceMetric.getDistanceInMeters(getCoordX(), getCoordY(), other.getCoordX(), other.getCoordY()); } Index: ExamInfo.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/exam/ui/ExamInfo.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** ExamInfo.java 4 May 2010 16:47:20 -0000 1.25 --- ExamInfo.java 1 Dec 2010 11:10:47 -0000 1.26 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.exam.ui; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.exam.ui; *************** *** 47,51 **** */ public class ExamInfo implements Serializable, Comparable<ExamInfo> { ! protected String iExamLabel = null; protected Long iExamId = null; protected transient Exam iExam = null; --- 47,52 ---- */ public class ExamInfo implements Serializable, Comparable<ExamInfo> { ! private static final long serialVersionUID = -4407299089673481581L; ! protected String iExamLabel = null; protected Long iExamId = null; protected transient Exam iExam = null; *************** *** 73,78 **** if (!exam.getOwners().isEmpty()) { iSections = new Vector(); ! for (Enumeration e=exam.getOwners().elements();e.hasMoreElements();) { ! net.sf.cpsolver.exam.model.ExamOwner ecs = (net.sf.cpsolver.exam.model.ExamOwner)e.nextElement(); HashSet<Long> studentIds = new HashSet<Long>(); for (Iterator i=ecs.getStudents().iterator();i.hasNext();) --- 74,78 ---- if (!exam.getOwners().isEmpty()) { iSections = new Vector(); ! for (net.sf.cpsolver.exam.model.ExamOwner ecs: exam.getOwners()) { HashSet<Long> studentIds = new HashSet<Long>(); for (Iterator i=ecs.getStudents().iterator();i.hasNext();) *************** *** 82,87 **** } iInstructors = new Vector(); ! for (Enumeration e=exam.constraints().elements();e.hasMoreElements();) { ! Constraint c = (Constraint)e.nextElement(); if (c instanceof ExamInstructor) { ExamInstructor instructor = (ExamInstructor)c; --- 82,86 ---- } iInstructors = new Vector(); ! for (Constraint c: exam.constraints()) { if (c instanceof ExamInstructor) { ExamInstructor instructor = (ExamInstructor)c; *************** *** 99,103 **** iExam = exam; iLength = exam.getLength(); ! iNrStudents = -1; iSeatingType = exam.getSeatingType().intValue(); iPrintOffset = exam.examOffset(); --- 98,102 ---- iExam = exam; iLength = exam.getLength(); ! iNrStudents = (exam.getExamSize() == null ? -1 : exam.getExamSize()); iSeatingType = exam.getSeatingType().intValue(); iPrintOffset = exam.examOffset(); *************** *** 297,301 **** public class ExamSectionInfo implements Serializable, Comparable<ExamSectionInfo> { ! protected Long iId; protected String iName; protected int iNrStudents = -1; --- 296,301 ---- public class ExamSectionInfo implements Serializable, Comparable<ExamSectionInfo> { ! private static final long serialVersionUID = 6052996415395186994L; ! protected Long iId; protected String iName; protected int iNrStudents = -1; *************** *** 403,407 **** public class ExamInstructorInfo implements Serializable, Comparable<ExamInstructorInfo> { ! protected Long iId; protected String iExternalUniqueId = null; protected String iName = null; --- 403,408 ---- public class ExamInstructorInfo implements Serializable, Comparable<ExamInstructorInfo> { ! private static final long serialVersionUID = -6843290015053081071L; ! protected Long iId; protected String iExternalUniqueId = null; protected String iName = null; Index: ExamInfoModel.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/exam/ui/ExamInfoModel.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** ExamInfoModel.java 6 Mar 2010 15:23:36 -0000 1.23 --- ExamInfoModel.java 1 Dec 2010 11:10:47 -0000 1.24 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.exam.ui; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.exam.ui; *************** *** 67,71 **** */ public class ExamInfoModel implements Serializable { ! private static Log sLog = LogFactory.getLog(ExamInfoModel.class); private transient ExamSolverProxy iSolver = null; private ExamInfo iExam = null; --- 67,72 ---- */ public class ExamInfoModel implements Serializable { ! private static final long serialVersionUID = 6594424808143469141L; ! private static Log sLog = LogFactory.getLog(ExamInfoModel.class); private transient ExamSolverProxy iSolver = null; private ExamInfo iExam = null; Index: ExamAssignmentInfo.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/exam/ui/ExamAssignmentInfo.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** ExamAssignmentInfo.java 4 May 2010 16:47:20 -0000 1.30 --- ExamAssignmentInfo.java 1 Dec 2010 11:10:47 -0000 1.31 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.exam.ui; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.exam.ui; *************** *** 66,70 **** */ public class ExamAssignmentInfo extends ExamAssignment implements Serializable { ! private TreeSet<DirectConflict> iDirects = new TreeSet(); private TreeSet<BackToBackConflict> iBackToBacks = new TreeSet(); private TreeSet<MoreThanTwoADayConflict> iMoreThanTwoADays = new TreeSet(); --- 66,71 ---- */ public class ExamAssignmentInfo extends ExamAssignment implements Serializable { ! private static final long serialVersionUID = 6610082675208799753L; ! private TreeSet<DirectConflict> iDirects = new TreeSet(); private TreeSet<BackToBackConflict> iBackToBacks = new TreeSet(); private TreeSet<MoreThanTwoADayConflict> iMoreThanTwoADays = new TreeSet(); *************** *** 83,88 **** ExamModel model = (ExamModel)exam.getModel(); Hashtable<Exam,DirectConflict> directs = new Hashtable(); ! for (Enumeration e=exam.getStudents().elements();e.hasMoreElements();) { ! ExamStudent student = (ExamStudent)e.nextElement(); for (Iterator i=student.getExams(placement.getPeriod()).iterator();i.hasNext();) { Exam other = (Exam)i.next(); --- 84,88 ---- ExamModel model = (ExamModel)exam.getModel(); Hashtable<Exam,DirectConflict> directs = new Hashtable(); ! for (ExamStudent student: exam.getStudents()) { for (Iterator i=student.getExams(placement.getPeriod()).iterator();i.hasNext();) { Exam other = (Exam)i.next(); *************** *** 97,104 **** } iDirects.addAll(directs.values()); ! int btbDist = model.getBackToBackDistance(); Hashtable<Exam,BackToBackConflict> backToBacks = new Hashtable(); ! for (Enumeration e=exam.getStudents().elements();e.hasMoreElements();) { ! ExamStudent student = (ExamStudent)e.nextElement(); if (placement.getPeriod().prev()!=null) { if (model.isDayBreakBackToBack() || placement.getPeriod().prev().getDay()==placement.getPeriod().getDay()) { --- 97,103 ---- } iDirects.addAll(directs.values()); ! double btbDist = model.getBackToBackDistance(); Hashtable<Exam,BackToBackConflict> backToBacks = new Hashtable(); ! for (ExamStudent student: exam.getStudents()) { if (placement.getPeriod().prev()!=null) { if (model.isDayBreakBackToBack() || placement.getPeriod().prev().getDay()==placement.getPeriod().getDay()) { *************** *** 107,111 **** Exam other = (Exam)i.next(); if (other.equals(exam)) continue; ! double distance = placement.getDistance((ExamPlacement)other.getAssignment()); BackToBackConflict btb = backToBacks.get(other); if (btb==null) { --- 106,110 ---- Exam other = (Exam)i.next(); if (other.equals(exam)) continue; ! double distance = placement.getDistanceInMeters((ExamPlacement)other.getAssignment()); BackToBackConflict btb = backToBacks.get(other); if (btb==null) { *************** *** 125,129 **** if (other.equals(exam)) continue; BackToBackConflict btb = backToBacks.get(other); ! double distance = placement.getDistance((ExamPlacement)other.getAssignment()); if (btb==null) { btb = new BackToBackConflict(new ExamAssignment((ExamPlacement)other.getAssignment()), --- 124,128 ---- if (other.equals(exam)) continue; BackToBackConflict btb = backToBacks.get(other); ! double distance = placement.getDistanceInMeters((ExamPlacement)other.getAssignment()); if (btb==null) { btb = new BackToBackConflict(new ExamAssignment((ExamPlacement)other.getAssignment()), *************** *** 138,143 **** iBackToBacks.addAll(backToBacks.values()); Hashtable<String,MoreThanTwoADayConflict> m2ds = new Hashtable(); ! for (Enumeration e=exam.getStudents().elements();e.hasMoreElements();) { ! ExamStudent student = (ExamStudent)e.nextElement(); Set exams = student.getExamsADay(placement.getPeriod()); int nrExams = exams.size() + (exams.contains(exam)?0:1); --- 137,141 ---- iBackToBacks.addAll(backToBacks.values()); Hashtable<String,MoreThanTwoADayConflict> m2ds = new Hashtable(); ! for (ExamStudent student: exam.getStudents()) { Set exams = student.getExamsADay(placement.getPeriod()); int nrExams = exams.size() + (exams.contains(exam)?0:1); *************** *** 161,166 **** Hashtable<Exam,DirectConflict> idirects = new Hashtable(); ! for (Enumeration e=exam.getInstructors().elements();e.hasMoreElements();) { ! ExamInstructor instructor = (ExamInstructor)e.nextElement(); for (Iterator i=instructor.getExams(placement.getPeriod()).iterator();i.hasNext();) { Exam other = (Exam)i.next(); --- 159,163 ---- Hashtable<Exam,DirectConflict> idirects = new Hashtable(); ! for (ExamInstructor instructor: exam.getInstructors()) { for (Iterator i=instructor.getExams(placement.getPeriod()).iterator();i.hasNext();) { Exam other = (Exam)i.next(); *************** *** 177,182 **** Hashtable<Exam,BackToBackConflict> ibackToBacks = new Hashtable(); ! for (Enumeration e=exam.getInstructors().elements();e.hasMoreElements();) { ! ExamInstructor instructor = (ExamInstructor)e.nextElement(); if (placement.getPeriod().prev()!=null) { if (model.isDayBreakBackToBack() || placement.getPeriod().prev().getDay()==placement.getPeriod().getDay()) { --- 174,178 ---- Hashtable<Exam,BackToBackConflict> ibackToBacks = new Hashtable(); ! for (ExamInstructor instructor: exam.getInstructors()) { if (placement.getPeriod().prev()!=null) { if (model.isDayBreakBackToBack() || placement.getPeriod().prev().getDay()==placement.getPeriod().getDay()) { *************** *** 185,189 **** Exam other = (Exam)i.next(); if (other.equals(exam)) continue; ! double distance = placement.getDistance((ExamPlacement)other.getAssignment()); BackToBackConflict btb = ibackToBacks.get(other); if (btb==null) { --- 181,185 ---- Exam other = (Exam)i.next(); if (other.equals(exam)) continue; ! double distance = placement.getDistanceInMeters((ExamPlacement)other.getAssignment()); BackToBackConflict btb = ibackToBacks.get(other); if (btb==null) { *************** *** 203,207 **** if (other.equals(exam)) continue; BackToBackConflict btb = ibackToBacks.get(other); ! double distance = placement.getDistance((ExamPlacement)other.getAssignment()); if (btb==null) { btb = new BackToBackConflict(new ExamAssignment((ExamPlacement)other.getAssignment()), --- 199,203 ---- if (other.equals(exam)) continue; BackToBackConflict btb = ibackToBacks.get(other); ! double distance = placement.getDistanceInMeters((ExamPlacement)other.getAssignment()); if (btb==null) { btb = new BackToBackConflict(new ExamAssignment((ExamPlacement)other.getAssignment()), *************** *** 216,221 **** iInstructorBackToBacks.addAll(ibackToBacks.values()); Hashtable<String,MoreThanTwoADayConflict> im2ds = new Hashtable(); ! for (Enumeration e=exam.getInstructors().elements();e.hasMoreElements();) { ! ExamInstructor instructor = (ExamInstructor)e.nextElement(); Set exams = instructor.getExamsADay(placement.getPeriod()); int nrExams = exams.size() + (exams.contains(exam)?0:1); --- 212,216 ---- iInstructorBackToBacks.addAll(ibackToBacks.values()); Hashtable<String,MoreThanTwoADayConflict> im2ds = new Hashtable(); ! for (ExamInstructor instructor: exam.getInstructors()) { Set exams = instructor.getExamsADay(placement.getPeriod()); int nrExams = exams.size() + (exams.contains(exam)?0:1); *************** *** 238,243 **** iInstructorMoreThanTwoADays.addAll(im2ds.values()); computeUnavailablility(exam, model.getUnavailabilities(placement.getPeriod())); ! for (Enumeration e=exam.getDistributionConstraints().elements();e.hasMoreElements();) { ! ExamDistributionConstraint dc = (ExamDistributionConstraint)e.nextElement(); if (dc.isHard()) { if (dc.inConflict(placement)) --- 233,237 ---- iInstructorMoreThanTwoADays.addAll(im2ds.values()); computeUnavailablility(exam, model.getUnavailabilities(placement.getPeriod())); ! for (ExamDistributionConstraint dc: exam.getDistributionConstraints()) { if (dc.isHard()) { if (dc.inConflict(placement)) *************** *** 344,349 **** for (ExamResourceUnavailability unavailability : unavailabilities) { Vector<Long> commonStudents = new Vector(); ! for (Enumeration e=exam.getStudents().elements();e.hasMoreElements();) { ! ExamStudent student = (ExamStudent)e.nextElement(); if (unavailability.getStudentIds().contains(student.getId())) commonStudents.add(student.getId()); } --- 338,342 ---- for (ExamResourceUnavailability unavailability : unavailabilities) { Vector<Long> commonStudents = new Vector(); ! for (ExamStudent student: exam.getStudents()) { if (unavailability.getStudentIds().contains(student.getId())) commonStudents.add(student.getId()); } *************** *** 351,356 **** iDirects.add(new DirectConflict(unavailability, commonStudents)); Vector<Long> commonInstructors = new Vector(); ! for (Enumeration e=exam.getInstructors().elements();e.hasMoreElements();) { ! ExamInstructor instructor = (ExamInstructor)e.nextElement(); if (unavailability.getInstructorIds().contains(instructor.getId())) commonInstructors.add(instructor.getId()); } --- 344,348 ---- iDirects.add(new DirectConflict(unavailability, commonStudents)); Vector<Long> commonInstructors = new Vector(); ! for (ExamInstructor instructor: exam.getInstructors()) { if (unavailability.getInstructorIds().contains(instructor.getId())) commonInstructors.add(instructor.getId()); } *************** *** 854,858 **** public String getConflictTable(boolean header) { ! String ret = "<table border='0' width='95%' cellspacing='0' cellpadding='3'>"; if (header) { ret += "<tr>"; --- 846,850 ---- public String getConflictTable(boolean header) { ! String ret = "<table border='0' width='100%' cellspacing='0' cellpadding='3'>"; if (header) { ret += "<tr>"; *************** *** 875,879 **** public String getConflictInfoTable() { ! String ret = "<table border='0' width='95%' cellspacing='0' cellpadding='3'>"; ret += "<tr>"; ret += "<td><i>Students</i></td>"; --- 867,871 ---- public String getConflictInfoTable() { ! String ret = "<table border='0' width='100%' cellspacing='0' cellpadding='3'>"; ret += "<tr>"; ret += "<td><i>Students</i></td>"; *************** *** 898,902 **** public String getDistributionConflictTable(boolean header) { ! String ret = "<table border='0' width='95%' cellspacing='0' cellpadding='3'>"; if (header) { ret += "<tr>"; --- 890,894 ---- public String getDistributionConflictTable(boolean header) { ! String ret = "<table border='0' width='100%' cellspacing='0' cellpadding='3'>"; if (header) { ret += "<tr>"; *************** *** 915,919 **** public String getDistributionInfoConflictTable() { ! String ret = "<table border='0' width='95%' cellspacing='0' cellpadding='3'>"; ret += "<tr>"; ret += "<td><i>Preference</i></td>"; --- 907,911 ---- public String getDistributionInfoConflictTable() { ! String ret = "<table border='0' width='100%' cellspacing='0' cellpadding='3'>"; ret += "<tr>"; ret += "<td><i>Preference</i></td>"; *************** *** 1011,1015 **** public String getInstructorConflictTable(boolean header) { ! String ret = "<table border='0' width='95%' cellspacing='0' cellpadding='3'>"; if (header) { ret += "<tr>"; --- 1003,1007 ---- public String getInstructorConflictTable(boolean header) { ! String ret = "<table border='0' width='100%' cellspacing='0' cellpadding='3'>"; if (header) { ret += "<tr>"; *************** *** 1032,1036 **** public String getInstructorConflictInfoTable() { ! String ret = "<table border='0' width='95%' cellspacing='0' cellpadding='3'>"; ret += "<tr>"; ret += "<td><i>Students</i></td>"; --- 1024,1028 ---- public String getInstructorConflictInfoTable() { ! String ret = "<table border='0' width='100%' cellspacing='0' cellpadding='3'>"; ret += "<tr>"; ret += "<td><i>Students</i></td>"; *************** *** 1053,1057 **** public static class DirectConflict implements Serializable, Comparable<DirectConflict> { ! protected ExamAssignment iOtherExam = null; protected int iNrStudents = 1; protected Vector<Long> iStudents = new Vector(); --- 1045,1050 ---- public static class DirectConflict implements Serializable, Comparable<DirectConflict> { ! private static final long serialVersionUID = 1300925620564937810L; ! protected ExamAssignment iOtherExam = null; protected int iNrStudents = 1; protected Vector<Long> iStudents = new Vector(); *************** *** 1197,1201 **** public static class BackToBackConflict implements Serializable, Comparable<BackToBackConflict> { ! protected ExamAssignment iOtherExam; protected int iNrStudents = 1; protected boolean iIsDistance = false; --- 1190,1195 ---- public static class BackToBackConflict implements Serializable, Comparable<BackToBackConflict> { ! private static final long serialVersionUID = 4953777429653205613L; ! protected ExamAssignment iOtherExam; protected int iNrStudents = 1; protected boolean iIsDistance = false; *************** *** 1275,1279 **** public static class MoreThanTwoADayConflict implements Serializable, Comparable<MoreThanTwoADayConflict> { ! protected TreeSet<ExamAssignment> iOtherExams; protected int iNrStudents = 1; protected Vector<Long> iStudents = new Vector(); --- 1269,1274 ---- public static class MoreThanTwoADayConflict implements Serializable, Comparable<MoreThanTwoADayConflict> { ! private static final long serialVersionUID = -8320516715119699996L; ! protected TreeSet<ExamAssignment> iOtherExams; protected int iNrStudents = 1; protected Vector<Long> iStudents = new Vector(); *************** *** 1375,1379 **** public static class DistributionConflict implements Serializable, Comparable<DistributionConflict> { ! protected TreeSet<ExamInfo> iOtherExams; protected String iPreference; protected Long iId; --- 1370,1375 ---- public static class DistributionConflict implements Serializable, Comparable<DistributionConflict> { ! private static final long serialVersionUID = -1985853750381140103L; ! protected TreeSet<ExamInfo> iOtherExams; protected String iPreference; protected Long iId; *************** *** 1390,1395 **** iType = dc.getTypeString(); iOtherExams = new TreeSet(); ! for (Enumeration e=dc.variables().elements();e.hasMoreElements();) { ! Exam exam = (Exam)e.nextElement(); if (exam.equals(exclude)) continue; iOtherExams.add(exam.getAssignment()==null?new ExamInfo(exam):new ExamAssignment(exam,(ExamPlacement)exam.getAssignment())); --- 1386,1390 ---- iType = dc.getTypeString(); iOtherExams = new TreeSet(); ! for (Exam exam: dc.variables()) { if (exam.equals(exclude)) continue; iOtherExams.add(exam.getAssignment()==null?new ExamInfo(exam):new ExamAssignment(exam,(ExamPlacement)exam.getAssignment())); *************** *** 1514,1518 **** iPeriods = ExamPeriod.findAll(sessionId, examType); - boolean btbDayBreak = false; SolverParameterDef btbDistDef = SolverParameterDef.findByName("Exams.BackToBackDistance"); if (btbDistDef!=null && btbDistDef.getDefault()!=null) --- 1509,1512 ---- Index: ExamSuggestionsInfo.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/exam/ui/ExamSuggestionsInfo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExamSuggestionsInfo.java 4 Apr 2008 21:13:34 -0000 1.1 --- ExamSuggestionsInfo.java 1 Dec 2010 11:10:47 -0000 1.2 *************** *** 1,2 **** --- 1,21 ---- + /* + * UniTime 3.2 (University Timetabling Application) + * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors + * as indicated by the @authors tag. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ package org.unitime.timetable.solver.exam.ui; *************** *** 6,10 **** public class ExamSuggestionsInfo implements Serializable { ! private Vector<ExamProposedChange> iSuggestions = null; private String iMessage; private boolean iTimeoutReached; --- 25,30 ---- public class ExamSuggestionsInfo implements Serializable { ! private static final long serialVersionUID = 4755443302436317912L; ! private Vector<ExamProposedChange> iSuggestions = null; private String iMessage; private boolean iTimeoutReached; Index: ExamAssignment.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/exam/ui/ExamAssignment.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** ExamAssignment.java 21 May 2010 11:39:29 -0000 1.25 --- ExamAssignment.java 1 Dec 2010 11:10:47 -0000 1.26 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.exam.ui; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.exam.ui; *************** *** 24,28 **** import java.text.SimpleDateFormat; import java.util.Collection; - import java.util.Enumeration; import java.util.Hashtable; import java.util.Iterator; --- 24,27 ---- *************** *** 50,54 **** */ public class ExamAssignment extends ExamInfo implements Serializable { ! private static SimpleDateFormat sDateFormat = new SimpleDateFormat("EEE MM/dd"); private static DecimalFormat s2Z = new DecimalFormat("00"); protected Long iPeriodId = null; --- 49,54 ---- */ public class ExamAssignment extends ExamInfo implements Serializable { ! private static final long serialVersionUID = -5726339642542287195L; ! private static SimpleDateFormat sDateFormat = new SimpleDateFormat("EEE MM/dd"); private static DecimalFormat s2Z = new DecimalFormat("00"); protected Long iPeriodId = null; *************** *** 108,113 **** } MinMaxPreferenceCombination pc = new MinMaxPreferenceCombination(); ! for (Enumeration e=((net.sf.cpsolver.exam.model.Exam)placement.variable()).getDistributionConstraints().elements();e.hasMoreElements();) { ! ExamDistributionConstraint dc = (ExamDistributionConstraint)e.nextElement(); if (dc.isHard() || dc.isSatisfied()) continue; pc.addPreferenceInt(dc.getWeight()); --- 108,112 ---- } MinMaxPreferenceCombination pc = new MinMaxPreferenceCombination(); ! for (ExamDistributionConstraint dc: placement.variable().getDistributionConstraints()) { if (dc.isHard() || dc.isSatisfied()) continue; pc.addPreferenceInt(dc.getWeight()); *************** *** 225,229 **** if (getPeriod()==null) return ""; int start = getPeriod().getStartSlot()*Constants.SLOT_LENGTH_MIN + Constants.FIRST_SLOT_TIME_MIN + getPrintOffset(); - int end = start + getLength(); return sDateFormat.format(getPeriod().getStartDate())+" "+Constants.toTime(start); } --- 224,227 ---- |
|
From: Tomas M. <to...@us...> - 2010-12-01 11:11:26
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/commons/web/htmlgen In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/JavaSource/org/unitime/commons/web/htmlgen Modified Files: TableStream.java TableRow.java GeneralTableRowSupport.java TableCell.java Div.java GeneralHtmlWithJavascript.java Table.java GeneralTableCellSupport.java Span.java GeneralTableSupport.java GeneralHtml.java TableHeaderCell.java TestHtmlGen.java Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: GeneralTableRowSupport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/commons/web/htmlgen/GeneralTableRowSupport.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GeneralTableRowSupport.java 17 Jun 2008 21:24:50 -0000 1.2 --- GeneralTableRowSupport.java 1 Dec 2010 11:10:47 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.commons.web.htmlgen; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.commons.web.htmlgen; Index: TableHeaderCell.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/commons/web/htmlgen/TableHeaderCell.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TableHeaderCell.java 17 Jun 2008 21:24:50 -0000 1.2 --- TableHeaderCell.java 1 Dec 2010 11:10:47 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.commons.web.htmlgen; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.commons.web.htmlgen; Index: GeneralTableSupport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/commons/web/htmlgen/GeneralTableSupport.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GeneralTableSupport.java 17 Jun 2008 21:24:50 -0000 1.2 --- GeneralTableSupport.java 1 Dec 2010 11:10:47 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.commons.web.htmlgen; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.commons.web.htmlgen; Index: GeneralHtmlWithJavascript.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/commons/web/htmlgen/GeneralHtmlWithJavascript.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GeneralHtmlWithJavascript.java 17 Jun 2008 21:24:50 -0000 1.2 --- GeneralHtmlWithJavascript.java 1 Dec 2010 11:10:47 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.commons.web.htmlgen; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.commons.web.htmlgen; Index: GeneralTableCellSupport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/commons/web/htmlgen/GeneralTableCellSupport.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GeneralTableCellSupport.java 17 Jun 2008 21:24:50 -0000 1.2 --- GeneralTableCellSupport.java 1 Dec 2010 11:10:47 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.commons.web.htmlgen; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.commons.web.htmlgen; Index: TestHtmlGen.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/commons/web/htmlgen/TestHtmlGen.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TestHtmlGen.java 17 Jun 2008 21:24:50 -0000 1.2 --- TestHtmlGen.java 1 Dec 2010 11:10:47 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.commons.web.htmlgen; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.commons.web.htmlgen; Index: Table.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/commons/web/htmlgen/Table.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Table.java 17 Jun 2008 21:24:50 -0000 1.2 --- Table.java 1 Dec 2010 11:10:47 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.commons.web.htmlgen; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.commons.web.htmlgen; Index: TableRow.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/commons/web/htmlgen/TableRow.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TableRow.java 17 Jun 2008 21:24:50 -0000 1.2 --- TableRow.java 1 Dec 2010 11:10:47 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.commons.web.htmlgen; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.commons.web.htmlgen; Index: Span.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/commons/web/htmlgen/Span.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Span.java 17 Jun 2008 21:24:50 -0000 1.2 --- Span.java 1 Dec 2010 11:10:47 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.commons.web.htmlgen; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.commons.web.htmlgen; Index: TableCell.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/commons/web/htmlgen/TableCell.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TableCell.java 17 Jun 2008 21:24:50 -0000 1.2 --- TableCell.java 1 Dec 2010 11:10:47 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.commons.web.htmlgen; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.commons.web.htmlgen; Index: TableStream.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/commons/web/htmlgen/TableStream.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TableStream.java 17 Jun 2008 21:24:50 -0000 1.2 --- TableStream.java 1 Dec 2010 11:10:47 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.commons.web.htmlgen; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.commons.web.htmlgen; Index: GeneralHtml.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/commons/web/htmlgen/GeneralHtml.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GeneralHtml.java 17 Jun 2008 21:24:50 -0000 1.2 --- GeneralHtml.java 1 Dec 2010 11:10:47 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.commons.web.htmlgen; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.commons.web.htmlgen; Index: Div.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/commons/web/htmlgen/Div.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Div.java 17 Jun 2008 21:24:50 -0000 1.2 --- Div.java 1 Dec 2010 11:10:47 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.commons.web.htmlgen; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.commons.web.htmlgen; |
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/interfaces In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/JavaSource/org/unitime/timetable/interfaces Modified Files: ExternalInstructionalOfferingInCrosslistAddAction.java ExternalInstructionalOfferingAddAction.java ExternalUidTranslation.java ExternalInstructionalOfferingDeleteAction.java ExternalInstrOfferingConfigAssignInstructorsAction.java ExternalUidLookup.java ExternalCourseOfferingReservationEditAction.java ExternalSchedulingSubpartEditAction.java ExternalCourseCrosslistAction.java ExternalCourseOfferingEditAction.java ExternalLinkLookup.java ExternalClassNameHelperInterface.java ExternalSolutionCommitAction.java ExternalCourseOfferingRemoveAction.java ExternalClassEditAction.java ExternalInstructionalOfferingNotOfferedAction.java RoomAvailabilityInterface.java ExternalInstructionalOfferingOfferedAction.java ExternalInstrOffrConfigChangeAction.java Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: ExternalSolutionCommitAction.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/interfaces/ExternalSolutionCommitAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ExternalSolutionCommitAction.java 7 Jul 2009 14:45:23 -0000 1.2 --- ExternalSolutionCommitAction.java 1 Dec 2010 11:10:47 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.interfaces; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.interfaces; Index: ExternalUidLookup.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/interfaces/ExternalUidLookup.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ExternalUidLookup.java 17 Jun 2008 21:24:49 -0000 1.2 --- ExternalUidLookup.java 1 Dec 2010 11:10:47 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,44 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.interfaces; ! import java.util.Map; /** * Interface to lookup external ids for manager * ! * @author Heston Fernandes * */ public interface ExternalUidLookup { ! public final String SEARCH_ID = "searchId"; ! public final String EXTERNAL_ID = "externalId"; ! public final String USERNAME = "userName"; ! public final String FIRST_NAME = "firstName"; ! public final String MIDDLE_NAME = "middleName"; ! public final String LAST_NAME = "lastName"; ! public final String EMAIL = "email"; ! ! public Map doLookup(Map attributes) throws Exception; ! public String getErrorMessage(); } --- 15,104 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.interfaces; ! import java.util.StringTokenizer; /** * Interface to lookup external ids for manager * ! * @author Tomas Muller * */ public interface ExternalUidLookup { ! public UserInfo doLookup(String searchId) throws Exception; ! public static class UserInfo { ! private String iExternalId = null; ! private String iUserName = null; ! private String iFirstName = null; ! private String iMiddleName = null; ! private String iLastName = null; ! private String iEmail = null; ! private String iName = null; ! ! public UserInfo() {} ! ! public String getExternalId() { return iExternalId; } ! public void setExternalId(String externalId) { iExternalId = externalId; } ! ! public String getUserName() { return iUserName; } ! public void setUserName(String userName) { iUserName = userName; } ! ! public String getFirstName() { ! if (iFirstName != null) return iFirstName; ! if (iName != null) { ! StringTokenizer s = new StringTokenizer(iName); ! if (s.countTokens() > 1) return s.nextToken(); ! } ! return ""; ! } ! public void setFirstName(String firstName) { iFirstName = firstName; } ! ! public String getMiddleName() { ! if (iMiddleName != null) return iMiddleName; ! if (iName != null) { ! StringTokenizer s = new StringTokenizer(iName); ! if (s.countTokens() > 2) { ! s.nextToken(); ! String m = ""; ! while (true) { ! String n = s.nextToken(); ! if (!s.hasMoreTokens()) break; ! m += (m.isEmpty() ? "" : " ") + n; ! } ! return m; ! } ! } ! return ""; ! } ! public void setMiddleName(String middleName) { iMiddleName = middleName; } ! ! public String getLastName() { ! if (iLastName != null) return iLastName; ! if (iName != null) { ! StringTokenizer s = new StringTokenizer(iName); ! if (s.countTokens() > 0) { ! String l = s.nextToken(); ! while (s.hasMoreTokens()) l = s.nextToken(); ! return l; ! } ! } ! return ""; ! } ! public void setLastName(String lastName) { iLastName = lastName; } ! ! public String getEmail() { return iEmail; } ! public void setEmail(String email) { iEmail = email; } ! ! public String getName() { ! if (iName != null) return iName; ! return ((iLastName == null ? "" : iLastName) + ", " + (iFirstName == null ? "" : iFirstName) + (iMiddleName == null ? "" : " " + iMiddleName)).toString(); ! } ! public void setName(String name) { iName = name; } ! } } Index: ExternalCourseOfferingEditAction.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/interfaces/ExternalCourseOfferingEditAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExternalCourseOfferingEditAction.java 29 May 2009 11:23:43 -0000 1.1 --- ExternalCourseOfferingEditAction.java 1 Dec 2010 11:10:47 -0000 1.2 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.interfaces; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.interfaces; Index: ExternalInstructionalOfferingDeleteAction.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/interfaces/ExternalInstructionalOfferingDeleteAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExternalInstructionalOfferingDeleteAction.java 29 May 2009 11:23:43 -0000 1.1 --- ExternalInstructionalOfferingDeleteAction.java 1 Dec 2010 11:10:47 -0000 1.2 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.interfaces; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.interfaces; Index: ExternalInstructionalOfferingNotOfferedAction.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/interfaces/ExternalInstructionalOfferingNotOfferedAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExternalInstructionalOfferingNotOfferedAction.java 29 May 2009 11:23:43 -0000 1.1 --- ExternalInstructionalOfferingNotOfferedAction.java 1 Dec 2010 11:10:47 -0000 1.2 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.interfaces; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.interfaces; Index: ExternalInstructionalOfferingOfferedAction.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/interfaces/ExternalInstructionalOfferingOfferedAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExternalInstructionalOfferingOfferedAction.java 29 May 2009 11:23:43 -0000 1.1 --- ExternalInstructionalOfferingOfferedAction.java 1 Dec 2010 11:10:47 -0000 1.2 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.interfaces; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.interfaces; Index: ExternalCourseOfferingRemoveAction.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/interfaces/ExternalCourseOfferingRemoveAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExternalCourseOfferingRemoveAction.java 29 May 2009 14:41:35 -0000 1.1 --- ExternalCourseOfferingRemoveAction.java 1 Dec 2010 11:10:47 -0000 1.2 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.interfaces; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.interfaces; Index: ExternalCourseCrosslistAction.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/interfaces/ExternalCourseCrosslistAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExternalCourseCrosslistAction.java 29 May 2009 11:23:43 -0000 1.1 --- ExternalCourseCrosslistAction.java 1 Dec 2010 11:10:47 -0000 1.2 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.interfaces; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.interfaces; Index: ExternalClassEditAction.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/interfaces/ExternalClassEditAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExternalClassEditAction.java 29 May 2009 11:23:43 -0000 1.1 --- ExternalClassEditAction.java 1 Dec 2010 11:10:47 -0000 1.2 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.interfaces; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.interfaces; Index: ExternalCourseOfferingReservationEditAction.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/interfaces/ExternalCourseOfferingReservationEditAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExternalCourseOfferingReservationEditAction.java 29 May 2009 11:23:43 -0000 1.1 --- ExternalCourseOfferingReservationEditAction.java 1 Dec 2010 11:10:47 -0000 1.2 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.interfaces; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.interfaces; Index: ExternalLinkLookup.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/interfaces/ExternalLinkLookup.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ExternalLinkLookup.java 17 Jun 2008 21:24:49 -0000 1.2 --- ExternalLinkLookup.java 1 Dec 2010 11:10:47 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.interfaces; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.interfaces; Index: ExternalClassNameHelperInterface.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/interfaces/ExternalClassNameHelperInterface.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExternalClassNameHelperInterface.java 4 Feb 2010 04:23:56 -0000 1.1 --- ExternalClassNameHelperInterface.java 1 Dec 2010 11:10:47 -0000 1.2 *************** *** 1,5 **** ! /** * ! */ package org.unitime.timetable.interfaces; --- 1,21 ---- ! /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2010, UniTime LLC, and individual contributors ! * as indicated by the @authors tag. * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or ! * (at your option) any later version. ! * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU General Public License for more details. ! * ! * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * ! */ package org.unitime.timetable.interfaces; Index: ExternalInstructionalOfferingAddAction.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/interfaces/ExternalInstructionalOfferingAddAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExternalInstructionalOfferingAddAction.java 29 May 2009 11:23:43 -0000 1.1 --- ExternalInstructionalOfferingAddAction.java 1 Dec 2010 11:10:47 -0000 1.2 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.interfaces; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.interfaces; Index: ExternalUidTranslation.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/interfaces/ExternalUidTranslation.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExternalUidTranslation.java 5 Aug 2008 15:42:07 -0000 1.1 --- ExternalUidTranslation.java 1 Dec 2010 11:10:47 -0000 1.2 *************** *** 1,2 **** --- 1,21 ---- + /* + * UniTime 3.2 (University Timetabling Application) + * Copyright (C) 2010, UniTime LLC, and individual contributors + * as indicated by the @authors tag. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ package org.unitime.timetable.interfaces; Index: ExternalSchedulingSubpartEditAction.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/interfaces/ExternalSchedulingSubpartEditAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExternalSchedulingSubpartEditAction.java 29 May 2009 11:23:43 -0000 1.1 --- ExternalSchedulingSubpartEditAction.java 1 Dec 2010 11:10:47 -0000 1.2 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.interfaces; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.interfaces; Index: ExternalInstrOffrConfigChangeAction.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/interfaces/ExternalInstrOffrConfigChangeAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExternalInstrOffrConfigChangeAction.java 27 May 2009 15:24:36 -0000 1.1 --- ExternalInstrOffrConfigChangeAction.java 1 Dec 2010 11:10:47 -0000 1.2 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.interfaces; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.interfaces; Index: ExternalInstructionalOfferingInCrosslistAddAction.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/interfaces/ExternalInstructionalOfferingInCrosslistAddAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExternalInstructionalOfferingInCrosslistAddAction.java 29 May 2009 14:41:36 -0000 1.1 --- ExternalInstructionalOfferingInCrosslistAddAction.java 1 Dec 2010 11:10:47 -0000 1.2 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.interfaces; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.interfaces; Index: ExternalInstrOfferingConfigAssignInstructorsAction.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/interfaces/ExternalInstrOfferingConfigAssignInstructorsAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExternalInstrOfferingConfigAssignInstructorsAction.java 29 May 2009 11:23:43 -0000 1.1 --- ExternalInstrOfferingConfigAssignInstructorsAction.java 1 Dec 2010 11:10:47 -0000 1.2 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.interfaces; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.interfaces; Index: RoomAvailabilityInterface.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/interfaces/RoomAvailabilityInterface.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** RoomAvailabilityInterface.java 1 Aug 2009 17:23:30 -0000 1.6 --- RoomAvailabilityInterface.java 1 Dec 2010 11:10:47 -0000 1.7 *************** *** 1,2 **** --- 1,21 ---- + /* + * UniTime 3.2 (University Timetabling Application) + * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors + * as indicated by the @authors tag. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ package org.unitime.timetable.interfaces; |
|
From: Tomas M. <to...@us...> - 2010-12-01 11:11:26
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/action/ajax In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/JavaSource/org/unitime/timetable/action/ajax Modified Files: SectioningDemoAjax.java ExamEditAjax.java DistributionPrefsAjax.java ITypesAjax.java CourseNumSuggestAction.java BuildingCoordsAjax.java PeopleLookupAjax.java Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: SectioningDemoAjax.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/action/ajax/SectioningDemoAjax.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SectioningDemoAjax.java 27 Apr 2009 19:24:24 -0000 1.4 --- SectioningDemoAjax.java 1 Dec 2010 11:10:47 -0000 1.5 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.action.ajax; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.action.ajax; *************** *** 23,27 **** import java.util.Iterator; import java.util.List; - import java.util.Vector; import javax.servlet.ServletOutputStream; --- 23,26 ---- *************** *** 50,55 **** response.addHeader("Content-Type", "text/xml"); - String word = request.getParameter("word"); - ServletOutputStream out = response.getOutputStream(); --- 49,52 ---- *************** *** 104,108 **** if (tp==null) return; TimePatternModel m = tp.getTimePatternModel(); - Vector ret = new Vector(); for (int i=0;i<m.getNrTimes();i++) print(out, String.valueOf(i), m.getStartTime(i)+" - "+m.getEndTime(i)); --- 101,104 ---- *************** *** 114,118 **** if (tp==null) return; TimePatternModel m = tp.getTimePatternModel(); - Vector ret = new Vector(); for (int i=0;i<m.getNrDays();i++) print(out, String.valueOf(i), m.getDayHeader(i)); --- 110,113 ---- Index: DistributionPrefsAjax.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/action/ajax/DistributionPrefsAjax.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** DistributionPrefsAjax.java 27 Apr 2009 19:24:24 -0000 1.9 --- DistributionPrefsAjax.java 1 Dec 2010 11:10:47 -0000 1.10 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.action.ajax; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.action.ajax; Index: ExamEditAjax.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/action/ajax/ExamEditAjax.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ExamEditAjax.java 27 Apr 2009 19:24:24 -0000 1.5 --- ExamEditAjax.java 1 Dec 2010 11:10:47 -0000 1.6 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.action.ajax; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.action.ajax; Index: PeopleLookupAjax.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/action/ajax/PeopleLookupAjax.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PeopleLookupAjax.java 1 Mar 2009 03:12:21 -0000 1.5 --- PeopleLookupAjax.java 1 Dec 2010 11:10:47 -0000 1.6 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.action.ajax; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.action.ajax; *************** *** 124,128 **** String q = "select s from Staff s where "; for (StringTokenizer stk = new StringTokenizer(query," ,"); stk.hasMoreTokens();) { ! String t = stk.nextToken(); q += "(lower(s.firstName) like '"+t+"%' or lower(s.middleName) like '"+t+"%' or lower(s.lastName) like '"+t+"%')"; if (stk.hasMoreTokens()) q += " and "; --- 124,128 ---- String q = "select s from Staff s where "; for (StringTokenizer stk = new StringTokenizer(query," ,"); stk.hasMoreTokens();) { ! String t = stk.nextToken().replace("'", "''"); q += "(lower(s.firstName) like '"+t+"%' or lower(s.middleName) like '"+t+"%' or lower(s.lastName) like '"+t+"%')"; if (stk.hasMoreTokens()) q += " and "; *************** *** 139,143 **** String q = "select s from EventContact s where "; for (StringTokenizer stk = new StringTokenizer(query," ,"); stk.hasMoreTokens();) { ! String t = stk.nextToken(); q += "(lower(s.firstName) like '"+t+"%' or lower(s.middleName) like '"+t+"%' or lower(s.lastName) like '"+t+"%')"; if (stk.hasMoreTokens()) q += " and "; --- 139,143 ---- String q = "select s from EventContact s where "; for (StringTokenizer stk = new StringTokenizer(query," ,"); stk.hasMoreTokens();) { ! String t = stk.nextToken().replace("'", "''"); q += "(lower(s.firstName) like '"+t+"%' or lower(s.middleName) like '"+t+"%' or lower(s.lastName) like '"+t+"%')"; if (stk.hasMoreTokens()) q += " and "; *************** *** 155,159 **** String q = "select s from Student s where s.session.uniqueId="+session+" and "; for (StringTokenizer stk = new StringTokenizer(query," ,"); stk.hasMoreTokens();) { ! String t = stk.nextToken(); q += "(lower(s.firstName) like '"+t+"%' or lower(s.middleName) like '"+t+"%' or lower(s.lastName) like '"+t+"%')"; if (stk.hasMoreTokens()) q += " and "; --- 155,159 ---- String q = "select s from Student s where s.session.uniqueId="+session+" and "; for (StringTokenizer stk = new StringTokenizer(query," ,"); stk.hasMoreTokens();) { ! String t = stk.nextToken().replace("'", "''"); q += "(lower(s.firstName) like '"+t+"%' or lower(s.middleName) like '"+t+"%' or lower(s.lastName) like '"+t+"%')"; if (stk.hasMoreTokens()) q += " and "; *************** *** 170,174 **** String q = "select s from TimetableManager s where "; for (StringTokenizer stk = new StringTokenizer(query," ,"); stk.hasMoreTokens();) { ! String t = stk.nextToken(); q += "(lower(s.firstName) like '"+t+"%' or lower(s.middleName) like '"+t+"%' or lower(s.lastName) like '"+t+"%')"; if (stk.hasMoreTokens()) q += " and "; --- 170,174 ---- String q = "select s from TimetableManager s where "; for (StringTokenizer stk = new StringTokenizer(query," ,"); stk.hasMoreTokens();) { ! String t = stk.nextToken().replace("'", "''"); q += "(lower(s.firstName) like '"+t+"%' or lower(s.middleName) like '"+t+"%' or lower(s.lastName) like '"+t+"%')"; if (stk.hasMoreTokens()) q += " and "; *************** *** 199,205 **** String t = stk.nextToken(); if (filter.length()==0) ! filter = "(|(|(sn="+t+"*)(uid="+t+"))(givenName="+t+"*))"; else ! filter = "(&"+filter+"(|(|(sn="+t+"*)(uid="+t+"))(givenName="+t+"*)))"; } for (NamingEnumeration<SearchResult> e=ctx.search(ApplicationProperties.getProperty("tmtbl.lookup.ldap.name",""),filter,ctls);e.hasMore();) --- 199,205 ---- String t = stk.nextToken(); if (filter.length()==0) ! filter = ApplicationProperties.getProperty("tmtbl.lookup.ldap.query", "(|(|(sn=%*)(uid=%))(givenName=%*))").replaceAll("%", t); else ! filter = "(&"+filter+ApplicationProperties.getProperty("tmtbl.lookup.ldap.query", "(|(|(sn=%*)(uid=%))(givenName=%*))").replaceAll("%", t)+")"; } for (NamingEnumeration<SearchResult> e=ctx.search(ApplicationProperties.getProperty("tmtbl.lookup.ldap.name",""),filter,ctls);e.hasMore();) *************** *** 236,251 **** //if (iPhone!=null) iPhone = iPhone.replaceAll("\\+? ?\\-?\\(?\\)?",""); } - private Person(String id, String cname, String email, String phone, String dept, String pos, String source) { - iId = id; iSource = source; - iLName = cname; - if (iLName!=null && iLName.indexOf(' ')>0) { - iFName = iLName.substring(0, iLName.indexOf(' ')); iLName = iLName.substring(iLName.indexOf(' ')+1); - } - if (iLName!=null && iLName.indexOf(' ')>0) { - iMName = iLName.substring(0, iLName.lastIndexOf(' ')); iLName = iLName.substring(iLName.lastIndexOf(' ')+1); - } - iEmail = email; iPhone = phone; iDept = dept; iPos = pos; - //if (iPhone!=null) iPhone = iPhone.replaceAll("\\+? ?\\-?\\(?\\)?",""); - } public Person(Staff staff) { this(translate(staff.getExternalUniqueId(), Source.Staff), --- 236,239 ---- Index: CourseNumSuggestAction.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/action/ajax/CourseNumSuggestAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CourseNumSuggestAction.java 27 Jun 2008 17:25:37 -0000 1.4 --- CourseNumSuggestAction.java 1 Dec 2010 11:10:47 -0000 1.5 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.action.ajax; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.action.ajax; Index: ITypesAjax.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/action/ajax/ITypesAjax.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ITypesAjax.java 17 Jun 2008 21:24:50 -0000 1.2 --- ITypesAjax.java 1 Dec 2010 11:10:47 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.action.ajax; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.action.ajax; *************** *** 45,50 **** response.addHeader("Content-Type", "text/xml"); - String word = request.getParameter("word"); - ServletOutputStream out = response.getOutputStream(); --- 45,48 ---- Index: BuildingCoordsAjax.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/action/ajax/BuildingCoordsAjax.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BuildingCoordsAjax.java 17 Jun 2008 21:24:50 -0000 1.2 --- BuildingCoordsAjax.java 1 Dec 2010 11:10:47 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.action.ajax; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.action.ajax; *************** *** 45,50 **** response.addHeader("Content-Type", "text/xml"); - String word = request.getParameter("word"); - ServletOutputStream out = response.getOutputStream(); --- 45,48 ---- *************** *** 66,72 **** Building building = new BuildingDAO().get(Long.valueOf(request.getParameter("id"))); print(out, "x", ! (building.getCoordinateX()==null || building.getCoordinateX()<0?"":building.getCoordinateX().toString())); print(out, "y", ! (building.getCoordinateY()==null || building.getCoordinateY()<0?"":building.getCoordinateY().toString())); } catch (Exception e) { Debug.error(e); --- 64,70 ---- Building building = new BuildingDAO().get(Long.valueOf(request.getParameter("id"))); print(out, "x", ! (building.getCoordinateX()==null ? "" : building.getCoordinateX().toString())); print(out, "y", ! (building.getCoordinateY()==null ? "" : building.getCoordinateY().toString())); } catch (Exception e) { Debug.error(e); |
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/filter In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/JavaSource/org/unitime/timetable/filter Modified Files: XSSFilter.java PageAccessFilter.java EncodingFilter.java UserAccessFilter.java HibSessionFilter.java Added Files: QueryLogFilter.java Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: XSSFilter.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/filter/XSSFilter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** XSSFilter.java 17 Jun 2008 21:24:50 -0000 1.2 --- XSSFilter.java 1 Dec 2010 11:10:47 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.filter; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.filter; Index: PageAccessFilter.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/filter/PageAccessFilter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PageAccessFilter.java 16 Feb 2010 17:53:09 -0000 1.3 --- PageAccessFilter.java 1 Dec 2010 11:10:47 -0000 1.4 *************** *** 1,2 **** --- 1,21 ---- + /* + * UniTime 3.2 (University Timetabling Application) + * Copyright (C) 2010, UniTime LLC, and individual contributors + * as indicated by the @authors tag. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ package org.unitime.timetable.filter; *************** *** 135,139 **** } if (exception!=null || (t1-t0)>dumpTime) { ! User u = Web.getUser(r.getSession()); if (u==null) { message += "\n User: no user"; --- 154,161 ---- } if (exception!=null || (t1-t0)>dumpTime) { ! User u = null; ! try { ! u = (r.getSession() == null ? null : Web.getUser(r.getSession())); ! } catch (IllegalStateException e) {} if (u==null) { message += "\n User: no user"; *************** *** 147,157 **** message+="\n "+n+"="+r.getParameter(n); } ! if (dumpSessionAttribues) { ! message += "\n Session attributes:"; ! for (Enumeration e=r.getSession().getAttributeNames(); e.hasMoreElements();) { ! String n = (String)e.nextElement(); ! if (n.equals("userTrace")) continue; ! message+="\n "+n+"="+r.getSession().getAttribute(n); } } } else { --- 169,183 ---- message+="\n "+n+"="+r.getParameter(n); } ! try { ! if (dumpSessionAttribues && r.getSession() != null) { ! message += "\n Session attributes:"; ! for (Enumeration e=r.getSession().getAttributeNames(); e.hasMoreElements();) { ! String n = (String)e.nextElement(); ! if (n.equals("userTrace")) continue; ! message+="\n "+n+"="+r.getSession().getAttribute(n); ! } } + } catch (IllegalStateException e) { + message += "\n INVALID SESSION"; } } else { *************** *** 182,185 **** public void destroy() { } - } --- 208,210 ---- Index: HibSessionFilter.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/filter/HibSessionFilter.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** HibSessionFilter.java 16 Feb 2010 16:01:03 -0000 1.4 --- HibSessionFilter.java 1 Dec 2010 11:10:47 -0000 1.5 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.filter; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.filter; *************** *** 67,96 **** request.setAttribute("TimeStamp", new Double(JProf.currentTimeSec())); - Session hibSession = null; try { - hibSession = new _RootDAO().getSession(); - //if(!hibSession.getTransaction().isActive()) { - //Debug.info("Starting transaction"); - //hibSession.beginTransaction(); - //} - // Process request chain.doFilter(request,response); ! // Close hibernate session, after request is processed ! //if(!hibSession.getTransaction().isActive()) { ! //Debug.info("Committing transaction"); ! //hibSession.getTransaction().commit(); ! //} ! ! if(hibSession!=null && hibSession.isOpen()) { hibSession.close(); } ! } ! catch (Throwable ex) { // Rollback only ! //ex.printStackTrace(); try { ! if (hibSession!=null && hibSession.isOpen() && hibSession.getTransaction().isActive()) { Debug.debug("Trying to rollback database transaction after exception"); hibSession.getTransaction().rollback(); --- 67,83 ---- request.setAttribute("TimeStamp", new Double(JProf.currentTimeSec())); try { // Process request chain.doFilter(request,response); ! Session hibSession = new _RootDAO().getCurrentThreadSession(); ! if(hibSession != null && hibSession.isOpen()) { hibSession.close(); } ! } catch (Throwable ex) { // Rollback only ! Session hibSession = new _RootDAO().getCurrentThreadSession(); try { ! if (hibSession != null && hibSession.isOpen() && hibSession.getTransaction().isActive()) { Debug.debug("Trying to rollback database transaction after exception"); hibSession.getTransaction().rollback(); *************** *** 99,105 **** Debug.error(rbEx); } finally { ! if(hibSession!=null && hibSession.isOpen()) { ! hibSession.close(); ! } } --- 86,91 ---- Debug.error(rbEx); } finally { ! if(hibSession != null && hibSession.isOpen()) ! hibSession.close(); } --- NEW FILE: QueryLogFilter.java --- /* * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * */ package org.unitime.timetable.filter; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.security.Principal; import java.util.ArrayList; import java.util.Date; import java.util.Enumeration; import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Vector; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; import javax.servlet.ServletInputStream; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import net.sf.cpsolver.ifs.util.JProf; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Session; import org.unitime.commons.User; import org.unitime.commons.web.Web; import org.unitime.timetable.model.QueryLog; import org.unitime.timetable.model.dao.QueryLogDAO; public class QueryLogFilter implements Filter { private static Log sLog = LogFactory.getLog(QueryLogFilter.class); private List<QueryLog> iQueries = new Vector<QueryLog>(); private boolean iActive = false; private Saver iSaver; private HashSet<String> iExclude = new HashSet<String>(); public void init(FilterConfig cfg) throws ServletException { iActive = true; Saver iSaver = new Saver(); iSaver.start(); String exclude = cfg.getInitParameter("exclude"); if (exclude != null) { for (String x: exclude.split(",")) iExclude.add(x); } } public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain ) throws ServletException, IOException { String sessionId = null; String userId = null; try { if (request instanceof HttpServletRequest) { HttpServletRequest r = (HttpServletRequest)request; sessionId = r.getSession().getId(); User user = Web.getUser(r.getSession()); if (user != null) userId = user.getId(); } } catch (IllegalStateException e) {} if (request instanceof HttpServletRequest) { HttpServletRequest r = (HttpServletRequest)request; if (r.getRequestURI().endsWith(".gwt")) request = new HttpServletRequestWrapper(r); } long t0 = JProf.currentTimeMillis(); Throwable exception = null; try { chain.doFilter(request,response); } catch (Throwable t) { exception = t; } long t1 = JProf.currentTimeMillis(); if (request instanceof HttpServletRequest) { HttpServletRequest r = (HttpServletRequest)request; QueryLog q = new QueryLog(); String uri = r.getRequestURI(); if (uri.indexOf('/') >= 0) uri = uri.substring(uri.lastIndexOf('/') + 1); if (uri.endsWith(".do")) q.setType(QueryLog.Type.STRUCTS.ordinal()); else if (uri.endsWith(".gwt")) q.setType(QueryLog.Type.GWT.ordinal()); else q.setType(QueryLog.Type.OTHER.ordinal()); q.setUri(uri); q.setTimeStamp(new Date()); q.setTimeSpent(t1 - t0); q.setSessionId(sessionId); q.setUid(userId); try { if (sessionId == null) q.setSessionId(r.getSession().getId()); if (userId == null) { User user = Web.getUser(r.getSession()); if (user != null) q.setUid(user.getId()); } } catch (IllegalStateException e) {} if (r instanceof HttpServletRequestWrapper && ((HttpServletRequestWrapper)r).getBody() != null) { try { String body = new String(((HttpServletRequestWrapper)r).getBody()); q.setQuery(body); String args[] = body.split("\\|"); q.setUri(q.getUri() + ": " + args[5].substring(args[5].lastIndexOf('.') + 1) + "#" + args[6]); } catch (Exception e) { sLog.warn("Error parsing GWT request body: " + e.getMessage()); } } else { String params = ""; for (Enumeration e=r.getParameterNames(); e.hasMoreElements();) { String n = (String)e.nextElement(); if ("password".equals(n)) continue; if (!params.isEmpty()) params += "&"; params += n + "=" + r.getParameter(n); } if (!params.isEmpty()) q.setQuery(params); } if (exception != null) { Throwable t = exception; String ex = ""; while (t != null) { String clazz = t.getClass().getName(); if (clazz.indexOf('.') >= 0) clazz = clazz.substring(1 + clazz.lastIndexOf('.')); if (!ex.isEmpty()) ex += "\n"; ex += clazz + ": " + t.getMessage(); if (t.getStackTrace() != null && t.getStackTrace().length > 0) ex += " (at " + t.getStackTrace()[0].getFileName() + ":" + t.getStackTrace()[0].getLineNumber() + ")"; t = t.getCause(); } if (!ex.isEmpty()) q.setException(ex); } if (!iExclude.contains(q.getUri()) || q.getException() != null) { synchronized (iQueries) { iQueries.add(q); } } } if (exception!=null) { if (exception instanceof ServletException) throw (ServletException)exception; if (exception instanceof IOException) throw (IOException)exception; if (exception instanceof RuntimeException) throw (RuntimeException)exception; throw new ServletException(exception); } } public void destroy() { iActive = false; if (iSaver != null) iSaver.interrupt(); } private class Saver extends Thread { public Saver() { super("QueryLogSaver"); setDaemon(true); } public void run() { sLog.debug("Query Log Saver is up."); while (true) { try { sleep(60000); } catch (InterruptedException e) { } List<QueryLog> queriesToSave = null; synchronized (iQueries) { if (!iQueries.isEmpty()) { queriesToSave = new ArrayList<QueryLog>(iQueries); iQueries.clear(); } } if (queriesToSave != null) { sLog.debug("Persisting " + queriesToSave.size() + " log entries..."); Session hibSession = QueryLogDAO.getInstance().createNewSession(); try { for (QueryLog q: queriesToSave) hibSession.save(q); hibSession.flush(); } finally { hibSession.close(); } } if (!iActive) break; } sLog.debug("Query Log Saver is down."); } } private static class HttpServletRequestWrapper implements HttpServletRequest { private HttpServletRequest iRequest; private ServletInputStreamWrapper iInputStream = null; public HttpServletRequestWrapper(HttpServletRequest r) { iRequest = r; } @Override public String getAuthType() { return iRequest.getAuthType(); } @Override public String getContextPath() { return iRequest.getContextPath(); } @Override public Cookie[] getCookies() { return iRequest.getCookies(); } @Override public long getDateHeader(String name) { return iRequest.getDateHeader(name); } @Override public String getHeader(String name) { return iRequest.getHeader(name); } @Override public Enumeration getHeaderNames() { return iRequest.getHeaderNames(); } @Override public Enumeration getHeaders(String name) { return iRequest.getHeaders(name); } @Override public int getIntHeader(String name) { return iRequest.getIntHeader(name); } @Override public String getMethod() { return iRequest.getMethod(); } @Override public String getPathInfo() { return iRequest.getPathInfo(); } @Override public String getPathTranslated() { return iRequest.getPathTranslated(); } @Override public String getQueryString() { return iRequest.getQueryString(); } @Override public String getRemoteUser() { return iRequest.getRemoteUser(); } @Override public String getRequestURI() { return iRequest.getRequestURI(); } @Override public StringBuffer getRequestURL() { return iRequest.getRequestURL(); } @Override public String getRequestedSessionId() { return iRequest.getRequestedSessionId(); } @Override public String getServletPath() { return iRequest.getServletPath(); } @Override public HttpSession getSession() { return iRequest.getSession(); } @Override public HttpSession getSession(boolean create) { return iRequest.getSession(create); } @Override public Principal getUserPrincipal() { return iRequest.getUserPrincipal(); } @Override public boolean isRequestedSessionIdFromCookie() { return iRequest.isRequestedSessionIdFromCookie(); } @Override public boolean isRequestedSessionIdFromURL() { return iRequest.isRequestedSessionIdFromURL(); } @Override @Deprecated public boolean isRequestedSessionIdFromUrl() { return iRequest.isRequestedSessionIdFromUrl(); } @Override public boolean isRequestedSessionIdValid() { return iRequest.isRequestedSessionIdValid(); } @Override public boolean isUserInRole(String role) { return iRequest.isUserInRole(role); } @Override public Object getAttribute(String name) { return iRequest.getAttribute(name); } @Override public Enumeration getAttributeNames() { return iRequest.getAttributeNames(); } @Override public String getCharacterEncoding() { return iRequest.getCharacterEncoding(); } @Override public int getContentLength() { return iRequest.getContentLength(); } @Override public String getContentType() { return iRequest.getContentType(); } @Override public ServletInputStream getInputStream() throws IOException { if (iInputStream == null) iInputStream = new ServletInputStreamWrapper(iRequest.getInputStream()); return iInputStream; } public byte[] getBody() { return (iInputStream == null ? null : iInputStream.getBytes()); } @Override public String getLocalAddr() { return iRequest.getLocalAddr(); } @Override public String getLocalName() { return iRequest.getLocalName(); } @Override public int getLocalPort() { return iRequest.getLocalPort(); } @Override public Locale getLocale() { return iRequest.getLocale(); } @Override public Enumeration getLocales() { return iRequest.getLocales(); } @Override public String getParameter(String name) { return iRequest.getParameter(name); } @Override public Map getParameterMap() { return iRequest.getParameterMap(); } @Override public Enumeration getParameterNames() { return iRequest.getParameterNames(); } @Override public String[] getParameterValues(String name) { return iRequest.getParameterValues(name); } @Override public String getProtocol() { return iRequest.getProtocol(); } @Override public BufferedReader getReader() throws IOException { return iRequest.getReader(); } @Override @Deprecated public String getRealPath(String path) { return iRequest.getRealPath(path); } @Override public String getRemoteAddr() { return iRequest.getRemoteAddr(); } @Override public String getRemoteHost() { return iRequest.getRemoteHost(); } @Override public int getRemotePort() { return iRequest.getRemotePort(); } @Override public RequestDispatcher getRequestDispatcher(String path) { return iRequest.getRequestDispatcher(path); } @Override public String getScheme() { return iRequest.getScheme(); } @Override public String getServerName() { return iRequest.getServerName(); } @Override public int getServerPort() { return iRequest.getServerPort(); } @Override public boolean isSecure() { return iRequest.isSecure(); } @Override public void removeAttribute(String name) { iRequest.removeAttribute(name); } @Override public void setAttribute(String name, Object o) { iRequest.setAttribute(name, o); } @Override public void setCharacterEncoding(String env) throws UnsupportedEncodingException { iRequest.setCharacterEncoding(env); } } private static class ServletInputStreamWrapper extends ServletInputStream { private InputStream iInputStream; private ByteArrayOutputStream iBytes; public ServletInputStreamWrapper(InputStream is) { iBytes = new ByteArrayOutputStream(); iInputStream = is; } @Override public int read() throws IOException { int out = iInputStream.read(); iBytes.write(out); return out; } @Override public void close() throws IOException { iInputStream.close(); iBytes.flush(); iBytes.close(); } public byte[] getBytes() { return iBytes.toByteArray(); } } } Index: UserAccessFilter.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/filter/UserAccessFilter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** UserAccessFilter.java 17 Jun 2008 21:24:50 -0000 1.2 --- UserAccessFilter.java 1 Dec 2010 11:10:47 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.filter; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.filter; Index: EncodingFilter.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/filter/EncodingFilter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EncodingFilter.java 11 Feb 2010 12:32:09 -0000 1.1 --- EncodingFilter.java 1 Dec 2010 11:10:47 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2008-2009, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2008-2009, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.filter; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.filter; *************** *** 31,35 **** public class EncodingFilter implements Filter { private String iEncoding; - private FilterConfig filterConfig; /** --- 31,34 ---- |
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/JavaSource/org/unitime/timetable/form Modified Files: CrossListsModifyForm.java EditRoomDeptForm.java ExamChangesForm.java ManagerSettingsForm.java SolverSettingsForm.java PosReservationEditForm.java SubjectListForm.java EventStandardNoteEditForm.java EditRoomFeatureForm.java UnassignedForm.java CharacteristicReservationForm.java SubjectAreaEditForm.java InstructorSearchForm.java MeetingListForm.java InstructionalOfferingModifyForm.java StudentGroupReservationEditForm.java PreferencesForm.java EventAddForm.java SolverLogForm.java RollForwardSessionForm.java RoomListForm.java SolverParameterDefEditForm.java SolverGroupEditForm.java CourseOfferingEditForm.java DistributionTypeEditForm.java SpecialUseRoomForm.java ExamReportForm.java RoomFeatureListForm.java ApplicationConfigForm.java TimetableManagerForm.java SettingsForm.java AssignedClassesForm.java ManageSolversForm.java DepartmentEditForm.java AssignmentHistoryForm.java ExamDistributionPrefsForm.java PersonalizedExamReportForm.java EventAddInfoForm.java DesignatorEditForm.java HibernateQueryTestForm.java DeptStatusTypeEditForm.java ReservationForm.java SolverParamGroupsForm.java EditRoomForm.java ClassInstructorAssignmentForm.java EventRoomAvailabilityForm.java TimetableForm.java UserEditForm.java SolverParamDefForm.java RoomGroupEditForm.java InstructionalOfferingConfigEditForm.java ExamPdfReportForm.java TimePatternEditForm.java EventDetailForm.java ClassListForm.java InstructionalOfferingListFormInterface.java ExamSolverForm.java ClassAssignmentsReportForm.java InstructionalOfferingListForm.java RoomGroupListForm.java DesignatorListForm.java EventListForm.java SolverInfoDefForm.java StudentSolverLogForm.java SolutionChangesForm.java ExamsForm.java ReservationEditForm.java InstructorListUpdateForm.java ClassesForm.java SchedulingSubpartEditForm.java ExamEditForm.java EditRoomGroupForm.java SectioningDemoForm.java ItypeDescEditForm.java ChameleonForm.java RefTableEntryListForm.java RoleListForm.java DataImportForm.java DepartmentListForm.java ExamGridForm.java SolverForm.java ReservationListForm.java ClassListFormInterface.java ExamListForm.java NonUnivLocationForm.java RoomAvailabilityForm.java RefTableEntryAddForm.java EditRoomPrefForm.java BuildingEditForm.java InstructorEditForm.java EventEditForm.java SponsoringOrgEditForm.java SolverParameterDefListForm.java IndividualReservationEditForm.java ClassEditForm.java RoomFeatureEditForm.java SuggestionsForm.java AcademicAreaReservationEditForm.java ClassInfoForm.java SolutionReportForm.java InstructionalOfferingDetailForm.java EventGridForm.java DepartmentRoomFeatureEditForm.java InquiryForm.java ExamSolverLogForm.java ExactTimeEditForm.java StudentSolverForm.java CourseReservationEditForm.java LastChangesForm.java ExamPeriodEditForm.java EnrollmentAuditPdfReportForm.java GlobalRoomFeatureEditForm.java DistributionPrefsForm.java EventStandardNotesForm.java DatePatternEditForm.java SponsoringOrgListForm.java BuildingListForm.java ListSolutionsForm.java SessionEditForm.java DistributionTypeListForm.java SessionListForm.java RefTableEntryEditForm.java ExamCbsForm.java RoomDetailForm.java ExamInfoForm.java RoomDeptEditForm.java RoomTypeEditForm.java AcademicAreaPosReservationForm.java RoomDeptListForm.java CbsForm.java ExamAssignmentReportForm.java Removed Files: CurriculumListForm.java Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: ClassListFormInterface.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/ClassListFormInterface.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ClassListFormInterface.java 17 Jun 2008 21:24:32 -0000 1.2 --- ClassListFormInterface.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.form; Index: SolverSettingsForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/SolverSettingsForm.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SolverSettingsForm.java 17 Jun 2008 21:24:32 -0000 1.3 --- SolverSettingsForm.java 1 Dec 2010 11:10:38 -0000 1.4 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.form; *************** *** 45,48 **** --- 45,49 ---- */ public class SolverSettingsForm extends ActionForm { + private static final long serialVersionUID = -9205033432561871308L; private String op; private Long uniqueId; *************** *** 175,179 **** public Collection getEnum(String type) { Vector options = new Vector(); ! StringTokenizer stk = new StringTokenizer(type.substring(5,type.length()),","); while (stk.hasMoreTokens()) options.add(stk.nextToken()); return options; --- 176,180 ---- public Collection getEnum(String type) { Vector options = new Vector(); ! StringTokenizer stk = new StringTokenizer(type,","); while (stk.hasMoreTokens()) options.add(stk.nextToken()); return options; Index: LastChangesForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/LastChangesForm.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LastChangesForm.java 17 Jun 2008 21:24:32 -0000 1.2 --- LastChangesForm.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.form; *************** *** 30,34 **** */ public class LastChangesForm extends ActionForm { ! private String iOp; private int iN; private Long iDepartmentId, iSubjAreaId, iManagerId; --- 30,35 ---- */ public class LastChangesForm extends ActionForm { ! private static final long serialVersionUID = 3633681949556250656L; ! private String iOp; private int iN; private Long iDepartmentId, iSubjAreaId, iManagerId; Index: EventStandardNoteEditForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/EventStandardNoteEditForm.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EventStandardNoteEditForm.java 18 Jul 2008 19:12:08 -0000 1.1 --- EventStandardNoteEditForm.java 1 Dec 2010 11:10:38 -0000 1.2 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.form; *************** *** 36,39 **** --- 36,40 ---- public class EventStandardNoteEditForm extends ActionForm { + private static final long serialVersionUID = 4715197445617849102L; private String iScreen = "edit"; private String iNote; Index: MeetingListForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/MeetingListForm.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MeetingListForm.java 5 Feb 2009 22:04:21 -0000 1.2 --- MeetingListForm.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ *************** *** 33,37 **** */ public class MeetingListForm extends EventListForm { ! private String iOrderBy = null; private String iLocation = null; public static final String sOrderByName = "Event Name"; --- 33,38 ---- */ public class MeetingListForm extends EventListForm { ! private static final long serialVersionUID = -3703482482732848853L; ! private String iOrderBy = null; private String iLocation = null; public static final String sOrderByName = "Event Name"; Index: SessionListForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/SessionListForm.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SessionListForm.java 17 Jun 2008 21:24:33 -0000 1.2 --- SessionListForm.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.form; Index: ItypeDescEditForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/ItypeDescEditForm.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ItypeDescEditForm.java 17 Jun 2008 21:24:32 -0000 1.4 --- ItypeDescEditForm.java 1 Dec 2010 11:10:38 -0000 1.5 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.form; *************** *** 27,31 **** import org.apache.struts.action.ActionMessage; import org.unitime.commons.Debug; - import org.unitime.commons.web.Web; import org.unitime.timetable.model.ItypeDesc; import org.unitime.timetable.model.Session; --- 27,30 ---- *************** *** 38,42 **** */ public class ItypeDescEditForm extends ActionForm { ! private Integer iUniqueId = null; private String iId = null; private String iOp = null; --- 37,42 ---- */ public class ItypeDescEditForm extends ActionForm { ! private static final long serialVersionUID = -238147307633027599L; ! private Integer iUniqueId = null; private String iId = null; private String iOp = null; *************** *** 53,58 **** try { - Session session = Session.getCurrentAcadSession(Web.getUser(request.getSession())); - if (iAbbreviation==null || iAbbreviation.trim().length()==0) errors.add("abbreviation", new ActionMessage("errors.required", "")); --- 53,56 ---- Index: ClassesForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/ClassesForm.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ClassesForm.java 27 Jun 2008 17:25:37 -0000 1.1 --- ClassesForm.java 1 Dec 2010 11:10:38 -0000 1.2 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.form; *************** *** 42,45 **** --- 42,46 ---- */ public class ClassesForm extends ActionForm { + private static final long serialVersionUID = -2473101585994845220L; private String iOp = null; private Long iSession = null; Index: AssignmentHistoryForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/AssignmentHistoryForm.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AssignmentHistoryForm.java 17 Jun 2008 21:24:32 -0000 1.2 --- AssignmentHistoryForm.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.form; *************** *** 32,35 **** --- 32,36 ---- */ public class AssignmentHistoryForm extends ActionForm { + private static final long serialVersionUID = 3346374266252617072L; private String iOp = null; private boolean iSimpleMode = false; Index: BuildingListForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/BuildingListForm.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BuildingListForm.java 17 Jun 2008 21:24:33 -0000 1.2 --- BuildingListForm.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.form; Index: InstructionalOfferingConfigEditForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/InstructionalOfferingConfigEditForm.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** InstructionalOfferingConfigEditForm.java 16 Feb 2010 20:28:02 -0000 1.4 --- InstructionalOfferingConfigEditForm.java 1 Dec 2010 11:10:38 -0000 1.5 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.form; *************** *** 131,138 **** if (!this.getUnlimited().booleanValue()) { int numClasses = sic.getNumClasses(); - int numRooms = sic.getNumRooms(); - int minLimitPerClass = sic.getMinLimitPerClass(); int maxLimitPerClass = sic.getMaxLimitPerClass(); - float roomRatio = sic.getRoomRatio(); if (numClasses == 1 && maxLimitPerClass!=this.limit) { --- 131,135 ---- Index: DepartmentListForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/DepartmentListForm.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DepartmentListForm.java 17 Jun 2008 21:24:32 -0000 1.3 --- DepartmentListForm.java 1 Dec 2010 11:10:38 -0000 1.4 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.form; Index: RoomTypeEditForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/RoomTypeEditForm.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RoomTypeEditForm.java 16 Jul 2008 20:51:59 -0000 1.1 --- RoomTypeEditForm.java 1 Dec 2010 11:10:39 -0000 1.2 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.form; *************** *** 34,38 **** */ public class RoomTypeEditForm extends ActionForm { ! private String iOp; private Long iUniqueId; private String iReference; --- 34,39 ---- */ public class RoomTypeEditForm extends ActionForm { ! private static final long serialVersionUID = 3139971302727896389L; ! private String iOp; private Long iUniqueId; private String iReference; Index: RefTableEntryListForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/RefTableEntryListForm.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RefTableEntryListForm.java 17 Jun 2008 21:24:32 -0000 1.2 --- RefTableEntryListForm.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.form; *************** *** 37,43 **** public abstract class RefTableEntryListForm extends ActionForm { ! /** ! * ! */ // --------------------------------------------------------- Instance Variables --- 37,41 ---- public abstract class RefTableEntryListForm extends ActionForm { ! private static final long serialVersionUID = 5632195965988404841L; // --------------------------------------------------------- Instance Variables Index: SectioningDemoForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/SectioningDemoForm.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SectioningDemoForm.java 23 Jan 2009 03:10:00 -0000 1.3 --- SectioningDemoForm.java 1 Dec 2010 11:10:38 -0000 1.4 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.form; *************** *** 56,60 **** */ public class SectioningDemoForm extends ActionForm { ! public static final Long sTypeNone = new Long(0); public static final Long sTypeCourse = new Long(1); public static final Long sTypeFreeTime = new Long(2); --- 56,61 ---- */ public class SectioningDemoForm extends ActionForm { ! private static final long serialVersionUID = 2315689042064314581L; ! public static final Long sTypeNone = new Long(0); public static final Long sTypeCourse = new Long(1); public static final Long sTypeFreeTime = new Long(2); *************** *** 109,113 **** try { Session session = Session.getCurrentAcadSession(Web.getUser(request.getSession())); - Vector v = new Vector(); for (Iterator i=session.getSubjectAreas().iterator();i.hasNext();) { SubjectArea sa = (SubjectArea)i.next(); --- 110,113 ---- *************** *** 401,405 **** } public void setTitle(String title) { - String updatedTitle = title; iTitle = title; } --- 401,404 ---- *************** *** 856,860 **** CourseOffering co = CourseOffering.findBySessionSubjAreaAbbvCourseNbr(session.getUniqueId(), subjectArea, courseNumber); if (co==null) continue; - Vector courses = new Vector(); RequestBean request = new RequestBean(); request.setType(sTypeCourse); --- 855,858 ---- Index: SolverParameterDefListForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/SolverParameterDefListForm.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SolverParameterDefListForm.java 17 Jun 2008 21:24:32 -0000 1.2 --- SolverParameterDefListForm.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.form; *************** *** 33,36 **** --- 33,38 ---- public class SolverParameterDefListForm extends ActionForm { + private static final long serialVersionUID = 4159291816177340774L; + // --------------------------------------------------------- Instance Variables Index: CourseReservationEditForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/CourseReservationEditForm.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CourseReservationEditForm.java 17 Jun 2008 21:24:32 -0000 1.3 --- CourseReservationEditForm.java 1 Dec 2010 11:10:38 -0000 1.4 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.form; *************** *** 45,49 **** // --------------------------------------------------------- Instance Variables ! private List courseOfferingId; private String reservationTypeLabel; --- 45,50 ---- // --------------------------------------------------------- Instance Variables ! private static final long serialVersionUID = -5735656156412336196L; ! private List courseOfferingId; private String reservationTypeLabel; Index: EventStandardNotesForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/EventStandardNotesForm.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EventStandardNotesForm.java 2 Sep 2008 20:06:16 -0000 1.2 --- EventStandardNotesForm.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.form; *************** *** 35,38 **** --- 35,39 ---- public class EventStandardNotesForm extends ActionForm { + private static final long serialVersionUID = 4764358302157565376L; private String iOp; Index: ClassListForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/ClassListForm.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ClassListForm.java 26 Aug 2009 01:51:21 -0000 1.6 --- ClassListForm.java 1 Dec 2010 11:10:38 -0000 1.7 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.form; Index: EventEditForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/EventEditForm.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EventEditForm.java 2 Mar 2009 22:26:20 -0000 1.5 --- EventEditForm.java 1 Dec 2010 11:10:38 -0000 1.6 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ *************** *** 26,30 **** import javax.servlet.http.HttpServletRequest; - import javax.servlet.http.HttpSession; import org.hibernate.Session; --- 26,29 ---- *************** *** 53,56 **** --- 52,56 ---- public class EventEditForm extends EventAddInfoForm { + private static final long serialVersionUID = -3328395693067063643L; private Long iId; *************** *** 61,66 **** iId = Long.valueOf(request.getParameter("id")); - HttpSession session = request.getSession(); - User user = Web.getUser(request.getSession()); setEvent(EventDAO.getInstance().get(iId)); setEventName(getEvent().getEventName()); --- 61,64 ---- *************** *** 80,89 **** loadExistingMeetings(); - TimetableManager tm = TimetableManager.getManager(user); - } public void update(HttpServletRequest request) { - HttpSession session = request.getSession(); Transaction tx = null; try { --- 78,84 ---- *************** *** 147,151 **** hibSession.saveOrUpdate(event); ! new EventEmail(event, EventEmail.sActionUpdate, new TreeSet<MultiMeeting>(), getAdditionalInfo()).send(request); ChangeLog.addChange( --- 142,146 ---- hibSession.saveOrUpdate(event); ! new EventEmail(event, EventEmail.sActionUpdate, new TreeSet<MultiMeeting>(), getAdditionalInfo(), null).send(request); ChangeLog.addChange( Index: ExamEditForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/ExamEditForm.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ExamEditForm.java 23 Jan 2009 03:10:00 -0000 1.9 --- ExamEditForm.java 1 Dec 2010 11:10:38 -0000 1.10 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.form; *************** *** 56,60 **** public class ExamEditForm extends PreferencesForm { ! private String examId; private String label; private String name; --- 56,61 ---- public class ExamEditForm extends PreferencesForm { ! private static final long serialVersionUID = -5083087578026654516L; ! private String examId; private String label; private String name; *************** *** 70,79 **** private List instructors; - private List objectType; private List subjectArea; private List courseNbr; private List itype; private List classNumber; - private List messages; private Collection subjectAreas; --- 71,78 ---- Index: ReservationListForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/ReservationListForm.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ReservationListForm.java 17 Jun 2008 21:24:32 -0000 1.2 --- ReservationListForm.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.form; *************** *** 42,48 **** public class ReservationListForm extends ActionForm { // --------------------------------------------------------- Instance Variables ! private String op; private String subjectAreaId; private String courseNbr; --- 42,50 ---- public class ReservationListForm extends ActionForm { + private static final long serialVersionUID = 7678017577857354414L; + // --------------------------------------------------------- Instance Variables ! private String op; private String subjectAreaId; private String courseNbr; Index: DeptStatusTypeEditForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/DeptStatusTypeEditForm.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DeptStatusTypeEditForm.java 17 Jun 2008 21:24:32 -0000 1.6 --- DeptStatusTypeEditForm.java 1 Dec 2010 11:10:38 -0000 1.7 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.form; *************** *** 40,44 **** */ public class DeptStatusTypeEditForm extends ActionForm { ! private String iOp; private Long iUniqueId; private String iReference; --- 40,45 ---- */ public class DeptStatusTypeEditForm extends ActionForm { ! private static final long serialVersionUID = -684686223274367430L; ! private String iOp; private Long iUniqueId; private String iReference; *************** *** 61,64 **** --- 62,67 ---- private boolean iCanNoRoleReportExamMid = false; private boolean iCanNoRoleReportClass = false; + private boolean iCanSectioningStudents = false; + private boolean iCanPreRegisterStudents = false; *************** *** 106,109 **** --- 109,114 ---- iCanNoRoleReportExamMid = false; iCanNoRoleReportClass = false; + iCanSectioningStudents = false; + iCanPreRegisterStudents = false; } *************** *** 158,161 **** --- 163,171 ---- public void setCanNoRoleReportClass(boolean canNoRoleReportClass) { iCanNoRoleReportClass = canNoRoleReportClass; } public boolean getCanNoRoleReportClass() { return iCanNoRoleReportClass; } + public void setCanSectioningStudents(boolean canSectioningStudents) { iCanSectioningStudents = canSectioningStudents; } + public boolean getCanSectioningStudents() { return iCanSectioningStudents; } + public void setCanPreRegisterStudents(boolean canPreRegisterStudents) { iCanPreRegisterStudents = canPreRegisterStudents; } + public boolean getCanPreRegisterStudents() { return iCanPreRegisterStudents; } + public int getRights() { int rights = 0; *************** *** 175,178 **** --- 185,190 ---- if (getCanNoRoleReportExamMid()) rights += DepartmentStatusType.sCanNoRoleReportExamMid; if (getCanNoRoleReportClass()) rights += DepartmentStatusType.sCanNoRoleReportClass; + if (getCanSectioningStudents()) rights += DepartmentStatusType.sCanSectioningStudents; + if (getCanPreRegisterStudents()) rights += DepartmentStatusType.sCanPreRegisterStudents; return rights; } *************** *** 193,196 **** --- 205,210 ---- setCanNoRoleReportExamMid((rights&DepartmentStatusType.sCanNoRoleReportExamMid)==DepartmentStatusType.sCanNoRoleReportExamMid); setCanNoRoleReportClass((rights&DepartmentStatusType.sCanNoRoleReportClass)==DepartmentStatusType.sCanNoRoleReportClass); + setCanSectioningStudents((rights&DepartmentStatusType.sCanSectioningStudents)==DepartmentStatusType.sCanSectioningStudents); + setCanPreRegisterStudents((rights&DepartmentStatusType.sCanPreRegisterStudents)==DepartmentStatusType.sCanPreRegisterStudents); } Index: ClassInfoForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/ClassInfoForm.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ClassInfoForm.java 16 Feb 2010 18:02:34 -0000 1.3 --- ClassInfoForm.java 1 Dec 2010 11:10:38 -0000 1.4 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.form; *************** *** 37,41 **** */ public class ClassInfoForm extends ActionForm { ! private String iOp; private ClassInfoModel iModel; private String iMessage; --- 37,42 ---- */ public class ClassInfoForm extends ActionForm { ! private static final long serialVersionUID = -9085986972061220089L; ! private String iOp; private ClassInfoModel iModel; private String iMessage; Index: ExamDistributionPrefsForm.java ===================... [truncated message content] |
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/JavaSource/org/unitime/timetable/model/dao Modified Files: ExactTimeMinsDAO.java DemandOfferingTypeDAO.java SolverInfoDefDAO.java SolverParameterDAO.java RoomFeatureDAO.java AcademicAreaDAO.java ApplicationConfigDAO.java ConstraintInfoDAO.java CourseEventDAO.java StandardEventNoteDAO.java SolverPredefinedSettingDAO.java BuildingPrefDAO.java RoomDAO.java TimePatternTimeDAO.java CourseCreditFormatDAO.java StaffDAO.java DistributionPrefDAO.java BuildingDAO.java AssignmentInfoDAO.java SectioningInfoDAO.java SolutionDAO.java StudentAccomodationDAO.java CourseDemandDAO.java SolverInfoDAO.java VariableFixedCreditUnitConfigDAO.java CurriculumDAO.java DepartmentStatusTypeDAO.java TimetableManagerDAO.java CourseCreditUnitTypeDAO.java ExamEventDAO.java RoomDeptDAO.java LocationDAO.java CourseCatalogDAO.java DatePatternDAO.java RoomFeaturePrefDAO.java DesignatorDAO.java UserDataDAO.java _RootDAO.java SchedulingSubpartDAO.java CourseCreditUnitConfigDAO.java EventNoteDAO.java CourseRequestOptionDAO.java EventContactDAO.java Class_DAO.java RoomGroupPrefDAO.java CharacteristicReservationDAO.java ExamDAO.java StudentGroupDAO.java CourseCreditTypeDAO.java OfferingConsentTypeDAO.java EventDAO.java RolesDAO.java SubjectAreaDAO.java ManagerRoleDAO.java LastLikeCourseDemandDAO.java GlobalRoomFeatureDAO.java RefTableEntryDAO.java CourseHistoryDAO.java PosReservationDAO.java InstructionalOfferingDAO.java ReservationTypeDAO.java ChangeLogDAO.java CurriculumClassificationDAO.java TimePatternDAO.java ExamLocationPrefDAO.java SolutionInfoDAO.java DistributionObjectDAO.java SolverParameterGroupDAO.java TimePatternDaysDAO.java AcademicClassificationDAO.java ExternalBuildingDAO.java RoomGroupDAO.java VariableRangeCreditUnitConfigDAO.java ItypeDescDAO.java DepartmentRoomFeatureDAO.java RoomTypeOptionDAO.java ManagerSettingsDAO.java UserDAO.java ClassInstructorDAO.java SolverGroupDAO.java AcademicAreaClassificationDAO.java CourseRequestDAO.java RoomPrefDAO.java AcademicAreaHistoryDAO.java StudentEnrollmentMessageDAO.java SubjectHistoryDAO.java PreferenceLevelDAO.java FinalExamEventDAO.java StudentSectHistoryDAO.java PositionCodeTypeDAO.java CourseOfferingReservationDAO.java AcadAreaReservationDAO.java InstrOfferingConfigDAO.java ExamConflictDAO.java JointEnrollmentDAO.java StudentClassEnrollmentDAO.java NonUniversityLocationDAO.java DistributionTypeDAO.java PosMajorDAO.java RelatedCourseInfoDAO.java CurriculumCourseDAO.java DepartmentalInstructorDAO.java SpecialEventDAO.java StudentStatusTypeDAO.java FixedCreditUnitConfigDAO.java ExternalRoomDepartmentDAO.java ExamPeriodDAO.java IndividualReservationDAO.java RoomTypeDAO.java CourseOfferingDAO.java ArrangeCreditUnitConfigDAO.java AcadAreaPosReservationDAO.java ExamPeriodPrefDAO.java BuildingAbbreviationHistoryDAO.java ClassWaitListDAO.java StudentGroupReservationDAO.java CourseSubpartCreditDAO.java PreferenceDAO.java WaitListDAO.java HistoryDAO.java ClassEventDAO.java ExternalRoomDAO.java PositionTypeDAO.java ExternalRoomFeatureDAO.java ReservationDAO.java SponsoringOrganizationDAO.java FreeTimeDAO.java AssignmentDAO.java SettingsDAO.java MeetingDAO.java PosMinorDAO.java DepartmentDAO.java SessionDAO.java MidtermExamEventDAO.java PreferenceGroupDAO.java StudentDAO.java StudentEnrollmentDAO.java SolverParameterDefDAO.java TimePrefDAO.java ExamOwnerDAO.java Added Files: CurriculumCourseGroupDAO.java QueryLogDAO.java StudentSectioningQueueDAO.java CurriculumProjectionRuleDAO.java Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: SubjectAreaDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/SubjectAreaDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SubjectAreaDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- SubjectAreaDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: SolutionInfoDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/SolutionInfoDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SolutionInfoDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- SolutionInfoDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: CourseOfferingDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/CourseOfferingDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CourseOfferingDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- CourseOfferingDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: StudentClassEnrollmentDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/StudentClassEnrollmentDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** StudentClassEnrollmentDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- StudentClassEnrollmentDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: JointEnrollmentDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/JointEnrollmentDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JointEnrollmentDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- JointEnrollmentDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: MeetingDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/MeetingDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MeetingDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- MeetingDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** /* * UniTime 3.1 (University Course Timetabling & Student Sectioning Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* * UniTime 3.1 (University Course Timetabling & Student Sectioning Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: PosReservationDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/PosReservationDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PosReservationDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- PosReservationDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: SettingsDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/SettingsDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SettingsDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- SettingsDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: ExamConflictDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/ExamConflictDAO.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ExamConflictDAO.java 17 Jun 2008 21:24:42 -0000 1.3 --- ExamConflictDAO.java 1 Dec 2010 11:10:39 -0000 1.4 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: ConstraintInfoDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/ConstraintInfoDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ConstraintInfoDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- ConstraintInfoDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: InstrOfferingConfigDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/InstrOfferingConfigDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** InstrOfferingConfigDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- InstrOfferingConfigDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: ExamPeriodDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/ExamPeriodDAO.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ExamPeriodDAO.java 17 Jun 2008 21:24:42 -0000 1.3 --- ExamPeriodDAO.java 1 Dec 2010 11:10:39 -0000 1.4 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: CourseRequestDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/CourseRequestDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CourseRequestDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- CourseRequestDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: EventDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/EventDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EventDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- EventDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** /* * UniTime 3.1 (University Course Timetabling & Student Sectioning Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* * UniTime 3.1 (University Course Timetabling & Student Sectioning Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: TimePatternTimeDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/TimePatternTimeDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TimePatternTimeDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- TimePatternTimeDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: DepartmentRoomFeatureDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/DepartmentRoomFeatureDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DepartmentRoomFeatureDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- DepartmentRoomFeatureDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: CurriculumClassificationDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/CurriculumClassificationDAO.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CurriculumClassificationDAO.java 10 Sep 2008 21:48:24 -0000 1.1 --- CurriculumClassificationDAO.java 1 Dec 2010 11:10:39 -0000 1.2 *************** *** 1,2 **** --- 1,21 ---- + /* + * UniTime 3.2 (University Timetabling Application) + * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors + * as indicated by the @authors tag. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ package org.unitime.timetable.model.dao; Index: SubjectHistoryDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/SubjectHistoryDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SubjectHistoryDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- SubjectHistoryDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: AssignmentDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/AssignmentDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AssignmentDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- AssignmentDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: CourseDemandDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/CourseDemandDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CourseDemandDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- CourseDemandDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: CourseSubpartCreditDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/CourseSubpartCreditDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CourseSubpartCreditDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- CourseSubpartCreditDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: ExternalRoomDepartmentDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/ExternalRoomDepartmentDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ExternalRoomDepartmentDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- ExternalRoomDepartmentDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: ExamEventDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/ExamEventDAO.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExamEventDAO.java 9 May 2008 04:09:52 -0000 1.1 --- ExamEventDAO.java 1 Dec 2010 11:10:39 -0000 1.2 *************** *** 1,2 **** --- 1,21 ---- + /* + * UniTime 3.2 (University Timetabling Application) + * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors + * as indicated by the @authors tag. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ package org.unitime.timetable.model.dao; Index: EventNoteDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/EventNoteDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EventNoteDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- EventNoteDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** /* * UniTime 3.1 (University Course Timetabling & Student Sectioning Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* * UniTime 3.1 (University Course Timetabling & Student Sectioning Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: SolverParameterDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/SolverParameterDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SolverParameterDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- SolverParameterDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: RoomGroupDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/RoomGroupDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RoomGroupDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- RoomGroupDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: PosMajorDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/PosMajorDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PosMajorDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- PosMajorDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: TimePrefDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/TimePrefDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TimePrefDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- TimePrefDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: StudentDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/StudentDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** StudentDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- StudentDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: DistributionPrefDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/DistributionPrefDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DistributionPrefDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- DistributionPrefDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: RoomFeatureDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/RoomFeatureDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RoomFeatureDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- RoomFeatureDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.dao; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.dao; Index: CourseCreditTypeDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/dao/CourseCreditTypeDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CourseCreditTypeDAO.java 17 Jun 2008 21:24:42 -0000 1.2 --- CourseCreditTypeDAO.java 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Sof... [truncated message content] |
Update of /cvsroot/unitime/UniTime/WebContent/WEB-INF/lib In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/WebContent/WEB-INF/lib Modified Files: mail.jar hibernate3.jar Added Files: gwt-servlet.jar log4j-1.2.15.jar oro-2.0.8.jar backport-util-concurrent.jar commons-beanutils-1.8.0.jar commons-validator-1.3.1.jar struts-scripting-1.3.10.jar commons-configuration-1.6.jar slf4j-api-1.5.8.jar struts-extras-1.3.10.jar org.restlet.ext.net.jar struts-el-1.3.10.jar commons-chain-1.2.jar struts-tiles-1.3.10.jar javassist-3.9.0.GA.jar struts-faces-1.3.10.jar cpsolver-all-1.2.jar iText-5.0.2.jar struts-mailreader-dao-1.3.10.jar commons-logging-1.1.1.jar org.restlet.jar struts-core-1.3.10.jar jstl-1.0.2.jar bsf-2.3.0.jar commons-collections-3.2.1.jar slf4j-log4j12-1.5.8.jar commons-dbcp-1.4.jar ehcache-1.5.0.jar commons-fileupload-1.1.1.jar mysql-connector-java-5.1.11-bin.jar commons-pool-1.5.4.jar struts-taglib-1.3.10.jar standard-1.0.6.jar commons-io-1.1.jar jta-1.1.jar Struts-Layout-1.3.jar Removed Files: itext-1.4.5.jar jaxp-api.jar connector.jar commons-beanutils-core.jar cpsolver-all-1.1.jar commons-logging-1.1.jar jstl.jar activation.jar sax.jar saxpath.jar commons-beanutils-bean-collections.jar asm.jar proxool-0.8.3.jar commons-lang-2.3.jar jdbc2_0-stdext.jar xercesImpl.jar jboss-system.jar concurrent-1.3.3.jar mysql-connector-java-5.0.5-bin.jar ehcache-1.2.3.jar commons-dbcp-1.2.2.jar xerces-2.6.2.jar commons-jxpath-1.2.jar commons-pool-1.3.jar commons-fileupload.jar oscache-2.1.jar cglib-2.1.3.jar jaxen-full.jar jta.jar jgroups-2.2.8.jar jboss-cache.jar Struts-Layout.jar swarmcache-1.0rc2.jar jakarta-oro.jar standard.jar xalan-2.4.0.jar commons-codec-1.3.jar jboss-common.jar jboss-jmx.jar junit-3.8.1.jar commons-collections-3.2.jar struts.jar commons-beanutils.jar versioncheck.jar xml-apis.jar c3p0-0.9.1.jar commons-configuration-1.4.jar asm-attrs.jar Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) --- oscache-2.1.jar DELETED --- --- proxool-0.8.3.jar DELETED --- --- xercesImpl.jar DELETED --- --- cglib-2.1.3.jar DELETED --- --- NEW FILE: commons-chain-1.2.jar --- (This appears to be a binary file; contents omitted.) --- commons-fileupload.jar DELETED --- Index: mail.jar =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/WEB-INF/lib/mail.jar,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsRzpCkl and /tmp/cvsTPiW3r differ --- activation.jar DELETED --- --- commons-beanutils-core.jar DELETED --- --- saxpath.jar DELETED --- --- connector.jar DELETED --- --- NEW FILE: standard-1.0.6.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: commons-validator-1.3.1.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: struts-el-1.3.10.jar --- (This appears to be a binary file; contents omitted.) --- sax.jar DELETED --- --- NEW FILE: struts-faces-1.3.10.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: commons-fileupload-1.1.1.jar --- (This appears to be a binary file; contents omitted.) --- junit-3.8.1.jar DELETED --- Index: hibernate3.jar =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/WEB-INF/lib/hibernate3.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsV9gTYo and /tmp/cvsgsh1Vv differ --- commons-codec-1.3.jar DELETED --- --- NEW FILE: commons-logging-1.1.1.jar --- (This appears to be a binary file; contents omitted.) --- c3p0-0.9.1.jar DELETED --- --- NEW FILE: commons-configuration-1.6.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Struts-Layout-1.3.jar --- (This appears to be a binary file; contents omitted.) --- cpsolver-all-1.1.jar DELETED --- --- jboss-common.jar DELETED --- --- jaxp-api.jar DELETED --- --- NEW FILE: commons-dbcp-1.4.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: iText-5.0.2.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: slf4j-api-1.5.8.jar --- (This appears to be a binary file; contents omitted.) --- asm.jar DELETED --- --- NEW FILE: jta-1.1.jar --- (This appears to be a binary file; contents omitted.) --- commons-beanutils.jar DELETED --- --- NEW FILE: commons-collections-3.2.1.jar --- (This appears to be a binary file; contents omitted.) --- commons-beanutils-bean-collections.jar DELETED --- --- versioncheck.jar DELETED --- --- ehcache-1.2.3.jar DELETED --- --- NEW FILE: struts-tiles-1.3.10.jar --- (This appears to be a binary file; contents omitted.) --- itext-1.4.5.jar DELETED --- --- Struts-Layout.jar DELETED --- --- jboss-jmx.jar DELETED --- --- xml-apis.jar DELETED --- --- NEW FILE: jstl-1.0.2.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: org.restlet.ext.net.jar --- (This appears to be a binary file; contents omitted.) --- standard.jar DELETED --- --- NEW FILE: oro-2.0.8.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: struts-taglib-1.3.10.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: struts-core-1.3.10.jar --- (This appears to be a binary file; contents omitted.) --- commons-pool-1.3.jar DELETED --- --- jstl.jar DELETED --- --- commons-logging-1.1.jar DELETED --- --- struts.jar DELETED --- --- mysql-connector-java-5.0.5-bin.jar DELETED --- --- NEW FILE: gwt-servlet.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: slf4j-log4j12-1.5.8.jar --- (This appears to be a binary file; contents omitted.) --- xerces-2.6.2.jar DELETED --- --- NEW FILE: commons-io-1.1.jar --- (This appears to be a binary file; contents omitted.) --- jakarta-oro.jar DELETED --- --- NEW FILE: commons-pool-1.5.4.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: org.restlet.jar --- (This appears to be a binary file; contents omitted.) --- xalan-2.4.0.jar DELETED --- --- NEW FILE: struts-mailreader-dao-1.3.10.jar --- (This appears to be a binary file; contents omitted.) --- swarmcache-1.0rc2.jar DELETED --- --- jaxen-full.jar DELETED --- --- commons-dbcp-1.2.2.jar DELETED --- --- NEW FILE: backport-util-concurrent.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ehcache-1.5.0.jar --- (This appears to be a binary file; contents omitted.) --- commons-jxpath-1.2.jar DELETED --- --- NEW FILE: struts-extras-1.3.10.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mysql-connector-java-5.1.11-bin.jar --- (This appears to be a binary file; contents omitted.) --- jdbc2_0-stdext.jar DELETED --- --- NEW FILE: log4j-1.2.15.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: commons-beanutils-1.8.0.jar --- (This appears to be a binary file; contents omitted.) --- commons-configuration-1.4.jar DELETED --- --- asm-attrs.jar DELETED --- --- jboss-system.jar DELETED --- --- jboss-cache.jar DELETED --- --- NEW FILE: javassist-3.9.0.GA.jar --- (This appears to be a binary file; contents omitted.) --- commons-lang-2.3.jar DELETED --- --- jgroups-2.2.8.jar DELETED --- --- jta.jar DELETED --- --- NEW FILE: bsf-2.3.0.jar --- (This appears to be a binary file; contents omitted.) --- commons-collections-3.2.jar DELETED --- --- NEW FILE: struts-scripting-1.3.10.jar --- (This appears to be a binary file; contents omitted.) --- concurrent-1.3.3.jar DELETED --- --- NEW FILE: cpsolver-all-1.2.jar --- (This appears to be a binary file; contents omitted.) |
Update of /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/Documentation/Database/MySQL/Changes Modified Files: 20 Exam room changes.sql 29 Event speedup.sql 27 Exam solver parameters update.sql 24 Exam avg period.sql 31 Student solver parameters.sql 40 Curricula renames.sql 48 Exam event offset.sql 50 Curriculum major.sql 25 Exam unique id rolled forward from.sql 30 Room type.sql 15 Exam conflicts.sql 06 Lastlike course demand permid.sql 19 Add Event Tables.sql 43 Class increase size of class suffix.sql 44 Add enrollment to class.sql 36 Exam size.sql 13 Exams speedup.sql 18 Location perm id add.sql 01 Column Renames.sql 17 Evening exams.sql 07 IType Abbreviation.sql 10 Course offering cache lastlike demands.sql 23 External Room exam capacity.sql 12 Student class enrollment.sql 22 Class exam event.sql 08 Distribution Pref add column.sql 28 Exam solver parameters update.sql 42 Exam solver parameters update.sql 35 Event phone session dates.sql 37 Data types.sql 39 Curricula changes.sql 00 Package Renames.sql 32 Event changes.sql 34 Event notes.sql 16 Exam instructor conflicts.sql 03 On fly student sectioning.sql 33 Room type.sql 49 Name Length Changes.sql 09 ItypeDesc Parent.sql 05 Application config name size.sql 14 Exam solver parameters.sql 46 Committed student enrls load speedup.sql 26 Event changes.sql 04 Timetable Grid Fix.sql 41 Exam print offset.sql 11 Exams.sql 38 Curricula tables add.sql 21 Add External Uids.sql 47 Add receive emails to manager roles.sql 02 Room group feature abbv.sql 45 Increase size of schedule print note.sql Added Files: 52 Curriculum course groups.sql 51 Curriculum course groups.sql 53 Curriculum manager role.sql 57 Solver changes (coordinates and curricula).sql 58 Curriculum student cache.sql 62 Index on Student External Id.sql 54 Acad area clasf major indexes.sql 60 Using student course requests in the solver.sql 59 Sectioning queue.sql 61 Session holidays need to cover 13 months.sql 63 Query log.sql 55 Curriculum projection rules.sql 56 Allow for GPS coordinates.sql Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: 14 Exam solver parameters.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/14 Exam solver parameters.sql,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** 14 Exam solver parameters.sql 9 Jul 2008 20:18:29 -0000 1.5 --- 14 Exam solver parameters.sql 1 Dec 2010 11:10:40 -0000 1.6 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 10 Course offering cache lastlike demands.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/10 Course offering cache lastlike demands.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 10 Course offering cache lastlike demands.sql 17 Jun 2008 21:24:46 -0000 1.2 --- 10 Course offering cache lastlike demands.sql 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 44 Add enrollment to class.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/44 Add enrollment to class.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 44 Add enrollment to class.sql 29 Mar 2009 15:04:03 -0000 1.1 --- 44 Add enrollment to class.sql 1 Dec 2010 11:10:39 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ --- NEW FILE: 62 Index on Student External Id.sql --- /* * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * */ create index idx_student_external_uid on student(external_uid); /** * Update database version */ update application_config set value='62' where name='tmtbl.db.version'; commit; Index: 22 Class exam event.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/22 Class exam event.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 22 Class exam event.sql 17 Jun 2008 21:24:46 -0000 1.2 --- 22 Class exam event.sql 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 33 Room type.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/33 Room type.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 33 Room type.sql 16 Jul 2008 20:49:50 -0000 1.1 --- 33 Room type.sql 1 Dec 2010 11:10:40 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 31 Student solver parameters.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/31 Student solver parameters.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 31 Student solver parameters.sql 9 Jul 2008 20:18:29 -0000 1.2 --- 31 Student solver parameters.sql 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 27 Exam solver parameters update.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/27 Exam solver parameters update.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 27 Exam solver parameters update.sql 9 Jul 2008 20:18:29 -0000 1.3 --- 27 Exam solver parameters update.sql 1 Dec 2010 11:10:39 -0000 1.4 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 24 Exam avg period.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/24 Exam avg period.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 24 Exam avg period.sql 17 Jun 2008 21:24:46 -0000 1.2 --- 24 Exam avg period.sql 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 01 Column Renames.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/01 Column Renames.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 01 Column Renames.sql 17 Jun 2008 21:24:46 -0000 1.2 --- 01 Column Renames.sql 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 36 Exam size.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/36 Exam size.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 36 Exam size.sql 9 Sep 2008 16:52:17 -0000 1.1 --- 36 Exam size.sql 1 Dec 2010 11:10:39 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ --- NEW FILE: 60 Using student course requests in the solver.sql --- /* * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * */ update solver_parameter_def set type = 'enum(Last Like Student Course Demands,Weighted Last Like Student Course Demands,Projected Student Course Demands,Curricula Course Demands,Curricula Last Like Course Demands,Student Course Requests,Enrolled Student Course Demands)' where name = 'Curriculum.StudentCourseDemadsClass'; /** * Update database version */ update application_config set value='60' where name='tmtbl.db.version'; commit; Index: 50 Curriculum major.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/50 Curriculum major.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 50 Curriculum major.sql 20 May 2010 14:02:32 -0000 1.1 --- 50 Curriculum major.sql 1 Dec 2010 11:10:39 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 07 IType Abbreviation.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/07 IType Abbreviation.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 07 IType Abbreviation.sql 17 Jun 2008 21:24:46 -0000 1.2 --- 07 IType Abbreviation.sql 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 18 Location perm id add.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/18 Location perm id add.sql,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** 18 Location perm id add.sql 9 Jul 2008 20:18:29 -0000 1.5 --- 18 Location perm id add.sql 1 Dec 2010 11:10:39 -0000 1.6 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ --- NEW FILE: 58 Curriculum student cache.sql --- /* * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * */ alter table curriculum_clasf add students longtext binary null; /** * Update database version */ update application_config set value='58' where name='tmtbl.db.version'; commit; Index: 28 Exam solver parameters update.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/28 Exam solver parameters update.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 28 Exam solver parameters update.sql 9 Jul 2008 20:18:29 -0000 1.3 --- 28 Exam solver parameters update.sql 1 Dec 2010 11:10:39 -0000 1.4 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 35 Event phone session dates.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/35 Event phone session dates.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 35 Event phone session dates.sql 5 Aug 2008 20:03:44 -0000 1.1 --- 35 Event phone session dates.sql 1 Dec 2010 11:10:39 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 46 Committed student enrls load speedup.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/46 Committed student enrls load speedup.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 46 Committed student enrls load speedup.sql 1 Aug 2009 12:20:28 -0000 1.1 --- 46 Committed student enrls load speedup.sql 1 Dec 2010 11:10:40 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 38 Curricula tables add.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/38 Curricula tables add.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 38 Curricula tables add.sql 9 Sep 2008 21:42:47 -0000 1.1 --- 38 Curricula tables add.sql 1 Dec 2010 11:10:40 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 42 Exam solver parameters update.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/42 Exam solver parameters update.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 42 Exam solver parameters update.sql 23 Sep 2008 20:23:45 -0000 1.1 --- 42 Exam solver parameters update.sql 1 Dec 2010 11:10:39 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 34 Event notes.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/34 Event notes.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 34 Event notes.sql 29 Jul 2008 20:19:35 -0000 1.1 --- 34 Event notes.sql 1 Dec 2010 11:10:39 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 19 Add Event Tables.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/19 Add Event Tables.sql,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** 19 Add Event Tables.sql 9 Jul 2008 20:18:29 -0000 1.4 --- 19 Add Event Tables.sql 1 Dec 2010 11:10:39 -0000 1.5 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ --- NEW FILE: 63 Query log.sql --- /* * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * */ create table query_log ( uniqueid decimal(20,0) primary key not null, time_stamp datetime not null, time_spent decimal(20,0) not null, uri varchar(255) not null, type decimal(10,0) not null, session_id varchar(32) null, userid varchar(40) null, query longtext binary null, exception longtext binary null ) engine = INNODB; create index idx_query_log on query_log(time_stamp); /** * Update database version */ update application_config set value='63' where name='tmtbl.db.version'; commit; --- NEW FILE: 57 Solver changes (coordinates and curricula).sql --- /* * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * */ /* deprecated parameters */ update solver_parameter_def set visible = 0, description = 'Weight last-like students (deprecated)' where name = 'General.WeightStudents'; update solver_parameter_def set visible = 0, description = 'Student Conflict: Distance Limit (after 75min class, deprecated)' where name = 'Student.DistanceLimit75min'; update solver_parameter_def set visible = 0, description = 'Student Conflict: Distance Limit (deprecated)' where name = 'Student.DistanceLimit'; update solver_parameter_def set visible = 0, description = 'Do not load committed student conflicts (deprecated)' where name = 'General.IgnoreCommittedStudentConflicts'; update solver_parameter_def set visible = 0, description = 'Students sectioning' where name = 'General.SwitchStudents'; /* cleanup test defs */ delete from solver_parameter_def where name in ('Curriculum.StudentCourseDemadsClass', 'Distances.Ellipsoid', 'Distances.Speed', 'General.LoadCommittedAssignments', 'General.CommittedStudentConflicts'); /* insert new parameters */ select 32767 * next_hi into @id from hibernate_unique_key; select uniqueid into @gid_basic from solver_parameter_group where name='Basic'; select max(ord) into @ord_basic from solver_parameter_def where solver_param_group_id=@gid_basic; select uniqueid into @gid_general from solver_parameter_group where name='General'; select max(ord) into @ord_general from solver_parameter_def where solver_param_group_id=@gid_general; select uniqueid into @gid_distance from solver_parameter_group where name='Distance'; select max(ord) into @ord_distance from solver_parameter_def where solver_param_group_id=@gid_distance; insert into solver_parameter_def (uniqueid, name, default_value, description, type, ord, visible, solver_param_group_id) values (@id, 'Curriculum.StudentCourseDemadsClass', 'Projected Student Course Demands', 'Student course demands', 'enum(Last Like Student Course Demands,Weighted Last Like Student Course Demands,Projected Student Course Demands,Curricula Course Demands,Curricula Last Like Course Demands,Enrolled Student Course Demands)', @ord_general+1, 1, @gid_general), (@id+1, 'General.CommittedStudentConflicts', 'Load', 'Committed student conflicts', 'enum(Load,Compute,Ignore)', @ord_general+2, 1, @gid_general), (@id+2, 'Distances.Ellipsoid', 'DEFAULT', 'Ellipsoid to be used to compute distances', 'enum(DEFAULT,LEGACY,WGS84,GRS80,Airy1830,Intl1924,Clarke1880,GRS67)', @ord_distance+1, 1, @gid_distance), (@id+3, 'Distances.Speed', '67.0', 'Student speed in meters per minute', 'double', @ord_distance+2, 1, @gid_distance), (@id+4, 'General.LoadCommittedAssignments', 'false', 'Load committed assignments', 'boolean', @ord_basic+1, 1, @gid_basic); update hibernate_unique_key set next_hi=next_hi+1; /** * Update database version */ update application_config set value='57' where name='tmtbl.db.version'; commit; Index: 20 Exam room changes.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/20 Exam room changes.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 20 Exam room changes.sql 18 Jun 2008 15:52:14 -0000 1.3 --- 20 Exam room changes.sql 1 Dec 2010 11:10:39 -0000 1.4 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 48 Exam event offset.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/48 Exam event offset.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 48 Exam event offset.sql 28 Oct 2009 19:18:48 -0000 1.1 --- 48 Exam event offset.sql 1 Dec 2010 11:10:39 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 02 Room group feature abbv.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/02 Room group feature abbv.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 02 Room group feature abbv.sql 17 Jun 2008 21:24:46 -0000 1.2 --- 02 Room group feature abbv.sql 1 Dec 2010 11:10:40 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 39 Curricula changes.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/39 Curricula changes.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 39 Curricula changes.sql 10 Sep 2008 16:42:04 -0000 1.1 --- 39 Curricula changes.sql 1 Dec 2010 11:10:39 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 13 Exams speedup.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/13 Exams speedup.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 13 Exams speedup.sql 17 Jun 2008 21:24:46 -0000 1.3 --- 13 Exams speedup.sql 1 Dec 2010 11:10:39 -0000 1.4 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 26 Event changes.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/26 Event changes.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 26 Event changes.sql 17 Jun 2008 21:24:46 -0000 1.2 --- 26 Event changes.sql 1 Dec 2010 11:10:40 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 37 Data types.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/37 Data types.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 37 Data types.sql 9 Sep 2008 19:56:45 -0000 1.1 --- 37 Data types.sql 1 Dec 2010 11:10:39 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 23 External Room exam capacity.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/23 External Room exam capacity.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 23 External Room exam capacity.sql 17 Jun 2008 21:24:46 -0000 1.2 --- 23 External Room exam capacity.sql 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 21 Add External Uids.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/21 Add External Uids.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 21 Add External Uids.sql 17 Jun 2008 21:24:46 -0000 1.2 --- 21 Add External Uids.sql 1 Dec 2010 11:10:40 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 03 On fly student sectioning.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/03 On fly student sectioning.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 03 On fly student sectioning.sql 9 Jul 2008 20:18:29 -0000 1.3 --- 03 On fly student sectioning.sql 1 Dec 2010 11:10:40 -0000 1.4 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 16 Exam instructor conflicts.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/16 Exam instructor conflicts.sql,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** 16 Exam instructor conflicts.sql 18 Jun 2008 15:52:14 -0000 1.5 --- 16 Exam instructor conflicts.sql 1 Dec 2010 11:10:39 -0000 1.6 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option... [truncated message content] |
Update of /cvsroot/unitime/UniTime/WebContent In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/WebContent Modified Files: checkAdmin.jspf loginRequired.jsp checkRole.jspf error.jsp selectPrimaryRole.jsp main.jsp checkLogin.jspf login.jsp logout.jsp checkAccessLevel.jspf header.jsp index.jsp Added Files: initializationError.jspf .cvsignore gwt.jsp Removed Files: menumin.jsp menunav.jsp menu.jsp blank.jsp Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) --- NEW FILE: .cvsignore --- unitime Index: checkAccessLevel.jspf =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/checkAccessLevel.jspf,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** checkAccessLevel.jspf 30 Jul 2008 16:33:36 -0000 1.4 --- checkAccessLevel.jspf 1 Dec 2010 11:10:40 -0000 1.5 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,25 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page import="org.unitime.timetable.util.Constants" %> ! <% String appAccess = (String) session.getAttribute(Constants.SESSION_APP_ACCESS_LEVEL); ! if (appAccess!=null && !"true".equalsIgnoreCase(appAccess)) { %> ! <jsp:forward page="/loginRequired.do"> ! <jsp:param name="message" value="The application is temporarily unavailable.<br>Please try again after some time."/> ! </jsp:forward> ! <% } %> --- 14,26 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page import="org.unitime.timetable.util.Constants" %> ! <%@ page import="org.unitime.timetable.util.AccessDeniedException" %> ! <% ! String appAccess = (String) session.getAttribute(Constants.SESSION_APP_ACCESS_LEVEL); ! if (appAccess!=null && !"true".equalsIgnoreCase(appAccess)) { ! throw new AccessDeniedException("The application is temporarily unavailable.<br>Please try again after some time."); ! } ! %> \ No newline at end of file Index: selectPrimaryRole.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/selectPrimaryRole.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** selectPrimaryRole.jsp 17 Jun 2008 21:24:48 -0000 1.3 --- selectPrimaryRole.jsp 1 Dec 2010 11:10:40 -0000 1.4 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,21 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> ! <%@ page language="java" autoFlush="true" errorPage="error.jsp" %> <%@ page import="org.unitime.timetable.model.Roles"%> <%@ taglib uri="/WEB-INF/tld/struts-bean.tld" prefix="bean"%> --- 14,21 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> ! <%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8" errorPage="/error.jsp"%> <%@ page import="org.unitime.timetable.model.Roles"%> <%@ taglib uri="/WEB-INF/tld/struts-bean.tld" prefix="bean"%> *************** *** 25,29 **** <html:hidden property="sessionId"/> <html:hidden property="roleId"/> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <% if (!"Y".equals(request.getParameter("list"))) { %> <tr><td colspan='4'> --- 25,29 ---- <html:hidden property="sessionId"/> <html:hidden property="roleId"/> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <% if (!"Y".equals(request.getParameter("list"))) { %> <tr><td colspan='4'> Index: checkLogin.jspf =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/checkLogin.jspf,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** checkLogin.jspf 30 Jul 2008 16:33:36 -0000 1.4 --- checkLogin.jspf 1 Dec 2010 11:10:40 -0000 1.5 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,30 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page import="org.unitime.commons.web.Web" %> ! <% if (!Web.isLoggedIn(session)) {%> ! <% if (session.isNew()) { %> ! <jsp:forward page="/loginRequired.do"> ! <jsp:param name="message" value="Your timetabling session has expired. Please log in again."/> ! </jsp:forward> ! <% } else { %> ! <jsp:forward page="/loginRequired.do"> ! <jsp:param name="message" value="Login is required to use timetabling application."/> ! </jsp:forward> ! <% } %> ! <%}%> --- 14,29 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page import="org.unitime.commons.web.Web" %> ! <%@page import="org.unitime.timetable.util.AccessDeniedException"%> ! <% ! if (!Web.isLoggedIn(session)) { ! if (session.isNew()) { ! throw new AccessDeniedException("Your timetabling session has expired. Please log in again."); ! } else { ! throw new AccessDeniedException("Login is required to use timetabling application."); ! } ! } ! %> \ No newline at end of file Index: logout.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/logout.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** logout.jsp 17 Jun 2008 21:24:48 -0000 1.2 --- logout.jsp 1 Dec 2010 11:10:40 -0000 1.3 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> ! <%@ page language="java" %> ! <%@ page errorPage="error.jsp" %> <%@ page import="java.util.Enumeration" %> <% --- 14,21 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> ! <%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8" errorPage="/error.jsp"%> <%@ page import="java.util.Enumeration" %> <% *************** *** 34,45 **** <HTML> <HEAD> - <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> <TITLE>Timetabling - Logout</TITLE> <SCRIPT language="javascript"> function closeWin() { ! top.window.close(); ! top.location.href='<%=request.getContextPath()%>/login.do'; } </SCRIPT> </HEAD> <BODY onload="closeWin();"> --- 33,44 ---- <HTML> <HEAD> <TITLE>Timetabling - Logout</TITLE> <SCRIPT language="javascript"> function closeWin() { ! window.close(); ! location.href='<%=request.getContextPath()%>/login.do'; } </SCRIPT> + <meta http-equiv="X-UA-Compatible" content="IE=8,chrome=1"> </HEAD> <BODY onload="closeWin();"> Index: main.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/main.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** main.jsp 17 Jun 2008 21:24:48 -0000 1.4 --- main.jsp 1 Dec 2010 11:10:40 -0000 1.5 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,88 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ taglib uri="/WEB-INF/tld/timetable.tld" prefix="tt" %> ! <%@ page errorPage="error.jsp" %> ! <%@ include file="/checkLogin.jspf" %> ! <%@ include file="/checkAccessLevel.jspf" %> ! <html> <head> ! <tt:hasProperty name="tmtbl.title"> ! <title> ! <tt:property name="tmtbl.title"/> ! </title> ! </tt:hasProperty> ! <tt:notHasProperty name="tmtbl.title"> ! <title>Timetabling</title> ! </tt:notHasProperty> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> ! <link rel="stylesheet" type="text/css" href="styles/timetabling.css" /> <link rel="shortcut icon" href="images/timetabling.ico" /> ! <script language="javascript" type="text/javascript"> ! var strFrameCols = ""; ! var bMenuFrameCollapsed = false; ! function onreadystatechange() { ! if (document.readyState != "complete") return; ! } ! function onbeforeunload() { ! // set original frame width in case frame has been collapsed ! if (strFrameCols != "0px,200px,*") strOrigFrameCols = strFrameCols; ! else strOrigFrameCols = "0px,200px,*"; ! // get get the current frame width; this may be zero ! var x = document.getElementById('__idMenuFrameset'); ! strFrameCols = x.cols; ! } ! function onMenuFrameResize() { ! var x = document.getElementById('__idMenuFrameset'); ! if (x.cols== "28px,0px,*") { ! if (!bMenuFrameCollapsed) { ! document.getElementById("__idMenuNavFrame").tabIndex = "-1"; ! document.getElementById("__idMenuFrame").tabIndex = "-1"; ! bMenuFrameCollapsed = true; ! } ! } else { ! if (bMenuFrameCollapsed) { ! document.getElementById("__idMenuNavFrame").tabIndex = "0"; ! document.getElementById("__idMenuFrame").tabIndex = "0"; ! bMenuFrameCollapsed = false; } ! } ! } ! ! if(parent.frames.length!=0) ! top.location.href = 'main.jsp'; ! </script> ! </head> ! ! <frameset cols="0,200,*" id="__idMenuFrameset" name="__idMenuFrameset" border="0" onresize="onMenuFrameResize();"> ! <frameset id="__idMenuFramesetMin" rows="22,*"> ! <frame class="MenuFrameMin" id="__idMenuFrameMin" name="__idMenuFrameMin" src="menumin.jsp" marginwidth="0" marginheight="0" framespacing="0" frameborder="0" scrolling="no"/> ! <frame id="__blankFrame" name="__idBlankFrame" src="empty.html" marginwidth="0" marginheight="0" framespacing="0" frameborder="0" scrolling="no"/> ! </frameset> ! <frameset class="MenuFrameLeftBorder" id="__idMenuFramesetLeft" name="__idMenuFramesetLeft" rows="22,*,177"> ! <frame class="MenuNavFrame" id="__idMenuNavFrame" name="__idMenuNavFrame" src="menunav.jsp" marginwidth="0" marginheight="0" framespacing="0" frameborder="0" scrolling="no"/> ! <frame id="__idMenuFrame" name="__idMenuFrame" src="menu.jsp" marginwidth="0" marginheight="0" framespacing="0" frameborder="0" scrolling="auto"/> ! <frame class="MenuUserFrame" id="__userFrame" name="__idUserFrame" src="admin/userinfo.jsp" marginwidth="0" marginheight="0" framespacing="0" frameborder="0" scrolling="no"/> ! </frameset> ! <frame name="__idContentFrame" id="__idContentFrame" src="blank.jsp" marginwidth="0" marginheight="0" framespacing="0"/> ! </frameset> ! </html> --- 14,191 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> + <%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8" errorPage="/error.jsp"%> + <%@ page import="org.unitime.timetable.model.ApplicationConfig"%> + <%@ page import="org.unitime.timetable.util.Constants" %> <%@ taglib uri="/WEB-INF/tld/timetable.tld" prefix="tt" %> ! ! <HTML> <head> ! <title>UniTime 3.2| University Timetabling Application</title> <link rel="shortcut icon" href="images/timetabling.ico" /> ! <link type="text/css" rel="stylesheet" href="unitime/gwt/standard/standard.css"> ! <link type="text/css" rel="stylesheet" href="styles/unitime.css"> ! <link type="text/css" rel="stylesheet" href="styles/timetabling.css"> ! <tt:hasProperty name="tmtbl.custom.css"> ! <LINK rel="stylesheet" type="text/css" href="%tmtbl.custom.css%" /> ! </tt:hasProperty> ! <script language="JavaScript" type="text/javascript" src="scripts/loading.js"></script> ! <script type="text/javascript" language="javascript" src="unitime/unitime.nocache.js"></script> ! <meta http-equiv="X-UA-Compatible" content="IE=8,chrome=1"> ! </head> ! <BODY class="unitime-Body"> ! <iframe src="javascript:''" id="__gwt_historyFrame" tabIndex="-1" style="position:absolute;width:0;height:0;border:0"></iframe> ! <iframe src="javascript:''" id="__printingFrame" tabIndex="-1" style="position:absolute;width:0;height:0;border:0"></iframe> ! ! <tt:notHasProperty name="unitime.menu.style" user="true"> ! <span id='UniTimeGWT:DynamicTopMenu' style="display: none;" ></span> ! </tt:notHasProperty> ! <tt:propertyEquals name="unitime.menu.style" user="true" value="Dynamic On Top"> ! <span id='UniTimeGWT:DynamicTopMenu' style="display: none;" ></span> ! </tt:propertyEquals> ! <tt:propertyEquals name="unitime.menu.style" user="true" value="Static On Top"> ! <span id='UniTimeGWT:TopMenu' style="display: none;" ></span> ! </tt:propertyEquals> ! <tt:hasProperty name="tmtbl.global.warn"> ! <table width='100%' border='0' cellpadding='3' cellspacing='0'><tr><td class="reqGlobalWarn" width='5'> </td><td class="reqGlobalWarn" > ! <tt:property name="tmtbl.global.warn"/> ! </td></tr></table> ! </tt:hasProperty> ! ! <!--[if IE]> ! <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script> ! ! <table width='100%' border='0' cellpadding='3' cellspacing='0' style='display:none;' id='__ie_no_chrome'> ! <tr><td class="reqMsg" width='5'> </td> ! <td class="reqMsg"> ! <a class='noFancyLinks' href="http://google.com/chromeframe">The UniTime application may run very slow in Internet Explorer. To speed it up, please click here and install Google Chrome Frame plug-in.</a></td> ! </tr> ! </table> ! ! <div style='display:none;'><div id='__ie_chrome_plugin'></div></div> ! ! <script> ! function ie_no_chrome() { ! document.getElementById('__ie_no_chrome').style.display = 'table'; ! } ! window.attachEvent("onload", function() { ! CFInstall.check({ ! mode: "inline", ! node: "__ie_chrome_plugin", ! onmissing: ie_no_chrome ! }); ! }); ! </script> ! <![endif]--> ! <div id="contentMain"> ! <table align="center" width="900px"> ! <tr> ! <td valign="top" rowspan="2"> ! <logic:equal name="showMenu" value="true"> ! <tt:propertyEquals name="unitime.menu.style" user="true" value="Stack On Side"> ! <span id='UniTimeGWT:SideStackMenu' style="display: none;" ></span> ! </tt:propertyEquals> ! <tt:propertyEquals name="unitime.menu.style" user="true" value="Tree On Side"> ! <span id='UniTimeGWT:SideTreeMenu' style="display: none;" ></span> ! </tt:propertyEquals> ! </logic:equal> ! </td> ! <td valign="top" > ! <table class="unitime-Page" width="100%" background="images/logofaded.jpg" style="background-repeat:no-repeat;background-position: center;"> ! <tr><td> ! <table class="unitime-MainTable" cellpadding="2" cellspacing="0" width="100%"> ! <tr><td rowspan="2"><a href='http://www.unitime.org'><img src="images/unitime.png" border="0"/></a></td> ! <td nowrap="nowrap" width="100%" align="right" valign="middle" class="unitime-Title" style="padding-right: 20px; padding-top: 5px"> ! <span class='unitime-Title'>University Timetabling Application</span> ! </td> ! </tr> ! <tr><td width="100%" align="right" valign="middle" nowrap="nowrap"> ! <span id='UniTimeGWT:Header'></span> ! </td></tr> ! </table> ! </td></tr><tr><td> ! <TABLE width="100%" height="600px" align="center" > ! <TR> ! <% ! String sysMessage = ApplicationConfig.getConfigValue(Constants.CFG_SYSTEM_MESSAGE, ""); ! boolean showBackground = (sysMessage == null || sysMessage.trim().isEmpty()); ! %> ! <tt:registration method="hasMessage"> ! <% showBackground = false; %> ! </tt:registration> ! <TD align="center" valign="top" width="100%" height="100%" <%=(showBackground ? "background=\"images/logo.jpg\"" : "" )%> style="background-repeat:no-repeat;background-position: center;"> ! <TABLE width="100%" cellspacing="2" cellpadding="2" border="0"> ! <% ! if (sysMessage != null && !sysMessage.trim().isEmpty()) { ! %> ! <TR> ! <TD class="WelcomeRowHead" align="left">System Messages</TD> ! </TR> ! <TR> ! <TD align="left"> ! <BR> ! <FONT class="normalBlack"> ! <%= sysMessage %> ! </FONT> ! <BR> ! </TD> ! </TR> ! <% } ! %> ! <tt:registration method="hasMessage"> ! <TR> ! <TD class="WelcomeRowHead" align="left">Messages from UniTime</TD> ! </TR> ! <TR> ! <TD align="left"> ! <BR> ! <FONT class="normalBlack"> ! <tt:registration method="message"/> ! </FONT> ! <BR> ! </TD> ! </TR> ! </tt:registration> ! </TABLE> ! </TD> ! </TR> ! </TABLE> ! </td></tr></table> ! </td></tr><tr><td valign="top"> ! <table class="unitime-Footer" cellpadding="0" cellspacing="0"> ! <tr> ! <td width="33%" align="left" class="unitime-FooterText"><span id="UniTimeGWT:Version"></span></td> ! <!-- WARNING: Changing or removing the copyright notice will violate the license terms. If you need a different licensing, please contact us at su...@un... --> ! <td width="34%" align="center" class="unitime-FooterText"><tt:copy/></td> ! <td width="33%" align="right" class="unitime-FooterText"><tt:registration update="true"/></td> ! </tr> ! <tt:hasProperty name="tmtbl.page.disclaimer"> ! <tr> ! <td colspan="3" class="unitime-Disclaimer"> ! <tt:property name="tmtbl.page.disclaimer"/> ! </td> ! </tr> ! </tt:hasProperty> ! </table> ! </td></tr></table> ! </div> ! <div id="loadingMain" style="visibility:hidden;display:none"> ! <TABLE width="100%" height="100%" align="center" cellpadding="0" cellspacing="0" border="0"> ! <TR> ! <TD valign="middle" align="center"> ! <font class="WelcomeRowHeadNoLine">Loading</font><br> <br> ! <IMG align="middle" vspace="5" border="0" src="images/loading.gif"> ! </TD> ! </TR> ! </TABLE> ! </div> ! ! </BODY> ! </HTML> Index: login.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/login.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** login.jsp 18 Feb 2009 19:41:09 -0000 1.5 --- login.jsp 1 Dec 2010 11:10:40 -0000 1.6 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,36 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page import="org.unitime.timetable.ApplicationProperties" %> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <HTML> <HEAD> ! <META http-equiv="Content-Type" ! content="text/html; charset=ISO-8859-1"> ! <LINK rel="stylesheet" type="text/css" href="styles/timetabling.css"> ! <TITLE>Timetabling</TITLE> </HEAD> <BODY class="bodyMain" onload="document.forms[0].username.focus();"> ! <% if (ApplicationProperties.getProperty("tmtbl.header.external", "").trim().length()>0) { %> <jsp:include flush="true" page='<%=ApplicationProperties.getProperty("tmtbl.header.external")%>' /> <% } %> <% String errorMsg = null; --- 14,45 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> + <%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8" errorPage="/error.jsp"%> <%@ page import="org.unitime.timetable.ApplicationProperties" %> + <%@page import="net.sf.cpsolver.ifs.util.JProf"%> + <%@page import="java.text.NumberFormat"%> + <%@ taglib uri="/WEB-INF/tld/timetable.tld" prefix="tt" %> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <HTML> <HEAD> ! <link type="text/css" rel="stylesheet" href="unitime/gwt/standard/standard.css"> ! <link type="text/css" rel="stylesheet" href="styles/unitime.css"> ! <link type="text/css" rel="stylesheet" href="styles/timetabling.css"> ! <link rel="shortcut icon" href="images/timetabling.ico" /> ! <script type="text/javascript" language="javascript" src="unitime/unitime.nocache.js"></script> ! <TITLE>UniTime 3.2| Log In</TITLE> ! <meta http-equiv="X-UA-Compatible" content="IE=8,chrome=1"> </HEAD> <BODY class="bodyMain" onload="document.forms[0].username.focus();"> ! <% if (ApplicationProperties.getProperty("tmtbl.header.external", "").trim().length()>0) { %> <jsp:include flush="true" page='<%=ApplicationProperties.getProperty("tmtbl.header.external")%>' /> <% } %> + <span id='UniTimeGWT:TopMenu' style="display: none;" ></span> + <% String errorMsg = null; *************** *** 58,68 **** <TD> </TD> <TD class="H3" align="center" colspan="3"> ! <IMG src="images/timetabling.jpg" alt="Timetabling" title="Timetabling Log In"> <BR> <% if (errorMsg!=null) { %> ! <font class="errorMessage"> <%= errorMsg %> ! </font> <% } %> </TD> --- 67,77 ---- <TD> </TD> <TD class="H3" align="center" colspan="3"> ! <IMG src="images/timetabling-nocopy.jpg" alt="Timetabling" title="Timetabling Log In" style="margin-bottom: 5px;"> <BR> <% if (errorMsg!=null) { %> ! <span class="errorMessage"> <%= errorMsg %> ! </span> <% } %> </TD> *************** *** 71,75 **** <TR> <TD align="left" rowspan="2" valign="middle"> ! <IMG src="images/timetabling-logo-main.jpg" border="0" align="bottom" alt="Timetabling" title="Timetabling" hspace="20"> </TD> <TD colspan="3"> --- 80,84 ---- <TR> <TD align="left" rowspan="2" valign="middle"> ! <IMG src="images/unitime.png" border="0" align="bottom" alt="UniTime" title="UniTime" hspace="20"> </TD> <TD colspan="3"> *************** *** 103,111 **** </TABLE> </FORM> ! ! <BR> ! ! <BR> ! <% if (ApplicationProperties.getProperty("tmtbl.footer.external", "").trim().length()>0) { %> --- 112,132 ---- </TABLE> </FORM> ! ! <%@ include file="/initializationError.jspf"%> ! ! <table class="unitime-Footer" style="margin-top: 50px; padding-left: 100px;"> ! <tr> ! <!-- WARNING: Changing or removing the copyright notice will violate the license terms. If you need a different licensing, please contact us at su...@un... --> ! <td align="center" class="unitime-FooterText"><span id="UniTimeGWT:Version"></span><tt:copy br="false"/></td> ! </tr> ! <tt:hasProperty name="tmtbl.page.disclaimer"> ! <tr> ! <td align="center" style="color:#777777;"> ! <tt:property name="tmtbl.page.disclaimer"/> ! </td> ! </tr> ! </tt:hasProperty> ! </table> ! <% if (ApplicationProperties.getProperty("tmtbl.footer.external", "").trim().length()>0) { %> --- NEW FILE: gwt.jsp --- <!-- * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * --> <%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8" errorPage="/error.jsp"%> <%@ taglib uri="/WEB-INF/tld/timetable.tld" prefix="tt" %> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <link type="text/css" rel="stylesheet" href="unitime/gwt/standard/standard.css"> <link type="text/css" rel="stylesheet" href="styles/unitime.css"> <!--[if IE]> <link type="text/css" rel="stylesheet" href="styles/unitime-ie.css"> <![endif]--> <link rel="shortcut icon" href="images/timetabling.ico"> <title>UniTime 3.2| University Timetabling Application</title> <meta http-equiv="X-UA-Compatible" content="IE=8,chrome=1"> </head> <body class="unitime-Body"> <iframe src="javascript:''" id="__gwt_historyFrame" tabIndex="-1" style="position:absolute;width:0;height:0;border:0"></iframe> <iframe src="javascript:''" id="__printingFrame" tabIndex="-1" style="position:absolute;width:0;height:0;border:0"></iframe> <tt:notHasProperty name="unitime.menu.style" user="true"> <span id='UniTimeGWT:DynamicTopMenu' style="display: none;" ></span> </tt:notHasProperty> <tt:propertyEquals name="unitime.menu.style" user="true" value="Dynamic On Top"> <span id='UniTimeGWT:DynamicTopMenu' style="display: none;" ></span> </tt:propertyEquals> <tt:propertyEquals name="unitime.menu.style" user="true" value="Static On Top"> <span id='UniTimeGWT:TopMenu' style="display: none;" ></span> </tt:propertyEquals> <tt:hasProperty name="tmtbl.global.warn"> <table width='100%' border='0' cellpadding='3' cellspacing='0'><tr><td class="unitime-MessageYellow" width='5'> </td><td class="unitime-MessageYellow" > <tt:property name="tmtbl.global.warn"/> </td></tr></table> </tt:hasProperty> <!--[if IE]> <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script> <table width='100%' border='0' cellpadding='3' cellspacing='0' style='display:none;' id='__ie_no_chrome'> <tr><td class="unitime-MessageBlue" width='5'> </td> <td class="unitime-MessageBlue"> <a class='unitime-NoFancyLink' href="http://google.com/chromeframe">The UniTime application may run very slow in Internet Explorer. To speed it up, please click here and install Google Chrome Frame plug-in.</a></td> </tr> </table> <div style='display:none;'><div id='__ie_chrome_plugin'></div></div> <script> function ie_no_chrome() { document.getElementById('__ie_no_chrome').style.display = 'table'; } window.attachEvent("onload", function() { CFInstall.check({ mode: "inline", node: "__ie_chrome_plugin", onmissing: ie_no_chrome }); }); </script> <![endif]--> <table align="center"> <tr> <td valign="top" rowspan="2"> <tt:propertyEquals name="unitime.menu.style" user="true" value="Stack On Side"> <span id='UniTimeGWT:SideStackMenu' style="display: none;" ></span> </tt:propertyEquals> <tt:propertyEquals name="unitime.menu.style" user="true" value="Tree On Side"> <span id='UniTimeGWT:SideTreeMenu' style="display: none;" ></span> </tt:propertyEquals> </td> <td valign="top"> <table class="unitime-Page" width="100%"><tr> <td> <table class="unitime-MainTable" cellpadding="2" cellspacing="0" width="100%" style="min-width: 800px"> <tr><td rowspan="3"> <a href='main.jsp'> <img src="images/unitime.png" border="0"/> </a> </td><td nowrap="nowrap" class="unitime-Title" width="100%" align="right" valign="middle" style="padding-right: 20px;"> <span id='UniTimeGWT:Title'></span> </td></tr> <tr><td width="100%" align="right" valign="middle" nowrap="nowrap"> <span id='UniTimeGWT:Header'></span> </td></tr> <tr><td width="100%" align="left" valign="middle" width="100%"> <span id='UniTimeGWT:TitlePanel'></span> </td></tr> </table> </td></tr><tr><td> <table id="UniTimeGWT:Loading" class="unitime-MainTable" cellpadding="2" cellspacing="0" width="100%"> <tr><td align="center"> <i>Page is loading, please wait ...</i> </td></tr> </table> </td></tr><tr><td> <span id='UniTimeGWT:Body'></span> </td></tr></table> </td></tr><tr><td valign="top"> <table class="unitime-Footer"> <tr> <td width="33%" align="left" class="unitime-FooterText"><span id="UniTimeGWT:Version"></span></td> <!-- WARNING: Changing or removing the copyright notice will violate the license terms. If you need a different licensing, please contact us at su...@un... --> <td width="34%" align="center" class="unitime-FooterText"><tt:copy/></td> <td width="33%" align="right" class="unitime-FooterText"><tt:registration/></td> </tr> <tt:hasProperty name="tmtbl.page.disclaimer"> <tr> <td colspan="3" class="unitime-Disclaimer"> <tt:property name="tmtbl.page.disclaimer"/> </td> </tr> </tt:hasProperty> </table> </td></tr></table> <script type="text/javascript" language="javascript" src="unitime/unitime.nocache.js"></script> </body> </html> --- menumin.jsp DELETED --- --- menunav.jsp DELETED --- --- NEW FILE: initializationError.jspf --- <%-- * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * --%> <%@page import="org.unitime.timetable.InitServlet"%> <%@page import="org.unitime.timetable.util.Constants"%> <% if (InitServlet.getInitializationException() != null) { %> <table align="center" class="unitime-Footer" style="margin-top: 50px; padding-left: 100px;"> <tr> <td align="center" style="color:red;"> UniTime <%=(Constants.VERSION + "." + Constants.BLD_NUMBER).replace("@build.number@", "?")%> failed to start up properly, please check the application log for more details.<br/> <% Throwable t = InitServlet.getInitializationException(); while (t != null) { String clazz = t.getClass().getName(); if (clazz.indexOf('.') >= 0) clazz = clazz.substring(1 + clazz.lastIndexOf('.')); out.println("<br>" + clazz + ": " + t.getMessage() + (t.getStackTrace() != null && t.getStackTrace().length > 0 ? " (at " + t.getStackTrace()[0].getFileName() + ":" + t.getStackTrace()[0].getLineNumber() + ")": "")); t = t.getCause(); } %> </td> </tr> </table> <% } %> Index: header.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/header.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** header.jsp 16 Oct 2008 16:33:28 -0000 1.3 --- header.jsp 1 Dec 2010 11:10:40 -0000 1.4 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ taglib uri="/WEB-INF/tld/struts-tiles.tld" prefix="tiles" %> <%@ taglib uri="/WEB-INF/tld/struts-logic.tld" prefix="logic"%> --- 14,21 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> + <%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8" errorPage="/error.jsp"%> <%@ taglib uri="/WEB-INF/tld/struts-tiles.tld" prefix="tiles" %> <%@ taglib uri="/WEB-INF/tld/struts-logic.tld" prefix="logic"%> *************** *** 22,68 **** <%@ taglib uri="/WEB-INF/tld/timetable.tld" prefix="tt" %> ! <tiles:importAttribute name="showNavigation" scope="request"/> ! <BR> ! <TABLE border="0" width="100%" cellspacing="0" cellpadding="0"> ! <TR> ! <TD width="200" nowrap> ! <DIV id="loading" style="visibility:hidden;display:none"> ! ! <IMG align="middle" vspace="5" border="0" src="images/loading.gif"> ! </DIV> ! </TD> ! ! <logic:notEqual name="helpFile" value=""> ! <TD align="center" width="40"> ! <A href='help.do?helpFile=<%=request.getAttribute("helpFile").toString()%>' accesskey="H" title="Help (Alt+H)" target="helpWindow"><IMG border="0" align="middle" src="images/Help24.gif" title="Help (Alt+H)" alt="Help (Alt+H)"></A> ! </TD> ! </logic:notEqual> ! ! <TD height="45" align="right" class="WelcomeHead" valign='middle'> ! <tt:wiki-help><bean:write scope="request" name="title"/></tt:wiki-help> ! </TD> ! ! <TD width="55" align="right"> ! <IMG align="middle" src="images/logosmall.jpg" border="0"> ! </TD> ! ! <TD width="40"> </TD> ! </TR> ! </TABLE> <logic:equal name="showNavigation" value="true"> <tt:has-back> ! <TABLE border="0" width='100%'> ! <TR> ! <TD width="40"> </TD> ! <TD> <tt:back styleClass="btn" name="[←]" title="Return to %%"/> <tt:back-tree/> ! </TD> ! <TD width="40"> </TD> ! </TR> ! </TABLE> </tt:has-back> </logic:equal> - <BR> --- 23,49 ---- <%@ taglib uri="/WEB-INF/tld/timetable.tld" prefix="tt" %> ! <tiles:importAttribute name="showNavigation" scope="request"/> ! <div id="loading" style="visibility:hidden;display:none"> ! <table border="0" width='100%'> ! <tr> ! <td align="center" valign="middle"> ! <img align="middle" vspace="5" border="0" src="images/loading.gif"> ! </td> ! </tr> ! </table> ! </div> <logic:equal name="showNavigation" value="true"> <tt:has-back> ! <table border="0" width='100%'> ! <tr> ! <td style="max-width: 800px;"> <tt:back styleClass="btn" name="[←]" title="Return to %%"/> <tt:back-tree/> ! <tt:gwt-back/> ! </td> ! </tr> ! </table> </tt:has-back> </logic:equal> Index: loginRequired.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/loginRequired.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** loginRequired.jsp 27 Jul 2009 14:20:23 -0000 1.7 --- loginRequired.jsp 1 Dec 2010 11:10:40 -0000 1.8 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page import="org.unitime.timetable.ApplicationProperties" %> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> --- 14,21 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> + <%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8" errorPage="/error.jsp"%> <%@ page import="org.unitime.timetable.ApplicationProperties" %> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> *************** *** 26,36 **** <META http-equiv="expires" content="0"> <LINK rel="stylesheet" type="text/css" href="styles/timetabling.css"> ! <SCRIPT language="javascript" type="text/javascript"> ! <!-- ! if(parent.frames.length!=0) ! top.location.href = '<%=request.getContextPath()%>/loginRequired.do?message=<%=request.getParameter("message")%>' ! //--> ! </SCRIPT> ! </HEAD> --- 27,32 ---- <META http-equiv="expires" content="0"> <LINK rel="stylesheet" type="text/css" href="styles/timetabling.css"> ! <link rel="shortcut icon" href="images/timetabling.ico" /> ! <meta http-equiv="X-UA-Compatible" content="IE=8,chrome=1"> </HEAD> *************** *** 52,55 **** --- 48,54 ---- </DIV> + <%@ include file="/initializationError.jspf"%> + + </BODY> </HTML> Index: error.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/error.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** error.jsp 17 Jun 2008 21:24:48 -0000 1.4 --- error.jsp 1 Dec 2010 11:10:40 -0000 1.5 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,62 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page import="org.unitime.commons.web.WebOutputStream"%> <%@ page import="java.io.PrintWriter"%> <%@ page import="org.unitime.commons.web.Web"%> <%@ page import="org.unitime.commons.Debug"%> - <%@ page isErrorPage="true"%> <%@ page import="org.unitime.commons.Email" %> <%@ page import="java.util.Vector" %> <%@ page import="org.unitime.timetable.ApplicationProperties" %> ! <%@ include file="/checkLogin.jspf"%> ! <%@ include file="/checkAccessLevel.jspf"%> ! ! <% if (exception==null && session.getAttribute("exception")!=null) { ! exception = (Exception)session.getAttribute("exception"); ! session.removeAttribute("exception"); ! } ! if (exception!=null && exception.getMessage()!=null && exception.getMessage().startsWith("Access Denied") ) { %> ! <jsp:forward page="/loginRequired.do"> <jsp:param name="message" value="<%=exception.getMessage()%>"/> </jsp:forward> ! <% }%> <HTML> <HEAD> ! <TITLE>Timetabling - Error</TITLE> <META http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <LINK rel="stylesheet" type="text/css" href="styles/timetabling.css" /> </HEAD> ! <BODY class="bodyStyle" background="images/bkrnd2.jpg"> ! <BR> ! <TABLE border="0" width="100%"> ! <TR> ! <TD width="12"> </TD> ! <TD height="45" align="right" class="WelcomeHead"> ! <DIV class="H3">Runtime Error </DIV> ! </TD> ! <TD width="55"><IMG align="middle" src="images/logosmall.jpg" border="0"></TD> ! </TR> ! </TABLE> ! <BR> <% if (exception!=null) { %> ! <BLOCKQUOTE> ! <TABLE width="90%" border="0"> <TR> <TD colspan="2"> --- 14,73 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> + <%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8" isErrorPage="true"%> + <%@ taglib uri="/WEB-INF/tld/timetable.tld" prefix="tt" %> <%@ page import="org.unitime.commons.web.WebOutputStream"%> <%@ page import="java.io.PrintWriter"%> <%@ page import="org.unitime.commons.web.Web"%> <%@ page import="org.unitime.commons.Debug"%> <%@ page import="org.unitime.commons.Email" %> <%@ page import="java.util.Vector" %> <%@ page import="org.unitime.timetable.ApplicationProperties" %> + <%@page import="org.unitime.timetable.util.AccessDeniedException"%> ! <% ! try { ! if (exception==null && session.getAttribute("exception")!=null) { ! exception = (Exception)session.getAttribute("exception"); ! session.removeAttribute("exception"); ! } ! } catch (IllegalStateException e) {} ! if (exception instanceof AccessDeniedException || "Access Denied.".equals(exception.getMessage())) { ! %> ! <jsp:forward page="/loginRequired.do"> <jsp:param name="message" value="<%=exception.getMessage()%>"/> </jsp:forward> ! <% ! } ! %> <HTML> <HEAD> ! <TITLE>UniTime 3.2| Error</TITLE> <META http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <link type="text/css" rel="stylesheet" href="styles/unitime.css"> <LINK rel="stylesheet" type="text/css" href="styles/timetabling.css" /> + <script type="text/javascript" language="javascript" src="unitime/unitime.nocache.js"></script> + <meta http-equiv="X-UA-Compatible" content="IE=8,chrome=1"> </HEAD> ! <BODY class="bodyMain"> ! <table align="center"> ! <tr> ! <td valign="top"> ! <table class="unitime-Page" width="100%"><tr> ! <td> ! <table class="unitime-MainTable" cellpadding="2" cellspacing="0" width="100%"> ! <tr><td rowspan="3"> ! <a href='main.jsp'> ! <img src="images/unitime.png" border="0"/> ! </a> ! </td><td nowrap="nowrap" class="unitime-Title" width="100%" align="right" valign="middle" style="padding-right: 20px;"> ! Runtime Error ! </td></tr> ! </table> ! </td></tr><tr><td> <% if (exception!=null) { %> ! <TABLE width="100%" border="0"> <TR> <TD colspan="2"> *************** *** 72,76 **** </TD> </TR> - <% WebOutputStream wos = new WebOutputStream(); --- 83,86 ---- *************** *** 79,84 **** pw.close(); String stackTrace = wos.toString(); ! ! if(Web.isAdmin(session)) { %> <TR align="left" valign="top"> <TD><FONT color="898989">Trace: </FONT></TD> --- 89,93 ---- pw.close(); String stackTrace = wos.toString(); ! %> <TR align="left" valign="top"> <TD><FONT color="898989">Trace: </FONT></TD> *************** *** 88,122 **** </TD> </TR> ! <% } ! ! Vector sessionTrace = new Vector(); ! try { ! String errorEmail = (String) ApplicationProperties.getProperty("tmtbl.error.email"); ! String smtpDomain = (String) ApplicationProperties.getProperty("tmtbl.smtp.domain"); ! String smtpHost = (String) ApplicationProperties.getProperty("tmtbl.smtp.host"); ! String sentFrom = (String) ApplicationProperties.getProperty("tmtbl.error.sentFrom"); ! String replyTo = (String) ApplicationProperties.getProperty("tmtbl.error.replyTo"); ! String subject = (String) ApplicationProperties.getProperty("tmtbl.error.subject"); ! ! if (session.getAttribute("userTrace")!=null ! && errorEmail!=null && errorEmail.trim().length()>0 ! && exception.getMessage().toLowerCase().indexOf("access denied")<0) { ! String data = "Server: " + request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/\n" ! + "Exception: " + exception.getMessage() + "\n" ! + "Stack Trace: " + stackTrace.replaceAll("<br>\n", "") + "\n\n" ! + (String) session.getAttribute("userTrace"); Email email = new Email(); ! email.sendMail(smtpHost, smtpDomain, sentFrom, replyTo, errorEmail, subject, data, sessionTrace); } ! } ! catch (Exception e) { ! Debug.error(e); ! } ! Debug.error(exception); %> </TABLE> ! </BLOCKQUOTE> ! <% } %> ! </BODY> </HTML> --- 97,128 ---- </TD> </TR> ! <% try { ! if ("true".equals(ApplicationProperties.getProperty("unitime.email.notif.error", "false")) && ! session.getAttribute("userTrace") !=null && exception.getMessage().toLowerCase().indexOf("access denied") < 0) { Email email = new Email(); ! email.setSubject("UniTime Error Report"); ! email.setText("Server: " + request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/\n" ! + "Exception: " + exception.getMessage() + "\n" ! + "Stack Trace: " + stackTrace.replaceAll("<br>", "") + "\n\n" ! + (String) session.getAttribute("userTrace")); ! email.addNotify(); ! email.send(); } ! } catch (Exception e) { } Debug.error(exception); %> </TABLE> ! <% } %> ! </td></tr></table> ! </td></tr><tr><td> ! <table class="unitime-Footer"> ! <tr> ! <td width="33%" align="left" valign="top"><span id="UniTimeGWT:Version"></span></td> ! <!-- WARNING: Changing or removing the copyright notice will violate the license terms. If you need a different licensing, please contact us at su...@un... --> ! <td width="34%" align="center" valign="top" style="max-width: 300px;"><tt:copy/></td> ! <td width="33%" align="right" valign="top" style="max-width: 300px;"><tt:registration/></td> ! </tr> ! </table> ! </td></tr></table> ! </body> </HTML> --- blank.jsp DELETED --- Index: checkAdmin.jspf =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/checkAdmin.jspf,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** checkAdmin.jspf 30 Jul 2008 16:33:36 -0000 1.4 --- checkAdmin.jspf 1 Dec 2010 11:10:40 -0000 1.5 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,27 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> - <%@ page import="org.unitime.timetable.model.Roles" %> <%@ page import="org.unitime.commons.web.Web" %> <%@ include file="checkLogin.jspf" %> <%@ include file="checkRole.jspf" %> ! <% if (!Web.getUser(session).isAdmin()) { %> ! <jsp:forward page="/loginRequired.do"> ! <jsp:param name="message" value="Insufficient user privileges."/> ! </jsp:forward> ! <% } %> --- 14,26 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page import="org.unitime.commons.web.Web" %> <%@ include file="checkLogin.jspf" %> <%@ include file="checkRole.jspf" %> ! <% ! if (!Web.getUser(session).isAdmin()) { ! throw new AccessDeniedException("Insufficient user privileges."); ! } ! %> \ No newline at end of file --- menu.jsp DELETED --- Index: checkRole.jspf =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/checkRole.jspf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** checkRole.jspf 30 Jul 2008 16:33:36 -0000 1.1 --- checkRole.jspf 1 Dec 2010 11:10:40 -0000 1.2 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,25 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page import="org.unitime.commons.web.Web" %> <%@ include file="checkLogin.jspf" %> ! <%if (Web.getUser(session).getCurrentRole()==null) {%> ! <jsp:forward page="/loginRequired.do"> ! <jsp:param name="message" value="Insufficient user privileges."/> ! </jsp:forward> ! <%}%> --- 14,26 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page import="org.unitime.commons.web.Web" %> + <%@page import="org.unitime.timetable.util.AccessDeniedException"%> <%@ include file="checkLogin.jspf" %> ! <% ! if (Web.getUser(session).getCurrentRole()==null) { ! throw new AccessDeniedException("Insufficient user privileges."); ! } ! %> \ No newline at end of file Index: index.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/index.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** index.jsp 16 Oct 2008 16:33:28 -0000 1.3 --- index.jsp 1 Dec 2010 11:10:40 -0000 1.4 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,28 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page import="org.unitime.timetable.ApplicationProperties" %> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <HTML> <HEAD> ! <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> ! <META http-equiv="Refresh" content="1; url=login.do"> <LINK rel="stylesheet" type="text/css" href="styles/timetabling.css"> ! <TITLE>Timetabling</TITLE> </HEAD> <BODY> --- 14,35 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> + <%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8" errorPage="/error.jsp"%> <%@ page import="org.unitime.timetable.ApplicationProperties" %> + <%@ page import="org.unitime.commons.web.Web"%> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <HTML> <HEAD> ! <% if (!Web.isLoggedIn(session)) {%> ! <META http-equiv="Refresh" content="1; url=login.do"> ! <% } else { %> ! <META http-equiv="Refresh" content="1; url=selectPrimaryRole.do"> ! <% } %> <LINK rel="stylesheet" type="text/css" href="styles/timetabling.css"> ! <link rel="shortcut icon" href="images/timetabling.ico" /> ! <TITLE>UniTime 3.2| University Timetabling Application</TITLE> ! <meta http-equiv="X-UA-Compatible" content="IE=8,chrome=1"> </HEAD> <BODY> |
Update of /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/Documentation/Database/Oracle/Changes Modified Files: 14 Exam solver parameters.sql 13 Exams speedup.sql 16 Exam instructor conflicts.sql 27 Exam solver parameters update.sql 00 Package Renames.sql 36 Exam size.sql 37 Data types.sql 34 Event notes.sql 05 Application config name size.sql 43 Class increase size of class suffix.sql 29 Event speedup.sql 21 Add External Uids.sql 01 Column Renames.sql 40 Curricula renames.sql 47 Add receive emails to manager roles.sql 39 Curricula changes.sql 33 Room type.sql 31 Student solver parameters.sql 30 Room type.sql 50 Curriculum major.sql 26 Event changes.sql 46 Committed student enrls load speedup.sql 38 Curricula tables add.sql 02 Room group feature abbv.sql 35 Event phone session dates.sql 42 Exam solver parameters update.sql 24 Exam avg period.sql 15 Exam conflicts.sql 28 Exam solver parameters update.sql 03 On fly student sectioning.sql 09 ItypeDesc Parent.sql 41 Exam print offset.sql 49 Name Length Changes.sql 25 Exam unique id rolled forward from.sql 06 Lastlike course demand permid.sql 19 Add Event Tables.sql 18 Location perm id add.sql 12 Student class enrollment.sql 20 Exam room changes.sql 48 Exam event offsets.sql 32 Event changes.sql 07 IType Abbreviation.sql 04 Timetable Grid Fix.sql 45 Increase size of schedule print note .sql 44 Add enrollment to class.sql 17 Evening exams.sql 10 Course offering cache lastlike demands.sql 23 External Room exam capacity.sql 08 Distribution Pref add column.sql 11 Exams.sql 22 Class exam event.sql Added Files: 58 Curriculum student cache.sql 62 Index on Student External Id.sql 59 Sectioning queue.sql 53 Curriculum manager role.sql 61 Session holidays need to cover 13 months.sql 60 Using student course requests in the solver.sql 56 Allow for GPS coordinates.sql 52 Curriculum course groups.sql 51 Curriculum course groups.sql 55 Curriculum projection rules.sql 57 Solver changes (coordinates and curricula).sql 63 Query log.sql 54 Acad area clasf major indexes.sql Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: 14 Exam solver parameters.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/14 Exam solver parameters.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 14 Exam solver parameters.sql 17 Jun 2008 21:24:45 -0000 1.3 --- 14 Exam solver parameters.sql 1 Dec 2010 11:10:39 -0000 1.4 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 10 Course offering cache lastlike demands.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/10 Course offering cache lastlike demands.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 10 Course offering cache lastlike demands.sql 17 Jun 2008 21:24:45 -0000 1.2 --- 10 Course offering cache lastlike demands.sql 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ --- NEW FILE: 62 Index on Student External Id.sql --- /* * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * */ create index idx_student_external_uid on student(external_uid); /** * Update database version */ update application_config set value='62' where name='tmtbl.db.version'; commit; Index: 22 Class exam event.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/22 Class exam event.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 22 Class exam event.sql 17 Jun 2008 21:24:45 -0000 1.2 --- 22 Class exam event.sql 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 33 Room type.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/33 Room type.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 33 Room type.sql 16 Jul 2008 20:49:50 -0000 1.1 --- 33 Room type.sql 1 Dec 2010 11:10:39 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 31 Student solver parameters.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/31 Student solver parameters.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 31 Student solver parameters.sql 7 Jul 2008 21:13:42 -0000 1.1 --- 31 Student solver parameters.sql 1 Dec 2010 11:10:39 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 27 Exam solver parameters update.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/27 Exam solver parameters update.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 27 Exam solver parameters update.sql 17 Jun 2008 21:24:45 -0000 1.2 --- 27 Exam solver parameters update.sql 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 24 Exam avg period.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/24 Exam avg period.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 24 Exam avg period.sql 17 Jun 2008 21:24:45 -0000 1.2 --- 24 Exam avg period.sql 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 01 Column Renames.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/01 Column Renames.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 01 Column Renames.sql 17 Jun 2008 21:24:45 -0000 1.3 --- 01 Column Renames.sql 1 Dec 2010 11:10:39 -0000 1.4 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 36 Exam size.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/36 Exam size.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 36 Exam size.sql 9 Sep 2008 16:52:17 -0000 1.1 --- 36 Exam size.sql 1 Dec 2010 11:10:39 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ --- NEW FILE: 60 Using student course requests in the solver.sql --- /* * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * */ update solver_parameter_def set type = 'enum(Last Like Student Course Demands,Weighted Last Like Student Course Demands,Projected Student Course Demands,Curricula Course Demands,Curricula Last Like Course Demands,Student Course Requests,Enrolled Student Course Demands)' where name = 'Curriculum.StudentCourseDemadsClass'; /** * Update database version */ update application_config set value='60' where name='tmtbl.db.version'; commit; Index: 50 Curriculum major.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/50 Curriculum major.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 50 Curriculum major.sql 20 May 2010 14:02:33 -0000 1.1 --- 50 Curriculum major.sql 1 Dec 2010 11:10:39 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 07 IType Abbreviation.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/07 IType Abbreviation.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 07 IType Abbreviation.sql 17 Jun 2008 21:24:45 -0000 1.2 --- 07 IType Abbreviation.sql 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ --- NEW FILE: 58 Curriculum student cache.sql --- /* * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * */ alter table curriculum_clasf add students clob; /** * Update database version */ update application_config set value='58' where name='tmtbl.db.version'; commit; Index: 28 Exam solver parameters update.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/28 Exam solver parameters update.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 28 Exam solver parameters update.sql 17 Jun 2008 21:24:45 -0000 1.2 --- 28 Exam solver parameters update.sql 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 35 Event phone session dates.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/35 Event phone session dates.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 35 Event phone session dates.sql 5 Aug 2008 20:03:44 -0000 1.1 --- 35 Event phone session dates.sql 1 Dec 2010 11:10:39 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 46 Committed student enrls load speedup.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/46 Committed student enrls load speedup.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 46 Committed student enrls load speedup.sql 9 Aug 2009 10:42:41 -0000 1.2 --- 46 Committed student enrls load speedup.sql 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 38 Curricula tables add.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/38 Curricula tables add.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 38 Curricula tables add.sql 9 Sep 2008 21:42:48 -0000 1.1 --- 38 Curricula tables add.sql 1 Dec 2010 11:10:39 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 42 Exam solver parameters update.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/42 Exam solver parameters update.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 42 Exam solver parameters update.sql 23 Sep 2008 20:23:45 -0000 1.1 --- 42 Exam solver parameters update.sql 1 Dec 2010 11:10:39 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 34 Event notes.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/34 Event notes.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 34 Event notes.sql 29 Jul 2008 20:19:34 -0000 1.1 --- 34 Event notes.sql 1 Dec 2010 11:10:39 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 19 Add Event Tables.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/19 Add Event Tables.sql,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** 19 Add Event Tables.sql 17 Jun 2008 21:24:45 -0000 1.6 --- 19 Add Event Tables.sql 1 Dec 2010 11:10:39 -0000 1.7 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ --- NEW FILE: 63 Query log.sql --- /* * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * */ create table query_log ( uniqueid number(20,0) constraint nn_query_log_uniqueid not null, time_stamp date constraint nn_query_log_time_stamp not null, time_spent number(20,0) constraint nn_query_log_time_spent not null, uri varchar2(255) constraint nn_query_log_uri not null, type decimal(10,0) constraint nn_query_log_type not null, session_id varchar2(32), userid varchar2(40), query clob, exception clob ); alter table query_log add constraint pk_query_log primary key (uniqueid); create index idx_query_log on query_log(time_stamp, type); /** * Update database version */ update application_config set value='63' where name='tmtbl.db.version'; commit; --- NEW FILE: 57 Solver changes (coordinates and curricula).sql --- /* * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * */ /* deprecated parameters */ update solver_parameter_def set visible = 0, description = 'Weight last-like students (deprecated)' where name = 'General.WeightStudents'; update solver_parameter_def set visible = 0, description = 'Student Conflict: Distance Limit (after 75min class, deprecated)' where name = 'Student.DistanceLimit75min'; update solver_parameter_def set visible = 0, description = 'Student Conflict: Distance Limit (deprecated)' where name = 'Student.DistanceLimit'; update solver_parameter_def set visible = 0, description = 'Do not load committed student conflicts (deprecated)' where name = 'General.IgnoreCommittedStudentConflicts'; update solver_parameter_def set visible = 0, description = 'Students sectioning' where name = 'General.SwitchStudents'; /* cleanup test defs */ delete from solver_parameter_def where name in ('Curriculum.StudentCourseDemadsClass', 'Distances.Ellipsoid', 'Distances.Speed', 'General.LoadCommittedAssignments', 'General.CommittedStudentConflicts'); /* insert new parameters */ insert into solver_parameter_def (select solver_parameter_def_seq.nextval as uniqueid, 'Curriculum.StudentCourseDemadsClass' as name, 'Projected Student Course Demands' as default_value, 'Student course demands' as description, 'enum(Last Like Student Course Demands,Weighted Last Like Student Course Demands,Projected Student Course Demands,Curricula Course Demands,Curricula Last Like Course Demands,Enrolled Student Course Demands)' as type, 15 as ord, 1 as visible, uniqueid as solver_param_group_id from solver_parameter_group where name='General'); insert into solver_parameter_def (select solver_parameter_def_seq.nextval as uniqueid, 'General.CommittedStudentConflicts' as name, 'Load' as default_value, 'Committed student conflicts' as description, 'enum(Load,Compute,Ignore)' as type, 16 as ord, 1 as visible, uniqueid as solver_param_group_id from solver_parameter_group where name='General'); insert into solver_parameter_def (select solver_parameter_def_seq.nextval as uniqueid, 'General.LoadCommittedAssignments' as name, 'false' as default_value, 'Load committed assignments' as description, 'boolean' as type, 4 as ord, 1 as visible, uniqueid as solver_param_group_id from solver_parameter_group where name='Basic'); insert into solver_parameter_def (select solver_parameter_def_seq.nextval as uniqueid, 'Distances.Ellipsoid' as name, 'DEFAULT' as default_value, 'Ellipsoid to be used to compute distances' as description, 'enum(DEFAULT,LEGACY,WGS84,GRS80,Airy1830,Intl1924,Clarke1880,GRS67)' as type, 5 as ord, 1 as visible, uniqueid as solver_param_group_id from solver_parameter_group where name='Distance'); insert into solver_parameter_def (select solver_parameter_def_seq.nextval as uniqueid, 'Distances.Speed' as name, '67.0' as default_value, 'Student speed in meters per minute' as description, 'double' as type, 6 as ord, 1 as visible, uniqueid as solver_param_group_id from solver_parameter_group where name='Distance'); /** * Update database version */ update application_config set value='57' where name='tmtbl.db.version'; commit; Index: 20 Exam room changes.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/20 Exam room changes.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 20 Exam room changes.sql 17 Jun 2008 21:24:45 -0000 1.2 --- 20 Exam room changes.sql 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 30 Room type.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/30 Room type.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 30 Room type.sql 17 Jun 2008 21:24:45 -0000 1.2 --- 30 Room type.sql 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 02 Room group feature abbv.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/02 Room group feature abbv.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 02 Room group feature abbv.sql 17 Jun 2008 21:24:45 -0000 1.3 --- 02 Room group feature abbv.sql 1 Dec 2010 11:10:39 -0000 1.4 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 39 Curricula changes.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/39 Curricula changes.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 39 Curricula changes.sql 10 Sep 2008 16:42:04 -0000 1.1 --- 39 Curricula changes.sql 1 Dec 2010 11:10:39 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 13 Exams speedup.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/13 Exams speedup.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 13 Exams speedup.sql 17 Jun 2008 21:24:45 -0000 1.3 --- 13 Exams speedup.sql 1 Dec 2010 11:10:39 -0000 1.4 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 26 Event changes.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/26 Event changes.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 26 Event changes.sql 17 Jun 2008 21:24:45 -0000 1.2 --- 26 Event changes.sql 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 37 Data types.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/37 Data types.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 37 Data types.sql 9 Sep 2008 19:56:45 -0000 1.1 --- 37 Data types.sql 1 Dec 2010 11:10:39 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 18 Location perm id add.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/18 Location perm id add.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 18 Location perm id add.sql 17 Jun 2008 21:24:45 -0000 1.3 --- 18 Location perm id add.sql 1 Dec 2010 11:10:39 -0000 1.4 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 21 Add External Uids.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/21 Add External Uids.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 21 Add External Uids.sql 17 Jun 2008 21:24:45 -0000 1.2 --- 21 Add External Uids.sql 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 03 On fly student sectioning.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/03 On fly student sectioning.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 03 On fly student sectioning.sql 17 Jun 2008 21:24:45 -0000 1.2 --- 03 On fly student sectioning.sql 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 40 Curricula renames.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/40 Curricula renames.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 40 Curricula renames.sql 10 Sep 2008 21:48:24 -0000 1.1 --- 40 Curricula renames.sql 1 Dec 2010 11:10:39 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: 16 Exam instructor conflicts.sql =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Database/Oracle/Changes/16 Exam instructor conflicts.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 16 Exam instructor conflicts.sql 17 Jun 2008 21:24:45 -0000 1.3 --- 16 Exam instructor conflicts.sql 1 Dec 2010 11:10:39 -0000 1.4 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ --- NEW FILE: 55 Curriculum projection rules.sql --- /* * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * */ /** * disallow ... [truncated message content] |
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/JavaSource/org/unitime/timetable/solver/ui Modified Files: DiscouragedInstructorBtbReport.java SameSubpartBalancingReport.java DeptBalancingReport.java SolverUnassignedClassesModel.java AssignmentPreferenceInfo.java PerturbationReport.java ConflictStatisticsInfo.java GroupConstraintInfo.java LogInfo.java UnassignedClassRow.java FileInfo.java SolutionUnassignedClassesModel.java TimetableInfoFileProxy.java StudentConflictsReport.java PropertiesInfo.java BtbInstructorConstraintInfo.java TimetableInfoUtil.java ViolatedDistrPreferencesReport.java UnassignedClassesModel.java RoomReport.java JenrlInfo.java TimetableInfo.java Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: SameSubpartBalancingReport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui/SameSubpartBalancingReport.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SameSubpartBalancingReport.java 17 Jun 2008 21:24:41 -0000 1.2 --- SameSubpartBalancingReport.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.ui; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.ui; *************** *** 22,26 **** import java.io.Serializable; import java.util.Collection; - import java.util.Enumeration; import java.util.HashSet; import java.util.Hashtable; --- 22,25 ---- *************** *** 45,50 **** public SameSubpartBalancingReport(Solver solver) { TimetableModel model = (TimetableModel)solver.currentSolution().getModel(); ! for (Enumeration e=model.getSpreadConstraints().elements();e.hasMoreElements();) { ! SpreadConstraint spread = (SpreadConstraint)e.nextElement(); if (spread.getPenalty()==0) continue; iGroups.add(new SameSubpartBalancingGroup(solver,spread)); --- 44,48 ---- public SameSubpartBalancingReport(Solver solver) { TimetableModel model = (TimetableModel)solver.currentSolution().getModel(); ! for (SpreadConstraint spread: model.getSpreadConstraints()) { if (spread.getPenalty()==0) continue; iGroups.add(new SameSubpartBalancingGroup(solver,spread)); *************** *** 75,80 **** iUsage[i][j]=spread.getNrCourses()[i][j]; iCourses[i][j]=new HashSet(spread.getCourses()[i][j].size()); ! for (Enumeration e=spread.getCourses()[i][j].elements();e.hasMoreElements();) { ! Placement placement = (Placement)e.nextElement(); Lecture lecture = (Lecture)placement.variable(); ClassAssignmentDetails ca = (ClassAssignmentDetails)detailCache.get(lecture.getClassId()); --- 73,77 ---- iUsage[i][j]=spread.getNrCourses()[i][j]; iCourses[i][j]=new HashSet(spread.getCourses()[i][j].size()); ! for (Placement placement: spread.getCourses()[i][j]) { Lecture lecture = (Lecture)placement.variable(); ClassAssignmentDetails ca = (ClassAssignmentDetails)detailCache.get(lecture.getClassId()); Index: FileInfo.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui/FileInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FileInfo.java 17 Jun 2008 21:24:41 -0000 1.2 --- FileInfo.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.ui; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.ui; Index: SolverUnassignedClassesModel.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui/SolverUnassignedClassesModel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SolverUnassignedClassesModel.java 17 Jun 2008 21:24:41 -0000 1.3 --- SolverUnassignedClassesModel.java 1 Dec 2010 11:10:38 -0000 1.4 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,25 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.ui; - import java.util.Enumeration; - import org.unitime.timetable.solver.TimetableSolver; --- 15,23 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.ui; import org.unitime.timetable.solver.TimetableSolver; *************** *** 32,41 **** public class SolverUnassignedClassesModel extends UnassignedClassesModel { public SolverUnassignedClassesModel(TimetableSolver solver) { super(); ! for (Enumeration e=solver.currentSolution().getModel().unassignedVariables().elements();e.hasMoreElements();) { ! Lecture lecture = (Lecture)e.nextElement(); String name = lecture.getName(); ! String onClick = "window.open('suggestions.do?id="+lecture.getClassId()+"&op=Reset','suggestions','width=1000,height=600,resizable=yes,scrollbars=yes,toolbar=no,location=no,directories=no,status=yes,menubar=no,copyhistory=no').focus();"; String instructorName = lecture.getInstructorName(); int nrStudents = lecture.students().size(); --- 30,40 ---- public class SolverUnassignedClassesModel extends UnassignedClassesModel { + private static final long serialVersionUID = -6094708695678612559L; + public SolverUnassignedClassesModel(TimetableSolver solver) { super(); ! for (Lecture lecture: solver.currentSolution().getModel().unassignedVariables()) { String name = lecture.getName(); ! String onClick = "showGwtDialog('Suggestions', 'suggestions.do?id="+lecture.getClassId()+"&op=Reset','900','90%');"; String instructorName = lecture.getInstructorName(); int nrStudents = lecture.students().size(); Index: TimetableInfoFileProxy.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui/TimetableInfoFileProxy.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TimetableInfoFileProxy.java 17 Jun 2008 21:24:41 -0000 1.2 --- TimetableInfoFileProxy.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.ui; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.ui; Index: TimetableInfo.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui/TimetableInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TimetableInfo.java 17 Jun 2008 21:24:41 -0000 1.2 --- TimetableInfo.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.ui; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.ui; Index: PropertiesInfo.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui/PropertiesInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PropertiesInfo.java 17 Jun 2008 21:24:41 -0000 1.2 --- PropertiesInfo.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,25 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.ui; import java.io.Serializable; ! import java.util.*; import org.dom4j.Element; --- 15,27 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.ui; import java.io.Serializable; ! import java.util.Iterator; ! import java.util.Map; ! import java.util.Properties; import org.dom4j.Element; Index: DiscouragedInstructorBtbReport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui/DiscouragedInstructorBtbReport.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DiscouragedInstructorBtbReport.java 17 Jun 2008 21:24:41 -0000 1.2 --- DiscouragedInstructorBtbReport.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,28 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.ui; import java.io.Serializable; - import java.util.Enumeration; import java.util.HashSet; import java.util.Set; - import java.util.Vector; import org.unitime.timetable.model.PreferenceLevel; --- 15,27 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.ui; import java.io.Serializable; import java.util.HashSet; + import java.util.List; import java.util.Set; import org.unitime.timetable.model.PreferenceLevel; *************** *** 46,67 **** public DiscouragedInstructorBtbReport(Solver solver) { TimetableModel model = (TimetableModel)solver.currentSolution().getModel(); ! for (Enumeration e=model.getInstructorConstraints().elements();e.hasMoreElements(); ) { ! InstructorConstraint ic = (InstructorConstraint)e.nextElement(); HashSet used = new HashSet(); for (int slot=1;slot<Constants.SLOTS_PER_DAY * Constants.NR_DAYS;slot++) { if ((slot%Constants.SLOTS_PER_DAY)==0) continue; ! for (Enumeration f=ic.getResource(slot).elements();f.hasMoreElements();) { ! Placement placement = (Placement)f.nextElement(); ! Vector prevPlacements = ic.getPlacements(slot-1,placement); ! for (Enumeration i=prevPlacements.elements();i.hasMoreElements();) { ! Placement prevPlacement = (Placement)i.nextElement(); if (prevPlacement.equals(placement)) continue; if (!used.add(prevPlacement+"."+placement)) continue; ! double dist = Placement.getDistance(prevPlacement,placement); ! if (dist>model.getInstructorNoPreferenceLimit() && dist<=model.getInstructorDiscouragedLimit()) iGroups.add(new DiscouragedBtb(solver, ic, dist, prevPlacement, placement, PreferenceLevel.sDiscouraged)); ! if (dist>model.getInstructorDiscouragedLimit() && dist<=model.getInstructorProhibitedLimit()) iGroups.add(new DiscouragedBtb(solver, ic, dist, prevPlacement, placement, PreferenceLevel.sStronglyDiscouraged)); ! if (dist>model.getInstructorProhibitedLimit()) iGroups.add(new DiscouragedBtb(solver, ic, dist, prevPlacement, placement, PreferenceLevel.sProhibited)); --- 45,63 ---- public DiscouragedInstructorBtbReport(Solver solver) { TimetableModel model = (TimetableModel)solver.currentSolution().getModel(); ! for (InstructorConstraint ic: model.getInstructorConstraints()) { HashSet used = new HashSet(); for (int slot=1;slot<Constants.SLOTS_PER_DAY * Constants.NR_DAYS;slot++) { if ((slot%Constants.SLOTS_PER_DAY)==0) continue; ! for (Placement placement: ic.getResource(slot)) { ! List<Placement> prevPlacements = ic.getPlacements(slot-1,placement); ! for (Placement prevPlacement: prevPlacements) { if (prevPlacement.equals(placement)) continue; if (!used.add(prevPlacement+"."+placement)) continue; ! double dist = Placement.getDistanceInMeters(model.getDistanceMetric(), prevPlacement,placement); ! if (dist>model.getDistanceMetric().getInstructorNoPreferenceLimit() && dist<=model.getDistanceMetric().getInstructorDiscouragedLimit()) iGroups.add(new DiscouragedBtb(solver, ic, dist, prevPlacement, placement, PreferenceLevel.sDiscouraged)); ! if (dist>model.getDistanceMetric().getInstructorDiscouragedLimit() && dist<=model.getDistanceMetric().getInstructorProhibitedLimit()) iGroups.add(new DiscouragedBtb(solver, ic, dist, prevPlacement, placement, PreferenceLevel.sStronglyDiscouraged)); ! if (dist>model.getDistanceMetric().getInstructorProhibitedLimit()) iGroups.add(new DiscouragedBtb(solver, ic, dist, prevPlacement, placement, PreferenceLevel.sProhibited)); Index: TimetableInfoUtil.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui/TimetableInfoUtil.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TimetableInfoUtil.java 17 Jun 2008 21:24:41 -0000 1.2 --- TimetableInfoUtil.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.ui; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.ui; Index: LogInfo.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui/LogInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LogInfo.java 17 Jun 2008 21:24:41 -0000 1.2 --- LogInfo.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,30 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.ui; import java.io.Serializable; ! import java.util.*; ! ! import org.dom4j.Element; import net.sf.cpsolver.ifs.util.Progress; /** * @author Tomas Muller --- 15,32 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.ui; import java.io.Serializable; ! import java.util.ArrayList; ! import java.util.Iterator; ! import java.util.List; import net.sf.cpsolver.ifs.util.Progress; + import org.dom4j.Element; + /** * @author Tomas Muller *************** *** 34,46 **** public static int sVersion = 1; // to be able to do some changes in the future public static int sNoSaveThreshold = Progress.MSGLEVEL_DEBUG; ! private Vector iLog = new Vector(); ! public void setLog(Vector log) { iLog = log; } ! public Vector getLog() { return iLog; } public String getLog(int level) { StringBuffer sb = new StringBuffer(); ! for (Enumeration e=iLog.elements();e.hasMoreElements();) { ! Progress.Message m = (Progress.Message)e.nextElement(); String s = m.toString(level); if (s!=null) sb.append(s+"\n"); --- 36,47 ---- public static int sVersion = 1; // to be able to do some changes in the future public static int sNoSaveThreshold = Progress.MSGLEVEL_DEBUG; ! private List<Progress.Message> iLog = new ArrayList<Progress.Message>(); ! public void setLog(List<Progress.Message> log) { iLog = log; } ! public List<Progress.Message> getLog() { return iLog; } public String getLog(int level) { StringBuffer sb = new StringBuffer(); ! for (Progress.Message m: iLog) { String s = m.toString(level); if (s!=null) sb.append(s+"\n"); *************** *** 51,56 **** public String getHtmlLog(int level, boolean includeDate) { StringBuffer sb = new StringBuffer(); ! for (Enumeration e=iLog.elements();e.hasMoreElements();) { ! Progress.Message m = (Progress.Message)e.nextElement(); String s = m.toHtmlString(level, includeDate); if (s!=null) sb.append(s+"<br>"); --- 52,56 ---- public String getHtmlLog(int level, boolean includeDate) { StringBuffer sb = new StringBuffer(); ! for (Progress.Message m: iLog) { String s = m.toHtmlString(level, includeDate); if (s!=null) sb.append(s+"<br>"); *************** *** 61,66 **** public String getHtmlLog(int level, boolean includeDate, String fromStage) { StringBuffer sb = new StringBuffer(); ! for (Enumeration e=iLog.elements();e.hasMoreElements();) { ! Progress.Message m = (Progress.Message)e.nextElement(); if (m.getLevel()==Progress.MSGLEVEL_STAGE && m.getMessage().equals(fromStage)) sb = new StringBuffer(); --- 61,65 ---- public String getHtmlLog(int level, boolean includeDate, String fromStage) { StringBuffer sb = new StringBuffer(); ! for (Progress.Message m: iLog) { if (m.getLevel()==Progress.MSGLEVEL_STAGE && m.getMessage().equals(fromStage)) sb = new StringBuffer(); *************** *** 86,91 **** public void save(Element root) throws Exception { root.addAttribute("version", String.valueOf(sVersion)); ! for (Enumeration e=iLog.elements();e.hasMoreElements();) { ! Progress.Message msg = (Progress.Message)e.nextElement(); if (msg.getLevel()<=sNoSaveThreshold) continue; msg.save(root.addElement("msg")); --- 85,89 ---- public void save(Element root) throws Exception { root.addAttribute("version", String.valueOf(sVersion)); ! for (Progress.Message msg: iLog) { if (msg.getLevel()<=sNoSaveThreshold) continue; msg.save(root.addElement("msg")); Index: StudentConflictsReport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui/StudentConflictsReport.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** StudentConflictsReport.java 17 Jun 2008 21:24:41 -0000 1.2 --- StudentConflictsReport.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,27 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.ui; import java.io.Serializable; - import java.util.Enumeration; import java.util.HashSet; - import java.util.Hashtable; import java.util.Set; --- 15,25 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.ui; import java.io.Serializable; import java.util.HashSet; import java.util.Set; *************** *** 41,54 **** public StudentConflictsReport(Solver solver) { TimetableModel model = (TimetableModel)solver.currentSolution().getModel(); ! for (Enumeration e=model.getJenrlConstraints().elements();e.hasMoreElements(); ) { ! JenrlConstraint jenrl = (JenrlConstraint)e.nextElement(); if (jenrl.isInConflict()) iGroups.add(new JenrlInfo(solver, jenrl)); } ! Hashtable ret = new Hashtable(); ! for (Enumeration e=model.assignedVariables().elements();e.hasMoreElements();) { ! Lecture lecture = (Lecture)e.nextElement(); iGroups.addAll(JenrlInfo.getCommitedJenrlInfos(solver, lecture).values()); } } --- 39,53 ---- public StudentConflictsReport(Solver solver) { TimetableModel model = (TimetableModel)solver.currentSolution().getModel(); ! for (JenrlConstraint jenrl: model.getJenrlConstraints()) { if (jenrl.isInConflict()) iGroups.add(new JenrlInfo(solver, jenrl)); } ! for (Lecture lecture: model.assignedVariables()) { iGroups.addAll(JenrlInfo.getCommitedJenrlInfos(solver, lecture).values()); } + for (Lecture lecture: model.constantVariables()) { + if (lecture.getAssignment() != null) + iGroups.addAll(JenrlInfo.getCommitedJenrlInfos(solver, lecture).values()); + } } Index: PerturbationReport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui/PerturbationReport.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PerturbationReport.java 17 Jun 2008 21:24:41 -0000 1.2 --- PerturbationReport.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,25 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.ui; import java.io.Serializable; - import java.util.Enumeration; import java.util.HashSet; import java.util.Iterator; --- 15,24 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.ui; import java.io.Serializable; import java.util.HashSet; import java.util.Iterator; *************** *** 34,37 **** --- 33,37 ---- import net.sf.cpsolver.coursett.model.TimetableModel; import net.sf.cpsolver.ifs.solver.Solver; + import net.sf.cpsolver.ifs.util.DistanceMetric; /** *************** *** 44,51 **** public PerturbationReport(Solver solver) { TimetableModel model = (TimetableModel)solver.currentSolution().getModel(); ! for (Enumeration e=model.perturbVariables().elements();e.hasMoreElements();) { ! Lecture lecture = (Lecture)e.nextElement(); ! Placement placement = (Placement)lecture.getAssignment(); ! Placement initial = (Placement)lecture.getInitialAssignment(); if (placement==null || initial==null || placement.equals(initial)) continue; iGroups.add(new PerturbationGroup(solver,lecture)); --- 44,50 ---- public PerturbationReport(Solver solver) { TimetableModel model = (TimetableModel)solver.currentSolution().getModel(); ! for (Lecture lecture: model.perturbVariables()) { ! Placement placement = lecture.getAssignment(); ! Placement initial = lecture.getInitialAssignment(); if (placement==null || initial==null || placement.equals(initial)) continue; iGroups.add(new PerturbationGroup(solver,lecture)); *************** *** 110,124 **** deltaTimePreferences=(assignedPlacement.getTimeLocation().getNormalizedPreference() - initialPlacement.getTimeLocation().getNormalizedPreference()); ! distance = Placement.getDistance(initialPlacement, assignedPlacement); if (!lecture.getInstructorConstraints().isEmpty()) { ! if (distance>0.0 && distance<=5.0) { tooFarForInstructors+=PreferenceLevel.sIntLevelDiscouraged; ! } else if (distance>5.0 && distance<=20.0) { tooFarForInstructors+=PreferenceLevel.sIntLevelStronglyDiscouraged; ! } else if (distance>20.0) { tooFarForInstructors+=PreferenceLevel.sIntLevelProhibited; } } ! if (distance > ((TimetableModel)lecture.getModel()).getStudentDistanceLimit()) tooFarForStudents = (int)lecture.classLimit(); --- 109,124 ---- deltaTimePreferences=(assignedPlacement.getTimeLocation().getNormalizedPreference() - initialPlacement.getTimeLocation().getNormalizedPreference()); ! DistanceMetric m = ((TimetableModel)lecture.getModel()).getDistanceMetric(); ! distance = Placement.getDistanceInMeters(m,initialPlacement, assignedPlacement); if (!lecture.getInstructorConstraints().isEmpty()) { ! if (distance>m.getInstructorNoPreferenceLimit() && distance<=m.getInstructorDiscouragedLimit()) { tooFarForInstructors+=PreferenceLevel.sIntLevelDiscouraged; ! } else if (distance>m.getInstructorDiscouragedLimit() && distance<=m.getInstructorProhibitedLimit()) { tooFarForInstructors+=PreferenceLevel.sIntLevelStronglyDiscouraged; ! } else if (distance>m.getInstructorProhibitedLimit()) { tooFarForInstructors+=PreferenceLevel.sIntLevelProhibited; } } ! if (distance > m.minutes2meters(10)) tooFarForStudents = (int)lecture.classLimit(); *************** *** 129,136 **** ! for (Enumeration e=lecture.getInstructorConstraints().elements();e.hasMoreElements();) { ! InstructorConstraint ic = (InstructorConstraint)e.nextElement(); ! for (Enumeration f=ic.variables().elements();f.hasMoreElements();) { ! Lecture lect = (Lecture)f.nextElement(); if (lect.equals(lecture)) continue; int initialPreference = (lect.getInitialAssignment()==null?PreferenceLevel.sIntLevelNeutral:ic.getDistancePreference(initialPlacement,(Placement)lect.getInitialAssignment())); --- 129,134 ---- ! for (InstructorConstraint ic: lecture.getInstructorConstraints()) { ! for (Lecture lect: ic.variables()) { if (lect.equals(lecture)) continue; int initialPreference = (lect.getInitialAssignment()==null?PreferenceLevel.sIntLevelNeutral:ic.getDistancePreference(initialPlacement,(Placement)lect.getInitialAssignment())); Index: SolutionUnassignedClassesModel.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui/SolutionUnassignedClassesModel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SolutionUnassignedClassesModel.java 17 Jun 2008 21:24:41 -0000 1.3 --- SolutionUnassignedClassesModel.java 1 Dec 2010 11:10:38 -0000 1.4 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,27 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.ui; import java.util.Collection; - import java.util.Enumeration; import java.util.Iterator; ! import java.util.Vector; import org.unitime.timetable.model.Class_; --- 15,26 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.ui; import java.util.Collection; import java.util.Iterator; ! import java.util.List; import org.unitime.timetable.model.Class_; *************** *** 35,38 **** --- 34,39 ---- public class SolutionUnassignedClassesModel extends UnassignedClassesModel { + private static final long serialVersionUID = 8222974077941239586L; + public SolutionUnassignedClassesModel(Collection solutions, org.hibernate.Session hibSession, String instructorFormat) { super(); *************** *** 42,52 **** Class_ clazz = (Class_)j.next(); String name = clazz.getClassLabel(); ! String onClick = "window.open('suggestions.do?id="+clazz.getUniqueId()+"&op=Reset','suggestions','width=1000,height=600,resizable=yes,scrollbars=yes,toolbar=no,location=no,directories=no,status=yes,menubar=no,copyhistory=no').focus();"; ! Vector leads = clazz.getLeadInstructors(); StringBuffer leadsSb = new StringBuffer(); ! for (Enumeration e=leads.elements();e.hasMoreElements();) { ! DepartmentalInstructor instructor = (DepartmentalInstructor)e.nextElement(); leadsSb.append(instructor.getName(instructorFormat)); ! if (e.hasMoreElements()) leadsSb.append(";"); } String instructorName = leadsSb.toString(); --- 43,53 ---- Class_ clazz = (Class_)j.next(); String name = clazz.getClassLabel(); ! String onClick = "showGwtDialog('Suggestions', 'suggestions.do?id="+clazz.getUniqueId()+"&op=Reset','900','90%');"; ! List<DepartmentalInstructor> leads = clazz.getLeadInstructors(); StringBuffer leadsSb = new StringBuffer(); ! for (Iterator<DepartmentalInstructor> e=leads.iterator();e.hasNext();) { ! DepartmentalInstructor instructor = (DepartmentalInstructor)e.next(); leadsSb.append(instructor.getName(instructorFormat)); ! if (e.hasNext()) leadsSb.append(";"); } String instructorName = leadsSb.toString(); Index: DeptBalancingReport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui/DeptBalancingReport.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DeptBalancingReport.java 17 Jun 2008 21:24:41 -0000 1.2 --- DeptBalancingReport.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.ui; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.ui; *************** *** 22,26 **** import java.io.Serializable; import java.util.Collection; - import java.util.Enumeration; import java.util.HashSet; import java.util.Hashtable; --- 22,25 ---- *************** *** 45,50 **** public DeptBalancingReport(Solver solver) { TimetableModel model = (TimetableModel)solver.currentSolution().getModel(); ! for (Enumeration e=model.getDepartmentSpreadConstraints().elements();e.hasMoreElements();) { ! DepartmentSpreadConstraint deptSpread = (DepartmentSpreadConstraint)e.nextElement(); iGroups.add(new DeptBalancingGroup(solver,deptSpread)); } --- 44,48 ---- public DeptBalancingReport(Solver solver) { TimetableModel model = (TimetableModel)solver.currentSolution().getModel(); ! for (DepartmentSpreadConstraint deptSpread: model.getDepartmentSpreadConstraints()) { iGroups.add(new DeptBalancingGroup(solver,deptSpread)); } *************** *** 76,81 **** iUsage[i][j]=deptSpread.getNrCourses()[i][j]; iCourses[i][j]=new HashSet(deptSpread.getCourses()[i][j].size()); ! for (Enumeration e=deptSpread.getCourses()[i][j].elements();e.hasMoreElements();) { ! Placement placement = (Placement)e.nextElement(); Lecture lecture = (Lecture)placement.variable(); ClassAssignmentDetails ca = (ClassAssignmentDetails)detailCache.get(lecture.getClassId()); --- 74,78 ---- iUsage[i][j]=deptSpread.getNrCourses()[i][j]; iCourses[i][j]=new HashSet(deptSpread.getCourses()[i][j].size()); ! for (Placement placement: deptSpread.getCourses()[i][j]) { Lecture lecture = (Lecture)placement.variable(); ClassAssignmentDetails ca = (ClassAssignmentDetails)detailCache.get(lecture.getClassId()); Index: GroupConstraintInfo.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui/GroupConstraintInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GroupConstraintInfo.java 17 Jun 2008 21:24:41 -0000 1.2 --- GroupConstraintInfo.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.ui; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.ui; Index: UnassignedClassesModel.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui/UnassignedClassesModel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** UnassignedClassesModel.java 17 Jun 2008 21:24:41 -0000 1.2 --- UnassignedClassesModel.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.ui; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.ui; Index: ViolatedDistrPreferencesReport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui/ViolatedDistrPreferencesReport.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ViolatedDistrPreferencesReport.java 17 Jun 2008 21:24:41 -0000 1.2 --- ViolatedDistrPreferencesReport.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.ui; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.ui; *************** *** 22,26 **** import java.io.Serializable; import java.util.Collections; - import java.util.Enumeration; import java.util.HashSet; import java.util.Set; --- 22,25 ---- *************** *** 44,49 **** public ViolatedDistrPreferencesReport(Solver solver) { TimetableModel model = (TimetableModel)solver.currentSolution().getModel(); ! for (Enumeration e=model.getGroupConstraints().elements();e.hasMoreElements(); ) { ! GroupConstraint gc = (GroupConstraint)e.nextElement(); if (!gc.isSatisfied()) iGroups.add(new ViolatedDistrPreference(solver, gc)); --- 43,47 ---- public ViolatedDistrPreferencesReport(Solver solver) { TimetableModel model = (TimetableModel)solver.currentSolution().getModel(); ! for (GroupConstraint gc: model.getGroupConstraints()) { if (!gc.isSatisfied()) iGroups.add(new ViolatedDistrPreference(solver, gc)); *************** *** 66,71 **** iType = gc.getType(); iName = gc.getName(); ! for (Enumeration e=gc.variables().elements();e.hasMoreElements();) { ! Lecture lecture = (Lecture)e.nextElement(); if (lecture.getAssignment()==null) continue; iClasses.add(new ClassAssignmentDetails(solver,lecture,false)); --- 64,68 ---- iType = gc.getType(); iName = gc.getName(); ! for (Lecture lecture: gc.variables()) { if (lecture.getAssignment()==null) continue; iClasses.add(new ClassAssignmentDetails(solver,lecture,false)); Index: AssignmentPreferenceInfo.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui/AssignmentPreferenceInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AssignmentPreferenceInfo.java 17 Jun 2008 21:24:41 -0000 1.2 --- AssignmentPreferenceInfo.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,25 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.ui; import java.io.Serializable; - import java.util.Enumeration; import java.util.Hashtable; import java.util.Iterator; --- 15,24 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.ui; import java.io.Serializable; import java.util.Hashtable; import java.util.Iterator; *************** *** 96,105 **** setNrStudentConflicts(lecture.countStudentConflictsOfTheSameProblem(placement)); setNrHardStudentConflicts(lecture.countHardStudentConflictsOfTheSameProblem(placement)); ! setNrCommitedStudentConflicts(0); setNrDistanceStudentConflicts(lecture.countDistanceStudentConflictsOfTheSameProblem(placement)); } else { setNrStudentConflicts(lecture.countStudentConflicts(placement)+lecture.getCommitedConflicts(placement)); setNrHardStudentConflicts(lecture.countHardStudentConflicts(placement)); ! setNrCommitedStudentConflicts(lecture.getCommitedConflicts(placement)); setNrDistanceStudentConflicts(lecture.countDistanceStudentConflicts(placement)); } --- 95,104 ---- setNrStudentConflicts(lecture.countStudentConflictsOfTheSameProblem(placement)); setNrHardStudentConflicts(lecture.countHardStudentConflictsOfTheSameProblem(placement)); ! setNrCommitedStudentConflicts(lecture.countCommittedStudentConflictsOfTheSameProblem(placement)); setNrDistanceStudentConflicts(lecture.countDistanceStudentConflictsOfTheSameProblem(placement)); } else { setNrStudentConflicts(lecture.countStudentConflicts(placement)+lecture.getCommitedConflicts(placement)); setNrHardStudentConflicts(lecture.countHardStudentConflicts(placement)); ! setNrCommitedStudentConflicts(lecture.getCommitedConflicts(placement) + lecture.countCommittedStudentConflicts(placement)); setNrDistanceStudentConflicts(lecture.countDistanceStudentConflicts(placement)); } *************** *** 111,116 **** setTimePreference(placement.getTimeLocation().getPreference()); if (placement.isMultiRoom()) { ! for (Enumeration e=placement.getRoomLocations().elements();e.hasMoreElements();) { ! RoomLocation r = (RoomLocation)e.nextElement(); if (lecture.nrRoomLocations()==lecture.getNrRooms() && r.getPreference()==0) setRoomPreference(r.getId(),PreferenceLevel.sIntLevelRequired); --- 110,114 ---- setTimePreference(placement.getTimeLocation().getPreference()); if (placement.isMultiRoom()) { ! for (RoomLocation r: placement.getRoomLocations()) { if (lecture.nrRoomLocations()==lecture.getNrRooms() && r.getPreference()==0) setRoomPreference(r.getId(),PreferenceLevel.sIntLevelRequired); *************** *** 128,133 **** int nrSameTimePlacementsNoConf = 0; int nrPlacementsNoConf = 0; ! for (Enumeration e=lecture.values().elements();e.hasMoreElements();) { ! Placement p = (Placement)e.nextElement(); if (p.isHard()) continue; if (p.equals(placement)) continue; --- 126,130 ---- int nrSameTimePlacementsNoConf = 0; int nrPlacementsNoConf = 0; ! for (Placement p: lecture.values()) { if (p.isHard()) continue; if (p.equals(placement)) continue; *************** *** 145,150 **** } int btbInstructorPref = 0; ! for (Enumeration e=lecture.getInstructorConstraints().elements();e.hasMoreElements();) { ! InstructorConstraint ic = (InstructorConstraint)e.nextElement(); btbInstructorPref += ic.getPreferenceCombination(placement); } --- 142,146 ---- } int btbInstructorPref = 0; ! for (InstructorConstraint ic: lecture.getInstructorConstraints()) { btbInstructorPref += ic.getPreferenceCombination(placement); } *************** *** 160,165 **** iUselessHalfHours = placement.nrUselessHalfHours(); DepartmentSpreadConstraint deptConstraint = null; ! for (Enumeration e=lecture.constraints().elements();e.hasMoreElements();) { ! Constraint c = (Constraint)e.nextElement(); if (c instanceof DepartmentSpreadConstraint) deptConstraint = (DepartmentSpreadConstraint)c; --- 156,160 ---- iUselessHalfHours = placement.nrUselessHalfHours(); DepartmentSpreadConstraint deptConstraint = null; ! for (Constraint c: lecture.constraints()) { if (c instanceof DepartmentSpreadConstraint) deptConstraint = (DepartmentSpreadConstraint)c; Index: UnassignedClassRow.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui/UnassignedClassRow.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** UnassignedClassRow.java 17 Jun 2008 21:24:41 -0000 1.2 --- UnassignedClassRow.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.ui; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.ui; Index: RoomReport.java =================================================================== RCS ... [truncated message content] |
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/JavaSource/org/unitime/timetable/model/base Modified Files: BaseCourseHistory.java BaseSolverGroup.java BaseCourseOffering.java BaseAcademicAreaHistoryDAO.java BaseDepartmentalInstructor.java BaseStandardEventNote.java BaseSolverPredefinedSettingDAO.java BaseTimePrefDAO.java BaseAcademicClassification.java BasePositionCodeType.java BaseDepartmentalInstructorDAO.java BaseConstraintInfo.java BaseRoomDAO.java BaseAcademicAreaDAO.java BaseBuildingAbbreviationHistory.java BaseStudentEnrollmentMessageDAO.java BaseChangeLog.java BaseExamEventDAO.java BaseUserDAO.java BaseAssignmentInfo.java BaseCourseCreditUnitConfigDAO.java BaseBuildingPref.java BaseJointEnrollment.java BaseExamPeriodPrefDAO.java BaseExternalRoomFeatureDAO.java BaseRoomPrefDAO.java BaseClassEvent.java BaseRolesDAO.java BaseExactTimeMins.java BaseEventContactDAO.java BasePositionType.java BaseTimePref.java BaseAcademicAreaClassification.java BaseDepartmentRoomFeatureDAO.java BaseHistory.java BaseRoomFeaturePref.java BaseDesignator.java BaseRelatedCourseInfoDAO.java BaseBuildingAbbreviationHistoryDAO.java BaseCourseEventDAO.java BaseRoomGroupPrefDAO.java BaseMidtermExamEventDAO.java BaseExternalBuilding.java BaseSolverInfo.java BaseFixedCreditUnitConfigDAO.java BaseInstructionalOffering.java BaseSubjectAreaDAO.java BaseDistributionType.java BaseSolution.java BaseCourseEvent.java BaseCurriculumClassificationDAO.java BaseAcadAreaPosReservation.java BaseFinalExamEventDAO.java BaseBuilding.java BaseRefTableEntryDAO.java BaseTimetableManagerDAO.java BaseAssignmentDAO.java BaseExamLocationPref.java BaseExamConflict.java BaseSettings.java BaseBuildingPrefDAO.java BaseSolverParameterDAO.java BaseAcadAreaReservationDAO.java BaseSolverPredefinedSetting.java BaseDepartment.java BaseSubjectHistory.java BaseCourseHistoryDAO.java BaseSectioningInfoDAO.java BaseSponsoringOrganization.java BasePreferenceDAO.java BaseSolutionDAO.java BaseInstrOfferingConfig.java BaseCourseSubpartCreditDAO.java BaseStudentGroupDAO.java BaseAcademicClassificationDAO.java BaseTimePatternDAO.java BaseDistributionObject.java BaseExternalRoomDepartmentDAO.java BasePosMinor.java BaseCourseCreditTypeDAO.java BaseIndividualReservationDAO.java BasePosReservationDAO.java BaseExamOwnerDAO.java BaseWaitList.java BaseVariableFixedCreditUnitConfigDAO.java BaseEventNote.java BaseInstrOfferingConfigDAO.java BaseSessionDAO.java BaseDatePatternDAO.java BaseRoomPref.java BaseFreeTimeDAO.java BaseTimePatternTime.java BaseAssignmentInfoDAO.java BaseCourseRequest.java BaseStaffDAO.java BaseDatePattern.java BaseStudentSectHistoryDAO.java BaseVariableRangeCreditUnitConfigDAO.java BaseExternalRoom.java BaseExamEvent.java BaseClassWaitList.java BaseStaff.java BaseSectioningInfo.java BaseStudentStatusType.java BaseTimetableManager.java BaseDepartmentStatusType.java BaseMeetingDAO.java BaseOfferingConsentTypeDAO.java BaseStudentAccomodationDAO.java BaseArrangeCreditUnitConfigDAO.java BaseLastLikeCourseDemandDAO.java BaseSponsoringOrganizationDAO.java BaseSchedulingSubpart.java BaseAcadAreaPosReservationDAO.java BaseStudentEnrollment.java BaseEventDAO.java BaseCurriculumCourse.java BaseRoomTypeDAO.java BaseSolverParameterGroup.java BaseRoomTypeOption.java BaseRefTableEntry.java BaseHistoryDAO.java BaseArrangeCreditUnitConfig.java BaseSchedulingSubpartDAO.java BaseReservationType.java BaseApplicationConfig.java BaseDepartmentDAO.java BaseExamOwner.java BaseGlobalRoomFeature.java BaseStudentDAO.java BaseApplicationConfigDAO.java BaseEvent.java BasePreferenceGroupDAO.java BaseDistributionPref.java BasePosReservation.java BaseCourseCreditFormat.java BaseReservationTypeDAO.java BaseAcademicAreaClassificationDAO.java BaseBuildingDAO.java BaseEventNoteDAO.java BaseManagerRole.java BaseAcademicArea.java BaseExamDAO.java BaseDemandOfferingType.java BaseCourseCreditFormatDAO.java BaseManagerRoleDAO.java BaseStudentGroupReservation.java BasePosMajor.java BaseFinalExamEvent.java BaseFreeTime.java BaseTimePattern.java BaseClassWaitListDAO.java BaseSolverParameterDefDAO.java BasePosMinorDAO.java BaseSolverParameter.java BaseUser.java BaseStudentGroup.java BaseSession.java BaseStudentEnrollmentMessage.java BaseSubjectHistoryDAO.java BaseStudentStatusTypeDAO.java BaseSettingsDAO.java BaseExamPeriodDAO.java BaseCourseRequestDAO.java BaseExamPeriod.java BaseStudentClassEnrollment.java BaseSolutionInfoDAO.java BaseExternalBuildingDAO.java BaseCharacteristicReservation.java BaseStudentGroupReservationDAO.java BaseCourseCatalog.java BaseDistributionTypeDAO.java BaseItypeDesc.java _BaseRootDAO.java BaseExternalRoomDAO.java BaseCourseCreditUnitConfig.java BaseRoomFeature.java BaseMidtermExamEvent.java BaseStandardEventNoteDAO.java BaseStudentEnrollmentDAO.java BaseExactTimeMinsDAO.java BaseReservation.java BaseClassInstructorDAO.java BasePositionCodeTypeDAO.java BaseUserDataDAO.java BaseExamLocationPrefDAO.java BaseExamPeriodPref.java BaseVariableFixedCreditUnitConfig.java BaseCourseCatalogDAO.java BasePreferenceLevel.java BaseGlobalRoomFeatureDAO.java BaseClass_DAO.java BaseRoomFeaturePrefDAO.java BaseRoomGroup.java BasePosMajorDAO.java BaseNonUniversityLocation.java BaseCurriculum.java BaseManagerSettingsDAO.java BaseEventContact.java BaseCourseCreditUnitType.java BaseFixedCreditUnitConfig.java BaseTimePatternDays.java BaseCourseRequestOption.java BaseSubjectArea.java BasePreferenceLevelDAO.java BaseChangeLogDAO.java BaseExternalRoomDepartment.java BaseSolverGroupDAO.java BaseJointEnrollmentDAO.java BaseAssignment.java BaseCurriculumCourseDAO.java BaseRoom.java BaseRelatedCourseInfo.java BaseSolverInfoDAO.java BaseClassEventDAO.java BaseManagerSettings.java BaseAcadAreaReservation.java BaseCourseSubpartCredit.java BaseIndividualReservation.java BaseUserData.java BaseConstraintInfoDAO.java BasePreferenceGroup.java BaseRoomType.java BaseRoomTypeOptionDAO.java BaseOfferingConsentType.java BaseStudent.java BaseMeeting.java BaseCourseOfferingReservationDAO.java BaseLocationDAO.java BaseCourseOfferingReservation.java BaseRoomGroupDAO.java BaseVariableRangeCreditUnitConfig.java BaseTimePatternDaysDAO.java BaseSolverParameterGroupDAO.java BaseInstructionalOfferingDAO.java BaseCurriculumClassification.java BaseRoomGroupPref.java BaseSolverInfoDefDAO.java BaseSolverParameterDef.java BaseTimePatternTimeDAO.java BaseCourseDemand.java BaseStudentClassEnrollmentDAO.java BaseRoomDept.java BaseCourseCreditUnitTypeDAO.java BaseDistributionPrefDAO.java BaseRoomFeatureDAO.java BaseItypeDescDAO.java BaseStudentSectHistory.java BaseDepartmentRoomFeature.java BaseAcademicAreaHistory.java BaseClass_.java BaseLastLikeCourseDemand.java BaseDesignatorDAO.java BaseNonUniversityLocationDAO.java BaseCourseDemandDAO.java BaseDepartmentStatusTypeDAO.java BaseRoomDeptDAO.java BaseCharacteristicReservationDAO.java BaseSolverInfoDef.java BasePositionTypeDAO.java BaseExam.java BaseDemandOfferingTypeDAO.java BaseExamConflictDAO.java BaseCourseOfferingDAO.java BaseWaitListDAO.java BaseLocation.java BaseDistributionObjectDAO.java BaseCourseRequestOptionDAO.java BaseSpecialEventDAO.java BaseReservationDAO.java BaseStudentAccomodation.java BaseExternalRoomFeature.java BaseCurriculumDAO.java BaseSpecialEvent.java BaseCourseCreditType.java BaseRoles.java BaseSolutionInfo.java BaseClassInstructor.java BasePreference.java Added Files: BaseCurriculumCourseGroupDAO.java BaseStudentSectioningQueueDAO.java BaseCurriculumCourseGroup.java BaseQueryLog.java BaseCurriculumProjectionRule.java BaseCurriculumProjectionRuleDAO.java BaseStudentSectioningQueue.java BaseQueryLogDAO.java Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: BaseSession.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseSession.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** BaseSession.java 5 Aug 2008 20:03:44 -0000 1.5 --- BaseSession.java 1 Dec 2010 11:10:38 -0000 1.6 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,38 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.base; import java.io.Serializable; ! /** ! * This is an object that contains data related to the SESSIONS table. ! * Do not modify this class because it will be overwritten if the configuration file ! * related to this class is modified. ! * ! * @hibernate.class ! * table="SESSIONS" ! */ ! public abstract class BaseSession extends org.unitime.timetable.model.PreferenceGroup implements Serializable { - public static String REF = "Session"; public static String PROP_ACADEMIC_INITIATIVE = "academicInitiative"; public static String PROP_ACADEMIC_YEAR = "academicYear"; --- 15,60 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.base; import java.io.Serializable; + import java.util.Date; + import java.util.HashSet; + import java.util.Set; + import org.unitime.timetable.model.Building; + import org.unitime.timetable.model.DatePattern; + import org.unitime.timetable.model.Department; + import org.unitime.timetable.model.DepartmentStatusType; + import org.unitime.timetable.model.InstructionalOffering; + import org.unitime.timetable.model.Location; + import org.unitime.timetable.model.PreferenceGroup; + import org.unitime.timetable.model.Session; + import org.unitime.timetable.model.SubjectArea; ! public abstract class BaseSession extends PreferenceGroup implements Serializable { ! private static final long serialVersionUID = 1L; ! private String iAcademicInitiative; ! private String iAcademicYear; ! private String iAcademicTerm; ! private Date iSessionBeginDateTime; ! private Date iClassesEndDateTime; ! private Date iSessionEndDateTime; ! private Date iExamBeginDate; ! private Date iEventBeginDate; ! private Date iEventEndDate; ! private String iHolidays; ! ! private DepartmentStatusType iStatusType; ! private DatePattern iDefaultDatePattern; ! private Set<SubjectArea> iSubjectAreas; ! private Set<Building> iBuildings; ! private Set<Department> iDepartments; ! private Set<Location> iRooms; ! private Set<InstructionalOffering> iInstructionalOfferings; public static String PROP_ACADEMIC_INITIATIVE = "academicInitiative"; public static String PROP_ACADEMIC_YEAR = "academicYear"; *************** *** 46,427 **** public static String PROP_HOLIDAYS = "holidays"; ! ! // constructors ! public BaseSession () { initialize(); } ! /** ! * Constructor for primary key ! */ ! public BaseSession (java.lang.Long uniqueId) { ! super(uniqueId); ! } ! ! ! ! private int hashCode = Integer.MIN_VALUE; ! ! ! // fields ! private java.lang.String academicInitiative; ! private java.lang.String academicYear; ! private java.lang.String academicTerm; ! private java.util.Date sessionBeginDateTime; ! private java.util.Date classesEndDateTime; ! private java.util.Date sessionEndDateTime; ! private java.util.Date examBeginDate; ! private java.util.Date eventBeginDate; ! private java.util.Date eventEndDate; ! private java.lang.String holidays; ! ! // many to one ! private org.unitime.timetable.model.DepartmentStatusType statusType; ! private org.unitime.timetable.model.DatePattern defaultDatePattern; ! ! // collections ! private java.util.Set subjectAreas; ! private java.util.Set buildings; ! private java.util.Set departments; ! private java.util.Set rooms; ! private java.util.Set instructionalOfferings; ! ! ! ! ! ! ! /** ! * Return the value associated with the column: ACADEMIC_INITIATIVE ! */ ! public java.lang.String getAcademicInitiative () { ! return academicInitiative; ! } ! ! /** ! * Set the value related to the column: ACADEMIC_INITIATIVE ! * @param academicInitiative the ACADEMIC_INITIATIVE value ! */ ! public void setAcademicInitiative (java.lang.String academicInitiative) { ! this.academicInitiative = academicInitiative; ! } ! ! ! ! /** ! * Return the value associated with the column: ACADEMIC_YEAR ! */ ! public java.lang.String getAcademicYear () { ! return academicYear; ! } ! ! /** ! * Set the value related to the column: ACADEMIC_YEAR ! * @param academicYear the ACADEMIC_YEAR value ! */ ! public void setAcademicYear (java.lang.String academicYear) { ! this.academicYear = academicYear; ! } ! ! ! ! /** ! * Return the value associated with the column: ACADEMIC_TERM ! */ ! public java.lang.String getAcademicTerm () { ! return academicTerm; ! } ! ! /** ! * Set the value related to the column: ACADEMIC_TERM ! * @param academicTerm the ACADEMIC_TERM value ! */ ! public void setAcademicTerm (java.lang.String academicTerm) { ! this.academicTerm = academicTerm; ! } ! ! ! ! /** ! * Return the value associated with the column: SESSION_BEGIN_DATE_TIME ! */ ! public java.util.Date getSessionBeginDateTime () { ! return sessionBeginDateTime; ! } ! ! /** ! * Set the value related to the column: SESSION_BEGIN_DATE_TIME ! * @param sessionBeginDateTime the SESSION_BEGIN_DATE_TIME value ! */ ! public void setSessionBeginDateTime (java.util.Date sessionBeginDateTime) { ! this.sessionBeginDateTime = sessionBeginDateTime; ! } ! ! ! ! /** ! * Return the value associated with the column: CLASSES_END_DATE_TIME ! */ ! public java.util.Date getClassesEndDateTime () { ! return classesEndDateTime; ! } ! ! /** ! * Set the value related to the column: CLASSES_END_DATE_TIME ! * @param classesEndDateTime the CLASSES_END_DATE_TIME value ! */ ! public void setClassesEndDateTime (java.util.Date classesEndDateTime) { ! this.classesEndDateTime = classesEndDateTime; ! } ! ! ! ! /** ! * Return the value associated with the column: SESSION_END_DATE_TIME ! */ ! public java.util.Date getSessionEndDateTime () { ! return sessionEndDateTime; ! } ! ! /** ! * Set the value related to the column: SESSION_END_DATE_TIME ! * @param sessionEndDateTime the SESSION_END_DATE_TIME value ! */ ! public void setSessionEndDateTime (java.util.Date sessionEndDateTime) { ! this.sessionEndDateTime = sessionEndDateTime; ! } ! ! ! ! /** ! * Return the value associated with the column: EXAM_BEGIN_DATE ! */ ! public java.util.Date getExamBeginDate () { ! return examBeginDate; ! } ! ! /** ! * Set the value related to the column: EXAM_BEGIN_DATE ! * @param examBeginDate the EXAM_BEGIN_DATE value ! */ ! public void setExamBeginDate (java.util.Date examBeginDate) { ! this.examBeginDate = examBeginDate; ! } ! ! /** ! * Return the value associated with the column: EVENT_BEGIN_DATE ! */ ! public java.util.Date getEventBeginDate () { ! return eventBeginDate; ! } ! ! /** ! * Set the value related to the column: EVENT_BEGIN_DATE ! * @param eventBeginDate the EVENT_BEGIN_DATE value ! */ ! public void setEventBeginDate (java.util.Date eventBeginDate) { ! this.eventBeginDate = eventBeginDate; ! } ! ! /** ! * Return the value associated with the column: EVENT_END_DATE ! */ ! public java.util.Date getEventEndDate () { ! return eventEndDate; ! } ! ! /** ! * Set the value related to the column: EVENT_END_DATE ! * @param eventEndDate the EVENT_END_DATE value ! */ ! public void setEventEndDate (java.util.Date eventEndDate) { ! this.eventEndDate = eventEndDate; ! } ! ! ! /** ! * Return the value associated with the column: HOLIDAYS ! */ ! public java.lang.String getHolidays () { ! return holidays; ! } ! ! /** ! * Set the value related to the column: HOLIDAYS ! * @param holidays the HOLIDAYS value ! */ ! public void setHolidays (java.lang.String holidays) { ! this.holidays = holidays; ! } ! ! ! ! /** ! * Return the value associated with the column: STATUS_TYPE ! */ ! public org.unitime.timetable.model.DepartmentStatusType getStatusType () { ! return statusType; ! } ! ! /** ! * Set the value related to the column: STATUS_TYPE ! * @param statusType the STATUS_TYPE value ! */ ! public void setStatusType (org.unitime.timetable.model.DepartmentStatusType statusType) { ! this.statusType = statusType; ! } ! ! ! ! /** ! * Return the value associated with the column: DEF_DATEPATT_ID ! */ ! public org.unitime.timetable.model.DatePattern getDefaultDatePattern () { ! return defaultDatePattern; ! } ! ! /** ! * Set the value related to the column: DEF_DATEPATT_ID ! * @param defaultDatePattern the DEF_DATEPATT_ID value ! */ ! public void setDefaultDatePattern (org.unitime.timetable.model.DatePattern defaultDatePattern) { ! this.defaultDatePattern = defaultDatePattern; ! } ! ! ! ! /** ! * Return the value associated with the column: subjectAreas ! */ ! public java.util.Set getSubjectAreas () { ! return subjectAreas; } ! /** ! * Set the value related to the column: subjectAreas ! * @param subjectAreas the subjectAreas value ! */ ! public void setSubjectAreas (java.util.Set subjectAreas) { ! this.subjectAreas = subjectAreas; ! } ! public void addTosubjectAreas (org.unitime.timetable.model.SubjectArea subjectArea) { ! if (null == getSubjectAreas()) setSubjectAreas(new java.util.HashSet()); ! getSubjectAreas().add(subjectArea); ! } ! /** ! * Return the value associated with the column: buildings ! */ ! public java.util.Set getBuildings () { ! return buildings; ! } ! /** ! * Set the value related to the column: buildings ! * @param buildings the buildings value ! */ ! public void setBuildings (java.util.Set buildings) { ! this.buildings = buildings; ! } ! /** ! * Return the value associated with the column: departments ! */ ! public java.util.Set getDepartments () { ! return departments; ! } ! /** ! * Set the value related to the column: departments ! * @param departments the departments value ! */ ! public void setDepartments (java.util.Set departments) { ! this.departments = departments; ! } ! public void addTodepartments (org.unitime.timetable.model.Department department) { ! if (null == getDepartments()) setDepartments(new java.util.HashSet()); ! getDepartments().add(department); ! } ! /** ! * Return the value associated with the column: rooms ! */ ! public java.util.Set getRooms () { ! return rooms; } ! /** ! * Set the value related to the column: rooms ! * @param rooms the rooms value ! */ ! public void setRooms (java.util.Set rooms) { ! this.rooms = rooms; } ! public void addTorooms (org.unitime.timetable.model.Location location) { ! if (null == getRooms()) setRooms(new java.util.HashSet()); ! getRooms().add(location); } ! ! ! /** ! * Return the value associated with the column: instructionalOfferings ! */ ! public java.util.Set getInstructionalOfferings () { ! return instructionalOfferings; } ! /** ! * Set the value related to the column: instructionalOfferings ! * @param instructionalOfferings the instructionalOfferings value ! */ ! public void setInstructionalOfferings (java.util.Set instructionalOfferings) { ! this.instructionalOfferings = instructionalOfferings; } ! public void addToinstructionalOfferings (org.unitime.timetable.model.InstructionalOffering instructionalOffering) { ! if (null == getInstructionalOfferings()) setInstructionalOfferings(new java.util.HashSet()); ! getInstructionalOfferings().add(instructionalOffering); } ! ! ! ! ! public boolean equals (Object obj) { ! if (null == obj) return false; ! if (!(obj instanceof org.unitime.timetable.model.Session)) return false; ! else { ! org.unitime.timetable.model.Session session = (org.unitime.timetable.model.Session) obj; ! if (null == this.getUniqueId() || null == session.getUniqueId()) return false; ! else return (this.getUniqueId().equals(session.getUniqueId())); ! } } ! public int hashCode () { ! if (Integer.MIN_VALUE == this.hashCode) { ! if (null == this.getUniqueId()) return super.hashCode(); ! else { ! String hashStr = this.getClass().getName() + ":" + this.getUniqueId().hashCode(); ! this.hashCode = hashStr.hashCode(); ! } ! } ! return this.hashCode; } ! ! public String toString () { ! return super.toString(); } - - } --- 68,184 ---- public static String PROP_HOLIDAYS = "holidays"; ! public BaseSession() { initialize(); } ! public BaseSession(Long uniqueId) { ! setUniqueId(uniqueId); ! initialize(); } ! protected void initialize() {} ! public String getAcademicInitiative() { return iAcademicInitiative; } ! public void setAcademicInitiative(String academicInitiative) { iAcademicInitiative = academicInitiative; } + public String getAcademicYear() { return iAcademicYear; } + public void setAcademicYear(String academicYear) { iAcademicYear = academicYear; } + public String getAcademicTerm() { return iAcademicTerm; } + public void setAcademicTerm(String academicTerm) { iAcademicTerm = academicTerm; } ! public Date getSessionBeginDateTime() { return iSessionBeginDateTime; } ! public void setSessionBeginDateTime(Date sessionBeginDateTime) { iSessionBeginDateTime = sessionBeginDateTime; } ! public Date getClassesEndDateTime() { return iClassesEndDateTime; } ! public void setClassesEndDateTime(Date classesEndDateTime) { iClassesEndDateTime = classesEndDateTime; } + public Date getSessionEndDateTime() { return iSessionEndDateTime; } + public void setSessionEndDateTime(Date sessionEndDateTime) { iSessionEndDateTime = sessionEndDateTime; } + public Date getExamBeginDate() { return iExamBeginDate; } + public void setExamBeginDate(Date examBeginDate) { iExamBeginDate = examBeginDate; } ! public Date getEventBeginDate() { return iEventBeginDate; } ! public void setEventBeginDate(Date eventBeginDate) { iEventBeginDate = eventBeginDate; } ! public Date getEventEndDate() { return iEventEndDate; } ! public void setEventEndDate(Date eventEndDate) { iEventEndDate = eventEndDate; } ! public String getHolidays() { return iHolidays; } ! public void setHolidays(String holidays) { iHolidays = holidays; } + public DepartmentStatusType getStatusType() { return iStatusType; } + public void setStatusType(DepartmentStatusType statusType) { iStatusType = statusType; } + public DatePattern getDefaultDatePattern() { return iDefaultDatePattern; } + public void setDefaultDatePattern(DatePattern defaultDatePattern) { iDefaultDatePattern = defaultDatePattern; } ! public Set<SubjectArea> getSubjectAreas() { return iSubjectAreas; } ! public void setSubjectAreas(Set<SubjectArea> subjectAreas) { iSubjectAreas = subjectAreas; } ! public void addTosubjectAreas(SubjectArea subjectArea) { ! if (iSubjectAreas == null) iSubjectAreas = new HashSet<SubjectArea>(); ! iSubjectAreas.add(subjectArea); } ! public Set<Building> getBuildings() { return iBuildings; } ! public void setBuildings(Set<Building> buildings) { iBuildings = buildings; } ! public void addTobuildings(Building building) { ! if (iBuildings == null) iBuildings = new HashSet<Building>(); ! iBuildings.add(building); } ! public Set<Department> getDepartments() { return iDepartments; } ! public void setDepartments(Set<Department> departments) { iDepartments = departments; } ! public void addTodepartments(Department department) { ! if (iDepartments == null) iDepartments = new HashSet<Department>(); ! iDepartments.add(department); } ! public Set<Location> getRooms() { return iRooms; } ! public void setRooms(Set<Location> rooms) { iRooms = rooms; } ! public void addTorooms(Location location) { ! if (iRooms == null) iRooms = new HashSet<Location>(); ! iRooms.add(location); } ! public Set<InstructionalOffering> getInstructionalOfferings() { return iInstructionalOfferings; } ! public void setInstructionalOfferings(Set<InstructionalOffering> instructionalOfferings) { iInstructionalOfferings = instructionalOfferings; } ! public void addToinstructionalOfferings(InstructionalOffering instructionalOffering) { ! if (iInstructionalOfferings == null) iInstructionalOfferings = new HashSet<InstructionalOffering>(); ! iInstructionalOfferings.add(instructionalOffering); } ! public boolean equals(Object o) { ! if (o == null || !(o instanceof Session)) return false; ! if (getUniqueId() == null || ((Session)o).getUniqueId() == null) return false; ! return getUniqueId().equals(((Session)o).getUniqueId()); } ! public int hashCode() { ! if (getUniqueId() == null) return super.hashCode(); ! return getUniqueId().hashCode(); } ! public String toString() { ! return "Session["+getUniqueId()+"]"; } ! public String toDebugString() { ! return "Session[" + ! "\n AcademicInitiative: " + getAcademicInitiative() + ! "\n AcademicTerm: " + getAcademicTerm() + ! "\n AcademicYear: " + getAcademicYear() + ! "\n ClassesEndDateTime: " + getClassesEndDateTime() + ! "\n DefaultDatePattern: " + getDefaultDatePattern() + ! "\n EventBeginDate: " + getEventBeginDate() + ! "\n EventEndDate: " + getEventEndDate() + ! "\n ExamBeginDate: " + getExamBeginDate() + ! "\n Holidays: " + getHolidays() + ! "\n SessionBeginDateTime: " + getSessionBeginDateTime() + ! "\n SessionEndDateTime: " + getSessionEndDateTime() + ! "\n StatusType: " + getStatusType() + ! "\n UniqueId: " + getUniqueId() + ! "]"; } } Index: BaseReservation.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseReservation.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BaseReservation.java 17 Jun 2008 21:24:37 -0000 1.2 --- BaseReservation.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.base; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.base; *************** *** 22,211 **** import java.io.Serializable; ! /** ! * This is an object that contains data related to the table. ! * Do not modify this class because it will be overwritten if the configuration file ! * related to this class is modified. ! * ! * @hibernate.class ! * table="" ! */ ! public abstract class BaseReservation implements Serializable { ! public static String REF = "Reservation"; public static String PROP_OWNER_CLASS_ID = "ownerClassId"; public static String PROP_OWNER = "owner"; public static String PROP_PRIORITY = "priority"; ! ! // constructors ! public BaseReservation () { ! initialize(); ! } ! ! /** ! * Constructor for primary key ! */ ! public BaseReservation (java.lang.Long uniqueId) { ! this.setUniqueId(uniqueId); initialize(); } ! /** ! * Constructor for required fields ! */ ! public BaseReservation ( ! java.lang.Long uniqueId, ! org.unitime.timetable.model.ReservationType reservationType, ! java.lang.String ownerClassId, ! java.lang.Long owner, ! java.lang.Integer priority) { ! ! this.setUniqueId(uniqueId); ! this.setReservationType(reservationType); ! this.setOwnerClassId(ownerClassId); ! this.setOwner(owner); ! this.setPriority(priority); initialize(); } ! protected void initialize () {} ! ! ! ! private int hashCode = Integer.MIN_VALUE; ! ! // primary key ! private java.lang.Long uniqueId; ! ! // fields ! private java.lang.String ownerClassId; ! private java.lang.Long owner; ! private java.lang.Integer priority; ! ! // many to one ! private org.unitime.timetable.model.ReservationType reservationType; ! ! ! ! /** ! * Return the unique identifier of this class ! * @hibernate.id ! * generator-class="sequence" ! * column="UNIQUEID" ! */ ! public java.lang.Long getUniqueId () { ! return uniqueId; ! } ! ! /** ! * Set the unique identifier of this class ! * @param uniqueId the new ID ! */ ! public void setUniqueId (java.lang.Long uniqueId) { ! this.uniqueId = uniqueId; ! this.hashCode = Integer.MIN_VALUE; ! } ! ! ! ! ! /** ! * Return the value associated with the column: OWNER_CLASS_ID ! */ ! public java.lang.String getOwnerClassId () { ! return ownerClassId; ! } ! ! /** ! * Set the value related to the column: OWNER_CLASS_ID ! * @param ownerClassId the OWNER_CLASS_ID value ! */ ! public void setOwnerClassId (java.lang.String ownerClassId) { ! this.ownerClassId = ownerClassId; ! } ! ! ! ! /** ! * Return the value associated with the column: OWNER ! */ ! public java.lang.Long getOwner () { ! return owner; ! } ! ! /** ! * Set the value related to the column: OWNER ! * @param owner the OWNER value ! */ ! public void setOwner (java.lang.Long owner) { ! this.owner = owner; ! } ! ! ! /** ! * Return the value associated with the column: PRIORITY ! */ ! public java.lang.Integer getPriority () { ! return priority; ! } ! /** ! * Set the value related to the column: PRIORITY ! * @param priority the PRIORITY value ! */ ! public void setPriority (java.lang.Integer priority) { ! this.priority = priority; ! } ! /** ! * Return the value associated with the column: RESERVATION_TYPE ! */ ! public org.unitime.timetable.model.ReservationType getReservationType () { ! return reservationType; ! } ! /** ! * Set the value related to the column: RESERVATION_TYPE ! * @param reservationType the RESERVATION_TYPE value ! */ ! public void setReservationType (org.unitime.timetable.model.ReservationType reservationType) { ! this.reservationType = reservationType; } ! ! ! ! ! public boolean equals (Object obj) { ! if (null == obj) return false; ! if (!(obj instanceof org.unitime.timetable.model.Reservation)) return false; ! else { ! org.unitime.timetable.model.Reservation reservation = (org.unitime.timetable.model.Reservation) obj; ! if (null == this.getUniqueId() || null == reservation.getUniqueId()) return false; ! else return (this.getUniqueId().equals(reservation.getUniqueId())); ! } } ! public int hashCode () { ! if (Integer.MIN_VALUE == this.hashCode) { ! if (null == this.getUniqueId()) return super.hashCode(); ! else { ! String hashStr = this.getClass().getName() + ":" + this.getUniqueId().hashCode(); ! this.hashCode = hashStr.hashCode(); ! } ! } ! return this.hashCode; } ! ! public String toString () { ! return super.toString(); } - - } --- 22,92 ---- import java.io.Serializable; + import org.unitime.timetable.model.Reservation; + import org.unitime.timetable.model.ReservationType; ! public abstract class BaseReservation implements Serializable { ! private static final long serialVersionUID = 1L; ! private Long iUniqueId; ! private String iOwnerClassId; ! private Long iOwner; ! private Integer iPriority; ! private ReservationType iReservationType; ! ! public static String PROP_UNIQUEID = "uniqueId"; public static String PROP_OWNER_CLASS_ID = "ownerClassId"; public static String PROP_OWNER = "owner"; public static String PROP_PRIORITY = "priority"; ! public BaseReservation() { initialize(); } ! public BaseReservation(Long uniqueId) { ! setUniqueId(uniqueId); initialize(); } ! protected void initialize() {} ! public Long getUniqueId() { return iUniqueId; } ! public void setUniqueId(Long uniqueId) { iUniqueId = uniqueId; } ! public String getOwnerClassId() { return iOwnerClassId; } ! public void setOwnerClassId(String ownerClassId) { iOwnerClassId = ownerClassId; } + public Long getOwner() { return iOwner; } + public void setOwner(Long owner) { iOwner = owner; } + public Integer getPriority() { return iPriority; } + public void setPriority(Integer priority) { iPriority = priority; } ! public ReservationType getReservationType() { return iReservationType; } ! public void setReservationType(ReservationType reservationType) { iReservationType = reservationType; } ! public boolean equals(Object o) { ! if (o == null || !(o instanceof Reservation)) return false; ! if (getUniqueId() == null || ((Reservation)o).getUniqueId() == null) return false; ! return getUniqueId().equals(((Reservation)o).getUniqueId()); } ! public int hashCode() { ! if (getUniqueId() == null) return super.hashCode(); ! return getUniqueId().hashCode(); } ! public String toString() { ! return "Reservation["+getUniqueId()+"]"; } ! public String toDebugString() { ! return "Reservation[" + ! "\n Owner: " + getOwner() + ! "\n OwnerClassId: " + getOwnerClassId() + ! "\n Priority: " + getPriority() + ! "\n ReservationType: " + getReservationType() + ! "\n UniqueId: " + getUniqueId() + ! "]"; } } Index: BasePositionTypeDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BasePositionTypeDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BasePositionTypeDAO.java 17 Jun 2008 21:24:38 -0000 1.2 --- BasePositionTypeDAO.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,220 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.base; ! import org.hibernate.Hibernate; ! import org.hibernate.Session; ! import org.hibernate.criterion.Order; import org.unitime.timetable.model.dao.PositionTypeDAO; ! /** ! * This is an automatically generated DAO class which should not be edited. ! */ ! public abstract class BasePositionTypeDAO extends org.unitime.timetable.model.dao._RootDAO { ! ! // query name references ! ! ! public static PositionTypeDAO instance; ! ! /** ! * Return a singleton of the DAO ! */ ! public static PositionTypeDAO getInstance () { ! if (null == instance) instance = new PositionTypeDAO(); ! return instance; ! } ! ! public Class getReferenceClass () { ! return org.unitime.timetable.model.PositionType.class; ! } ! ! public Order getDefaultOrder () { ! return null; ! } ! ! /** ! * Cast the object as a org.unitime.timetable.model.PositionType ! */ ! public org.unitime.timetable.model.PositionType cast (Object object) { ! return (org.unitime.timetable.model.PositionType) object; ! } ! ! public org.unitime.timetable.model.PositionType get(Long key) ! { ! return (org.unitime.timetable.model.PositionType) get(getReferenceClass(), key); ! } ! ! public org.unitime.timetable.model.PositionType get(Long key, Session s) ! { ! return (org.unitime.timetable.model.PositionType) get(getReferenceClass(), key, s); ! } ! ! public org.unitime.timetable.model.PositionType load(Long key) ! { ! return (org.unitime.timetable.model.PositionType) load(getReferenceClass(), key); ! } ! ! public org.unitime.timetable.model.PositionType load(Long key, Session s) ! { ! return (org.unitime.timetable.model.PositionType) load(getReferenceClass(), key, s); ! } ! ! public org.unitime.timetable.model.PositionType loadInitialize(Long key, Session s) ! { ! org.unitime.timetable.model.PositionType obj = load(key, s); ! if (!Hibernate.isInitialized(obj)) { ! Hibernate.initialize(obj); ! } ! return obj; ! } ! ! ! /** ! * Persist the given transient instance, first assigning a generated identifier. (Or using the current value ! * of the identifier property if the assigned generator is used.) ! * @param positionType a transient instance of a persistent class ! * @return the class identifier ! */ ! public Long save(org.unitime.timetable.model.PositionType positionType) ! { ! return (Long) super.save(positionType); ! } ! ! /** ! * Persist the given transient instance, first assigning a generated identifier. (Or using the current value ! * of the identifier property if the assigned generator is used.) ! * Use the Session given. ! * @param positionType a transient instance of a persistent class ! * @param s the Session ! * @return the class identifier ! */ ! public Long save(org.unitime.timetable.model.PositionType positionType, Session s) ! { ! return (Long) save((Object) positionType, s); ! } ! ! /** ! * Either save() or update() the given instance, depending upon the value of its identifier property. By default ! * the instance is always saved. This behaviour may be adjusted by specifying an unsaved-value attribute of the ! * identifier property mapping. ! * @param positionType a transient instance containing new or updated state ! */ ! public void saveOrUpdate(org.unitime.timetable.model.PositionType positionType) ! { ! saveOrUpdate((Object) positionType); ! } ! ! /** ! * Either save() or update() the given instance, depending upon the value of its identifier property. By default the ! * instance is always saved. This behaviour may be adjusted by specifying an unsaved-value attribute of the identifier ! * property mapping. ! * Use the Session given. ! * @param positionType a transient instance containing new or updated state. ! * @param s the Session. ! */ ! public void saveOrUpdate(org.unitime.timetable.model.PositionType positionType, Session s) ! { ! saveOrUpdate((Object) positionType, s); ! } ! ! /** ! * Update the persistent state associated with the given identifier. An exception is thrown if there is a persistent ! * instance with the same identifier in the current session. ! * @param positionType a transient instance containing updated state ! */ ! public void update(org.unitime.timetable.model.PositionType positionType) ! { ! update((Object) positionType); ! } ! ! /** ! * Update the persistent state associated with the given identifier. An exception is thrown if there is a persistent ! * instance with the same identifier in the current session. ! * Use the Session given. ! * @param positionType a transient instance containing updated state ! * @param the Session ! */ ! public void update(org.unitime.timetable.model.PositionType positionType, Session s) ! { ! update((Object) positionType, s); ! } ! ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * @param id the instance ID to be removed ! */ ! public void delete(Long id) ! { ! delete((Object) load(id)); ! } ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * Use the Session given. ! * @param id the instance ID to be removed ! * @param s the Session ! */ ! public void delete(Long id, Session s) ! { ! delete((Object) load(id, s), s); ! } ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * @param positionType the instance to be removed ! */ ! public void delete(org.unitime.timetable.model.PositionType positionType) ! { ! delete((Object) positionType); } ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * Use the Session given. ! * @param positionType the instance to be removed ! * @param s the Session ! */ ! public void delete(org.unitime.timetable.model.PositionType positionType, Session s) ! { ! delete((Object) positionType, s); ! } ! ! /** ! * Re-read the state of the given instance from the underlying database. It is inadvisable to use this to implement ! * long-running sessions that span many business tasks. This method is, however, useful in certain special circumstances. ! * For example ! * <ul> ! * <li>where a database trigger alters the object state upon insert or update</li> ! * <li>after executing direct SQL (eg. a mass update) in the same session</li> ! * <li>after inserting a Blob or Clob</li> ! * </ul> ! */ ! public void refresh (org.unitime.timetable.model.PositionType positionType, Session s) ! { ! refresh((Object) positionType, s); } - - } --- 15,38 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.base; ! import org.unitime.timetable.model.PositionType; ! import org.unitime.timetable.model.dao._RootDAO; import org.unitime.timetable.model.dao.PositionTypeDAO; ! public abstract class BasePositionTypeDAO extends _RootDAO<PositionType,Long> { ! private static PositionTypeDAO sInstance; ! public static PositionTypeDAO getInstance() { ! if (sInstance == null) sInstance = new PositionTypeDAO(); ! return sInstance; } ! public Class<PositionType> getReferenceClass() { ! return PositionType.class; } } Index: BaseSolverInfoDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseSolverInfoDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BaseSolverInfoDAO.java 17 Jun 2008 21:24:37 -0000 1.2 --- BaseSolverInfoDAO.java 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,220 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.model.base; ! import org.hibernate.Hibernate; ! import org.hibernate.Session; ! import org.hibernate.criterion.Order; ! import org.unitime.timetable.model.dao.SolverInfoDAO; ! ! /** ! * This is an automatically generated DAO class which should not be edited. ! */ ! public abstract class BaseSolverInfoDAO extends org.unitime.timetable.model.dao._RootDAO { ! ! // query name references ! ! ! public static SolverInfoDAO instance; ! ! /** ! * Return a singleton of the DAO ! */ ! public static SolverInfoDAO getInstance () { ! if (null == instance) instance = new SolverInfoDAO(); ! return instance; ! } ! ! public Class getReferenceClass () { ! return org.unitime.timetable.model.SolverInfo.class; ! } ! ! public Order getDefaultOrder () { ! return null; ! } ! ! /** ! * Cast the object as a org.unitime.timetable.model.SolverInfo ! */ ! public org.unitime.timetable.model.SolverInfo cast (Object object) { ! return (org.unitime.timetable.model.SolverInfo) object; ! } ! ! public org.unitime.timetable.model.SolverInfo get(java.lang.Long key) ! { ! return (org.unitime.timetable.model.SolverInfo) get(getReferenceClass(), key); ! } ! ! public org.unitime.timetable.model.SolverInfo get(java.lang.Long key, Session s) ! { ! return (org.unitime.timetable.model.SolverInfo) get(getReferenceClass(), key, s); ! } ! ! public org.unitime.timetable.model.SolverInfo load(java.lang.Long key) ! { ! return (org.unitime.timetable.model.SolverInfo) load(getReferenceClass(), key); ! } ! ! public org.unitime.timetable.model.SolverInfo load(java.lang.Long key, Session s) ! { ! return (org.unitime.timetable.model.SolverInfo) load(getReferenceClass(), key, s); ! } ! ! public org.unitime.timetable.model.SolverInfo loadInitialize(java.lang.Long key, Session s) ! { ! org.unitime.timetable.model.SolverInfo obj = load(key, s); ! if (!Hibernate.isInitialized(obj)) { ! Hibernate.initialize(obj); ! } ! return obj; ! } ! ! ! /** ! * Persist the given transient instance, first assigning a generated identifier. (Or using the current value ! * of the identifier property if the assigned generator is used.) ! * @param solverInfo a transient instance of a persistent class ! * @return the class identifier ! */ ! public java.lang.Long save(org.unitime.timetable.model.SolverInfo solverInfo) ! { ! return (java.lang.Long) super.save(solverInfo); ! } ! ! /** ! * Persist the given transient instance, first assigning a generated identifier. (Or using the current value ! * of the identifier property if the assigned generator is used.) ! * Use the Session given. ! * @param solverInfo a transient instance of a persistent class ! * @param s the Session ! * @return the class identifier ! */ ! public java.lang.Long save(org.unitime.timetable.model.SolverInfo solverInfo, Session s) ! { ! return (java.lang.Long) save((Object) solverInfo, s); ! } ! ! /** ! * Either save() or update() the given instance, depending upon the value of its identifier property. By default ! * the instance is always saved. This behaviour may be adjusted by specifying an unsaved-value attribute of the ! * identifier property mapping. ! * @param solverInfo a transient instance containing new or updated state ! */ ! public void saveOrUpdate(org.unitime.timetable.model.SolverInfo solverInfo) ! { ! saveOrUpdate((Object) solverInfo); ! } ! ! /** ! * Either save() or update() the given instance, depending upon the value of its identifier property. By default the ! * instance is always saved. This behaviour may be adjusted by specifying an unsaved-value attribute of the identifier ! * property mapping. ! * Use the Session given. ! * @param solverInfo a transient instance containing new or updated state. ! * @param s the Session. ! */ ! public void saveOrUpdate(org.unitime.timetable.model.SolverInfo solverInfo, Session s) ! { ! saveOrUpdate((Object) solverInfo, s); ! } ! /** ! * Update the persistent state associated with the given identifier. An exception is thrown if there is a persistent ! * instance with the same identifier in the current session. ! * @param solverInfo a transient instance containing updated state ! */ ! public void update(org.unitime.timetable.model.SolverInfo solverInfo) ! { ! update((Object) solverInfo); ! } ! /** ! * Update the persistent state associated with the given identifier. An exception is thrown if there is a persistent ! * instance with the same identifier in the current session. ! * Use the Session given. ! * @param solverInfo a transient instance containing updated state ! * @param the Session ! */ ! public void update(org.unitime.timetable.model.SolverInfo solverInfo, Session s) ! { ! update((Object) solverInfo, s); ! } ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * @param id the instance ID to be removed ! */ ! public void delete(java.lang.Long id) ! { ! delete((Object) load(id)); ! } ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * Use the Session given. ! * @param id the instance ID to be removed ! * @param s the Session ! */ ! public void delete(java.lang.Long id, Session s) ! { ! delete((Object) load(id, s), s); } ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * @param solverInfo the instance to be removed ! */ ! public void delete(org.unitime.timetable.model.SolverInfo solverInfo) ! { ! delete((Object) solverInfo); } ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * Use the Session given. ! * @param solverInfo the instance to be removed ! * @param s the Session ! */ ! public void delete(org.unitime.timetable.model.SolverInfo solverInfo, Session s) ! { ! delete((Object) solverInfo, s); ! } ! ! /** ! * Re-read the state of the given instance from the underlying database. It is inadvisable to use this to implement ! * long-running sessions that span many business tasks. This method is, however, useful in certain special circumstances. ! * For example ! * <ul> ! * <li>where a database trigger alters the object state upon insert or update</li> ! * <li>after executing direct SQL (eg. a mass update) in the same session</li> ! * <li>after inserting a Blob or Clob</li> ! * </ul> ! */ ! public void refresh (org.unitime.timetable.model.SolverInfo solverInfo, Session s) ! { ! refresh((Object) solverInfo, s); } - - } --- 15,45 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.model.base; ! import java.util.List; ! import org.unitime.timetable.model.SolverInfo; ! import org.unitime.timetable.model.dao._RootDAO; ! import org.unitime.timetable.model.dao.SolverInfoDAO; ! public abstract class BaseSolverInfoDAO extends _RootDAO<SolverInfo,Long> { ! private static SolverInfoDAO sInstance; ! public static SolverInfoDAO getInstance() { ! if (sInstance == null) sInstance = new SolverInfoDAO(); ! return sInstance; } ! public Class<SolverInfo> getReferenceClass() { ! return SolverInfo.class; } ! @SuppressWarnings("unchecked") ! public List<SolverInfo> findByDefinition(org.hibernate.Session hibSession, Long definitionId) { ! return hibSession.createQuery("from SolverInfo x where x.definition.uniqueId = :definitionId").setLong("definitionId", definitionId).list(); } } Index: BaseRelatedCourseInfo.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseRelatedCourseInfo.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BaseRelatedCourseInfo.java 17 Jun 2008 21:24:37 -0000 1.3 --- BaseRelatedCourseInfo.java 1 Dec 2010 11:10:38 -0000 1.4 *************** *** 1,9 **** ! /* ! * UniTime 3.1 (University Course Timetabling & Student Sectioning Application) ! * Copyright (C) 2008, UniTime LLC ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- ! /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2010, UniTime LLC, and individual contributors ! * as indicated by the @authors tag. ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,210 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ! */ ! package org.unitime.timetable.model.base; import java.io.Serializable; ! /** ! * This is an object that contains data related to the RELATED_COURSE_INFO table. ! * Do not modify this class because it will be overwritten if the configuration file ! * related to this class is modified. ! * ! * @hibernate.class ! * table="RELATED_COURSE_INFO" ! */ ! public abstract class BaseRelatedCourseInfo implements Serializable { ! public static String REF = "RelatedCourseInfo"; public static String PROP_OWNER_ID = "ownerId"; public static String PROP_OWNER_TYPE = "ownerType"; ! ! // constructors ! public BaseRelatedCourseInfo () { ! initialize(); ! } ! ! /** ! * Constructor for primary key ! */ ! public BaseRelatedCourseInfo (java.lang.Long uniqueId) { ! this.setUniqueId(uniqueId); initialize(); } ! /** ! * Constructor for required fields ! */ ! public BaseRelatedCourseInfo ( ! java.lang.Long uniqueId, ! org.unitime.timetable.model.CourseEvent event, ! org.unitime.timetable.model.CourseOffering course, ! java.lang.Long ownerId, ! java.lang.Integer ownerType) { ! ! this.setUniqueId(uniqueId); ! this.setEvent(event); ! this.setCourse(course); ! this.setOwnerId(ownerId); ! this.setOwnerType(ownerType); initialize(); } ! protected void initialize () {} ! ! ! ! private int hashCode = Integer.MIN_VALUE; ! ! // primary key ! private java.lang.Long uniqueId; ! ! // fields ! private java.lang.Long ownerId; ! private java.lang.Integer ownerType; ! ! // many to one ! private org.unitime.timetable.model.CourseEvent event; ! private org.unitime.timetable.model.CourseOffering course; ! ! ! ! /** ! * Return the unique identifier of this class ! * @hibernate.id ! * generator-class="org.unitime.commons.hibernate.id.UniqueIdGenerator" ! * column="UNIQUEID" ! */ ! public java.lang.Long getUniqueId () { ! return uniqueId; ! } ! ! /** ! * Set the unique identifier of this class ! * @param uniqueId the new ID ! */ ! public void setUniqueId (java.lang.Long uniqueId) { ! this.uniqueId = uniqueId; ! this.hashCode = Integer.MIN_VALUE; ! } ! ! ! ! ! /** ! * Return the value associated with the column: OWNER_ID ! */ ! public java.lang.Long getOwnerId () { ! return ownerId; ! } ! ! /** ! * Set the value related to the column: OWNER_ID ! * @param ownerId the OWNER_ID value ! */ ! public void setOwnerId (java.lang.Long ownerId) { ! this.ownerId = ownerId; ! } ! ! ! ! /** ! * Return the value associated with the column: OWNER_TYPE ! */ ! public java.lang.Integer getOwnerType () { ! return ownerType; ! } ! ! /** ! * Set the value related to the column: OWNER_TYPE ! * @param ownerType the OWNER_TYPE value ! */ ! public void setOwnerType (java.lang.Integer ownerType) { ! this.ownerType = ownerType; ! } ! ! ! /** ! * Return the value associated with the column: EVENT_ID ! */ ! public org.unitime.timetable.model.CourseEvent getEvent () { ! return event; ! } ! /** ! * Set the value related to the column: EVENT_ID ! * @param event the EVENT_ID value ! */ ! public void setEvent (org.unitime.timetable.model.CourseEvent event) { ! this.event = event; ! } ! /** ! * Return the value associated with the column: COURSE_ID ! */ ! public org.unitime.timetable.model.CourseOffering getCourse () { ! return course; ! } ! /** ! * Set the value related to the column: COURSE_ID ! * @param course the COURSE_ID value ! */ ! public void setCourse (org.unitime.timetable.model.CourseOffering course) { ! this.course = course; } ! ! ! ! ! public boolean equals (Object obj) { ! if (null == obj) return false; ! if (!(obj instan... [truncated message content] |
|
From: Tomas M. <to...@us...> - 2010-12-01 11:11:19
|
Update of /cvsroot/unitime/UniTime/WebContent/exam In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/WebContent/exam Modified Files: examGrid.jsp examSolver.jsp info.jsp exams.jsp cbs.jsp unassigned.jsp pdfReport.jsp examLog.jsp assigned.jsp roomAvailability.jsp changes.jsp assignmentReport.jsp personalizedReport.jsp Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: assignmentReport.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/exam/assignmentReport.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** assignmentReport.jsp 18 Sep 2008 02:18:48 -0000 1.4 --- assignmentReport.jsp 1 Dec 2010 11:10:40 -0000 1.5 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 28,32 **** <html:form action="/examAssignmentReport"> <script language="JavaScript">blToggleHeader('Filter','dispFilter');blStart('dispFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD width="10%" nowrap>Show classes/courses:</TD> --- 28,32 ---- <html:form action="/examAssignmentReport"> <script language="JavaScript">blToggleHeader('Filter','dispFilter');blStart('dispFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD width="10%" nowrap>Show classes/courses:</TD> *************** *** 38,42 **** <script language="JavaScript">blEnd('dispFilter');blStartCollapsed('dispFilter');</script> <script language="JavaScript">blEndCollapsed('dispFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD width="10%" nowrap>Examination Problem:</TD> --- 38,42 ---- <script language="JavaScript">blEnd('dispFilter');blStartCollapsed('dispFilter');</script> <script language="JavaScript">blEndCollapsed('dispFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD width="10%" nowrap>Examination Problem:</TD> *************** *** 92,96 **** <BR><BR> <logic:empty name="examAssignmentReportForm" property="table"> ! <table width='95%' border='0' cellspacing='0' cellpadding='3'> <tr><td><i> No exams matching the above criteria found. --- 92,96 ---- <BR><BR> <logic:empty name="examAssignmentReportForm" property="table"> ! <table width='100%' border='0' cellspacing='0' cellpadding='3'> <tr><td><i> No exams matching the above criteria found. *************** *** 99,103 **** </logic:empty> <logic:notEmpty name="examAssignmentReportForm" property="table"> ! <table width='95%' border='0' cellspacing='0' cellpadding='3'> <bean:define id="colspan" name="examAssignmentReportForm" property="nrColumns"/> <bean:write name="examAssignmentReportForm" property="table" filter="false"/> --- 99,103 ---- </logic:empty> <logic:notEmpty name="examAssignmentReportForm" property="table"> ! <table width='100%' border='0' cellspacing='0' cellpadding='3'> <bean:define id="colspan" name="examAssignmentReportForm" property="nrColumns"/> <bean:write name="examAssignmentReportForm" property="table" filter="false"/> Index: personalizedReport.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/exam/personalizedReport.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** personalizedReport.jsp 7 Feb 2010 09:20:43 -0000 1.9 --- personalizedReport.jsp 1 Dec 2010 11:10:40 -0000 1.10 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 25,29 **** <tiles:importAttribute /> <html:form action="/personalSchedule"> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR><TD align='right'> <logic:equal name="personalizedExamReportForm" property="admin" value="true"> --- 25,30 ---- <tiles:importAttribute /> <html:form action="/personalSchedule"> ! <html:hidden property="sessionId" /> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR><TD align='right'> <logic:equal name="personalizedExamReportForm" property="admin" value="true"> *************** *** 32,36 **** <html:hidden property="mname" styleId="mname"/> <html:hidden property="lname" styleId="lname"/> ! <input type='button' value='Lookup' onclick="window.open('user/peopleLookup.jsp?query='+fname.value+' '+lname.value+'&submit=true','peopleLookup','width=800,height=600,resizable=no,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus();" style="btn"> </logic:equal> <logic:equal name="personalizedExamReportForm" property="canExport" value="true"> --- 33,37 ---- <html:hidden property="mname" styleId="mname"/> <html:hidden property="lname" styleId="lname"/> ! <input type='button' value='Lookup' onclick="lookup();" style="btn"> </logic:equal> <logic:equal name="personalizedExamReportForm" property="canExport" value="true"> *************** *** 51,55 **** <logic:notEmpty scope="request" name="sessions"> <BR> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <bean:write scope="request" name="sessions" filter="false"/> </TABLE> --- 52,56 ---- <logic:notEmpty scope="request" name="sessions"> <BR> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <bean:write scope="request" name="sessions" filter="false"/> </TABLE> *************** *** 57,61 **** <logic:notEmpty scope="request" name="iclsschd"> <BR> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <bean:write scope="request" name="iclsschd" filter="false"/> </TABLE> --- 58,62 ---- <logic:notEmpty scope="request" name="iclsschd"> <BR> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <bean:write scope="request" name="iclsschd" filter="false"/> </TABLE> *************** *** 63,67 **** <logic:notEmpty scope="request" name="ischedule"> <BR> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <bean:write scope="request" name="ischedule" filter="false"/> </TABLE> --- 64,68 ---- <logic:notEmpty scope="request" name="ischedule"> <BR> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <bean:write scope="request" name="ischedule" filter="false"/> </TABLE> *************** *** 69,73 **** <logic:notEmpty scope="request" name="iconf"> <BR> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <bean:write scope="request" name="iconf" filter="false"/> </TABLE> --- 70,74 ---- <logic:notEmpty scope="request" name="iconf"> <BR> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <bean:write scope="request" name="iconf" filter="false"/> </TABLE> *************** *** 75,79 **** <logic:notEmpty scope="request" name="sconf"> <BR> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <bean:write scope="request" name="sconf" filter="false"/> </TABLE> --- 76,80 ---- <logic:notEmpty scope="request" name="sconf"> <BR> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <bean:write scope="request" name="sconf" filter="false"/> </TABLE> *************** *** 81,85 **** <logic:notEmpty scope="request" name="clsschd"> <BR> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <bean:write scope="request" name="clsschd" filter="false"/> </TABLE> --- 82,86 ---- <logic:notEmpty scope="request" name="clsschd"> <BR> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <bean:write scope="request" name="clsschd" filter="false"/> </TABLE> *************** *** 87,91 **** <logic:notEmpty scope="request" name="schedule"> <BR> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <bean:write scope="request" name="schedule" filter="false"/> </TABLE> --- 88,92 ---- <logic:notEmpty scope="request" name="schedule"> <BR> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <bean:write scope="request" name="schedule" filter="false"/> </TABLE> *************** *** 93,105 **** <logic:notEmpty scope="request" name="conf"> <BR> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <bean:write scope="request" name="conf" filter="false"/> </TABLE> </logic:notEmpty> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR><TD><tt:section-title/></TD></TR> <TR><TD align='right'> <logic:equal name="personalizedExamReportForm" property="admin" value="true"> ! <input type='button' value='Lookup' onclick="window.open('user/peopleLookup.jsp?query='+fname.value+' '+lname.value+'&submit=true','peopleLookup','width=800,height=600,resizable=no,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus();" style="btn"> </logic:equal> <logic:equal name="personalizedExamReportForm" property="canExport" value="true"> --- 94,106 ---- <logic:notEmpty scope="request" name="conf"> <BR> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <bean:write scope="request" name="conf" filter="false"/> </TABLE> </logic:notEmpty> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR><TD><tt:section-title/></TD></TR> <TR><TD align='right'> <logic:equal name="personalizedExamReportForm" property="admin" value="true"> ! <input type='button' value='Lookup' onclick="lookup();" style="btn"> </logic:equal> <logic:equal name="personalizedExamReportForm" property="canExport" value="true"> *************** *** 112,114 **** </TD></TR> </TABLE> ! </html:form> --- 113,128 ---- </TD></TR> </TABLE> ! <script language="javascript"> ! function lookup() { ! peopleLookup((fname.value + ' ' + lname.value).trim(), function(person) { ! if (person) { ! uid.value = person[0]; ! fname.value = person[1]; ! mname.value = person[2]; ! lname.value = person[3]; ! document.forms[0].submit(); ! } ! }, "mustHaveExternalId"); ! } ! </script> ! </html:form> \ No newline at end of file Index: pdfReport.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/exam/pdfReport.jsp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** pdfReport.jsp 28 May 2010 15:34:56 -0000 1.10 --- pdfReport.jsp 1 Dec 2010 11:10:40 -0000 1.11 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 25,29 **** <tiles:importAttribute /> <html:form action="/examPdfReport"> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <logic:messagesPresent> <TR> --- 25,29 ---- <tiles:importAttribute /> <html:form action="/examPdfReport"> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <logic:messagesPresent> <TR> Index: roomAvailability.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/exam/roomAvailability.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** roomAvailability.jsp 18 Jun 2008 18:53:35 -0000 1.4 --- roomAvailability.jsp 1 Dec 2010 11:10:40 -0000 1.5 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 28,32 **** <html:hidden property="showSections"/> <html:hidden property="subjectArea" /> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan='2'> --- 28,32 ---- <html:hidden property="showSections"/> <html:hidden property="subjectArea" /> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan='2'> *************** *** 80,84 **** <BR><BR> <logic:empty name="roomAvailabilityForm" property="table"> ! <table width='95%' border='0' cellspacing='0' cellpadding='3'> <tr><td><i> <logic:equal name="roomAvailabilityForm" property="examType" value="-1"> --- 80,84 ---- <BR><BR> <logic:empty name="roomAvailabilityForm" property="table"> ! <table width='100%' border='0' cellspacing='0' cellpadding='3'> <tr><td><i> <logic:equal name="roomAvailabilityForm" property="examType" value="-1"> *************** *** 92,96 **** </logic:empty> <logic:notEmpty name="roomAvailabilityForm" property="table"> ! <table width='95%' border='0' cellspacing='0' cellpadding='3'> <bean:write name="roomAvailabilityForm" property="table" filter="false"/> </table> --- 92,96 ---- </logic:empty> <logic:notEmpty name="roomAvailabilityForm" property="table"> ! <table width='100%' border='0' cellspacing='0' cellpadding='3'> <bean:write name="roomAvailabilityForm" property="table" filter="false"/> </table> *************** *** 102,106 **** </SCRIPT> </logic:notEmpty> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD> --- 102,106 ---- </SCRIPT> </logic:notEmpty> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD> Index: unassigned.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/exam/unassigned.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** unassigned.jsp 17 Jun 2008 21:24:48 -0000 1.4 --- unassigned.jsp 1 Dec 2010 11:10:40 -0000 1.5 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 28,32 **** <html:form action="/unassignedExams"> <script language="JavaScript">blToggleHeader('Filter','dispFilter');blStart('dispFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD width="10%" nowrap>Show classes/courses:</TD> --- 28,32 ---- <html:form action="/unassignedExams"> <script language="JavaScript">blToggleHeader('Filter','dispFilter');blStart('dispFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD width="10%" nowrap>Show classes/courses:</TD> *************** *** 38,42 **** <script language="JavaScript">blEnd('dispFilter');blStartCollapsed('dispFilter');</script> <script language="JavaScript">blEndCollapsed('dispFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD width="10%" nowrap>Examination Problem:</TD> --- 38,42 ---- <script language="JavaScript">blEnd('dispFilter');blStartCollapsed('dispFilter');</script> <script language="JavaScript">blEndCollapsed('dispFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD width="10%" nowrap>Examination Problem:</TD> *************** *** 73,77 **** <BR><BR> <logic:empty name="examReportForm" property="table"> ! <table width='95%' border='0' cellspacing='0' cellpadding='3'> <tr><td><i> <logic:empty name="examReportForm" property="subjectArea"> --- 73,77 ---- <BR><BR> <logic:empty name="examReportForm" property="table"> ! <table width='100%' border='0' cellspacing='0' cellpadding='3'> <tr><td><i> <logic:empty name="examReportForm" property="subjectArea"> *************** *** 91,95 **** </logic:empty> <logic:notEmpty name="examReportForm" property="table"> ! <table width='95%' border='0' cellspacing='0' cellpadding='3'> <bean:define id="colspan" name="examReportForm" property="nrColumns"/> <!-- --- 91,95 ---- </logic:empty> <logic:notEmpty name="examReportForm" property="table"> ! <table width='100%' border='0' cellspacing='0' cellpadding='3'> <bean:define id="colspan" name="examReportForm" property="nrColumns"/> <!-- Index: examLog.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/exam/examLog.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** examLog.jsp 17 Jun 2008 21:24:48 -0000 1.4 --- examLog.jsp 1 Dec 2010 11:10:40 -0000 1.5 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 31,35 **** <html:form action="/examSolverLog"> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> --- 31,35 ---- <html:form action="/examSolverLog"> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> *************** *** 65,69 **** <logic:empty name="examSolverLogForm" property="log"> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> --- 65,69 ---- <logic:empty name="examSolverLogForm" property="log"> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> Index: examGrid.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/exam/examGrid.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** examGrid.jsp 16 Oct 2008 16:33:28 -0000 1.6 --- examGrid.jsp 1 Dec 2010 11:10:40 -0000 1.7 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 32,36 **** %> <script language="JavaScript">blToggleHeader('Filter','dispFilter');blStart('dispFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD width="10%" nowrap>Show classes/courses:</TD> --- 32,36 ---- %> <script language="JavaScript">blToggleHeader('Filter','dispFilter');blStart('dispFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD width="10%" nowrap>Show classes/courses:</TD> *************** *** 135,139 **** </TABLE> <script language="JavaScript">blEnd('dispFilter');blStartCollapsed('dispFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan='2' align='right'> --- 135,139 ---- </TABLE> <script language="JavaScript">blEnd('dispFilter');blStartCollapsed('dispFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan='2' align='right'> *************** *** 147,151 **** <br><br> <a name='timetable'/> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> --- 147,151 ---- <br><br> <a name='timetable'/> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> *************** *** 180,184 **** <BR> <a name='legend'/> ! <TABLE width="90%" border="0" > <TR> <TD colspan="3"> --- 180,184 ---- <BR> <a name='legend'/> ! <TABLE width="100%" border="0" > <TR> <TD colspan="3"> Index: assigned.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/exam/assigned.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** assigned.jsp 17 Jun 2008 21:24:48 -0000 1.4 --- assigned.jsp 1 Dec 2010 11:10:40 -0000 1.5 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 28,32 **** <html:form action="/assignedExams"> <script language="JavaScript">blToggleHeader('Filter','dispFilter');blStart('dispFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD width="10%" nowrap>Show classes/courses:</TD> --- 28,32 ---- <html:form action="/assignedExams"> <script language="JavaScript">blToggleHeader('Filter','dispFilter');blStart('dispFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD width="10%" nowrap>Show classes/courses:</TD> *************** *** 38,42 **** <script language="JavaScript">blEnd('dispFilter');blStartCollapsed('dispFilter');</script> <script language="JavaScript">blEndCollapsed('dispFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD width="10%" nowrap>Examination Problem:</TD> --- 38,42 ---- <script language="JavaScript">blEnd('dispFilter');blStartCollapsed('dispFilter');</script> <script language="JavaScript">blEndCollapsed('dispFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD width="10%" nowrap>Examination Problem:</TD> *************** *** 73,77 **** <BR><BR> <logic:empty name="examReportForm" property="table"> ! <table width='95%' border='0' cellspacing='0' cellpadding='3'> <tr><td><i> <logic:empty name="examReportForm" property="subjectArea"> --- 73,77 ---- <BR><BR> <logic:empty name="examReportForm" property="table"> ! <table width='100%' border='0' cellspacing='0' cellpadding='3'> <tr><td><i> <logic:empty name="examReportForm" property="subjectArea"> *************** *** 91,95 **** </logic:empty> <logic:notEmpty name="examReportForm" property="table"> ! <table width='95%' border='0' cellspacing='0' cellpadding='3'> <bean:define id="colspan" name="examReportForm" property="nrColumns"/> <!-- --- 91,95 ---- </logic:empty> <logic:notEmpty name="examReportForm" property="table"> ! <table width='100%' border='0' cellspacing='0' cellpadding='3'> <bean:define id="colspan" name="examReportForm" property="nrColumns"/> <!-- Index: exams.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/exam/exams.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** exams.jsp 23 Sep 2009 15:24:41 -0000 1.9 --- exams.jsp 1 Dec 2010 11:10:40 -0000 1.10 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 26,30 **** <html:form action="/exams"> <logic:notEmpty name="examsForm" property="sessions"> ! <TABLE width="95%" border="0" cellspacing="0" cellpadding="3"> <html:hidden property="op"/> <TR> --- 26,30 ---- <html:form action="/exams"> <logic:notEmpty name="examsForm" property="sessions"> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <html:hidden property="op"/> <TR> *************** *** 60,64 **** <logic:empty name="examsForm" property="table"> ! <table width='95%' border='0' cellspacing='0' cellpadding='3'> <tr><td style='color:red;font-weight:bold;'> <logic:empty name="examsForm" property="session"> --- 60,64 ---- <logic:empty name="examsForm" property="table"> ! <table width='100%' border='0' cellspacing='0' cellpadding='3'> <tr><td style='color:red;font-weight:bold;'> <logic:empty name="examsForm" property="session"> *************** *** 83,87 **** <logic:notEmpty name="examsForm" property="table"> ! <table width='95%' border='0' cellspacing='0' cellpadding='3'> <bean:write name="examsForm" property="table" filter="false"/> </table> --- 83,87 ---- <logic:notEmpty name="examsForm" property="table"> ! <table width='100%' border='0' cellspacing='0' cellpadding='3'> <bean:write name="examsForm" property="table" filter="false"/> </table> *************** *** 92,96 **** <BR> <a name="login"></a> ! <TABLE width="95%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD nowspan> --- 92,96 ---- <BR> <a name="login"></a> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD nowspan> Index: cbs.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/exam/cbs.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cbs.jsp 17 Jun 2008 21:24:48 -0000 1.2 --- cbs.jsp 1 Dec 2010 11:10:40 -0000 1.3 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 43,47 **** %> <script language="JavaScript">blToggleHeader('Filter','dispFilter');blStart('dispFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD>Mode:</TD> --- 43,47 ---- %> <script language="JavaScript">blToggleHeader('Filter','dispFilter');blStart('dispFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD>Mode:</TD> *************** *** 67,71 **** </TABLE> <script language="JavaScript">blEnd('dispFilter');blStartCollapsed('dispFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan='2' align='right'> --- 67,71 ---- </TABLE> <script language="JavaScript">blEnd('dispFilter');blStartCollapsed('dispFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan='2' align='right'> *************** *** 96,100 **** %> </font> ! <table border='0' width='90%'><tr><td> <tt:displayPrefLevelLegend/> </td></tr></table> --- 96,100 ---- %> </font> ! <table border='0' width='100%'><tr><td> <tt:displayPrefLevelLegend/> </td></tr></table> *************** *** 102,106 **** } else { %> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> --- 102,106 ---- } else { %> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> Index: examSolver.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/exam/examSolver.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** examSolver.jsp 16 Oct 2008 16:33:28 -0000 1.7 --- examSolver.jsp 1 Dec 2010 11:10:40 -0000 1.8 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 71,75 **** status = "Solver not started."; %> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> --- 71,75 ---- status = "Solver not started."; %> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> *************** *** 119,123 **** <% if (parameter.getType().startsWith("enum(") && parameter.getType().endsWith(")")) { %> <html:select property='<%="parameterValue["+parameter.getId()+"]"%>' disabled="<%=disabled || parameter.getDisabled()%>"> ! <html:options property='<%="enum("+parameter.getType()+")"%>'/> </html:select> <html:errors property='<%="parameterValue["+parameter.getId()+"]"%>'/> --- 119,123 ---- <% if (parameter.getType().startsWith("enum(") && parameter.getType().endsWith(")")) { %> <html:select property='<%="parameterValue["+parameter.getId()+"]"%>' disabled="<%=disabled || parameter.getDisabled()%>"> ! <html:options property='<%=parameter.getType()%>'/> </html:select> <html:errors property='<%="parameterValue["+parameter.getId()+"]"%>'/> *************** *** 192,196 **** </TABLE> <BR><BR> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <% if (solver==null) { --- 192,196 ---- </TABLE> <BR><BR> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <% if (solver==null) { *************** *** 215,219 **** if (hibSession.getTransaction()==null || !hibSession.getTransaction().isActive()) tx = hibSession.beginTransaction(); ! Hashtable info = solver.bestSolutionInfo(); if (info!=null) { %> --- 215,219 ---- if (hibSession.getTransaction()==null || !hibSession.getTransaction().isActive()) tx = hibSession.beginTransaction(); ! Map<String,String> info = solver.currentSolutionInfo(); if (info!=null) { %> *************** *** 226,234 **** </TR> <% ! Vector keys = new Vector(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (Enumeration e=keys.elements();e.hasMoreElements();) { ! String key = (String)e.nextElement(); ! String val = info.get(key).toString(); %> <TR><TD><%=key%>:</TD><TD><%=val%></TD></TR> --- 226,233 ---- </TR> <% ! List<String> keys = new ArrayList<String>(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (String key: keys) { ! String val = info.get(key); %> <TR><TD><%=key%>:</TD><TD><%=val%></TD></TR> *************** *** 249,257 **** <% info = solver.currentSolutionInfo(); ! Vector keys = new Vector(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (Enumeration e=keys.elements();e.hasMoreElements();) { ! String key = (String)e.nextElement(); ! String val = info.get(key).toString(); %> <TR><TD><%=key%>:</TD><TD><%=val%></TD></TR> --- 248,255 ---- <% info = solver.currentSolutionInfo(); ! List<String> keys = new ArrayList<String>(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (String key: keys) { ! String val = info.get(key); %> <TR><TD><%=key%>:</TD><TD><%=val%></TD></TR> *************** *** 301,305 **** <tt:propertyEquals name="tmtbl.solver.remote.allow_jnlp_exec" value="true"> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD><DIV class="WelcomeRowHeadBlank"> </DIV></TD> --- 299,303 ---- <tt:propertyEquals name="tmtbl.solver.remote.allow_jnlp_exec" value="true"> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD><DIV class="WelcomeRowHeadBlank"> </DIV></TD> Index: changes.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/exam/changes.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** changes.jsp 17 Jun 2008 21:24:48 -0000 1.3 --- changes.jsp 1 Dec 2010 11:10:40 -0000 1.4 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 28,32 **** <html:form action="/examChanges"> <script language="JavaScript">blToggleHeader('Filter','dispFilter');blStart('dispFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD width="10%" nowrap>Show classes/courses:</TD> --- 28,32 ---- <html:form action="/examChanges"> <script language="JavaScript">blToggleHeader('Filter','dispFilter');blStart('dispFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD width="10%" nowrap>Show classes/courses:</TD> *************** *** 44,48 **** <script language="JavaScript">blEnd('dispFilter');blStartCollapsed('dispFilter');</script> <script language="JavaScript">blEndCollapsed('dispFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD width="10%" nowrap>Subject Areas:</TD> --- 44,48 ---- <script language="JavaScript">blEnd('dispFilter');blStartCollapsed('dispFilter');</script> <script language="JavaScript">blEndCollapsed('dispFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD width="10%" nowrap>Subject Areas:</TD> *************** *** 79,83 **** <BR><BR> <logic:empty name="examChangesForm" property="table"> ! <table width='95%' border='0' cellspacing='0' cellpadding='3'> <tr><td><i> <logic:equal name="examChangesForm" property="noSolver" value="true"> --- 79,83 ---- <BR><BR> <logic:empty name="examChangesForm" property="table"> ! <table width='100%' border='0' cellspacing='0' cellpadding='3'> <tr><td><i> <logic:equal name="examChangesForm" property="noSolver" value="true"> *************** *** 100,104 **** </logic:empty> <logic:notEmpty name="examChangesForm" property="table"> ! <table width='95%' border='0' cellspacing='0' cellpadding='3'> <bean:define id="colspan" name="examChangesForm" property="nrColumns"/> <bean:write name="examChangesForm" property="table" filter="false"/> --- 100,104 ---- </logic:empty> <logic:notEmpty name="examChangesForm" property="table"> ! <table width='100%' border='0' cellspacing='0' cellpadding='3'> <bean:define id="colspan" name="examChangesForm" property="nrColumns"/> <bean:write name="examChangesForm" property="table" filter="false"/> Index: info.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/exam/info.jsp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** info.jsp 16 Feb 2010 18:02:34 -0000 1.10 --- info.jsp 1 Dec 2010 11:10:40 -0000 1.11 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2008-2009, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2008-2009, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 48,59 **** <logic:equal name="examInfoForm" property="op" value="Close"> <script language="JavaScript" type="text/javascript"> ! if (document.parentWindow && document.parentWindow.frames[5]) { ! document.parentWindow.frames[5].location = document.parentWindow.frames[5].location+'?backId=<%=examId%>&backType=Exam'; ! } ! window.close(); </script> </logic:equal> <tt:confirm name="confirmAssign"><bean:write name="model" property="assignConfirm"/></tt:confirm> ! <table border='0' width='95%'> <tr><td colspan='2'> <tt:section-header> --- 48,57 ---- <logic:equal name="examInfoForm" property="op" value="Close"> <script language="JavaScript" type="text/javascript"> ! parent.hideGwtDialog(); ! parent.refreshPage(); </script> </logic:equal> <tt:confirm name="confirmAssign"><bean:write name="model" property="assignConfirm"/></tt:confirm> ! <table border='0' width='100%'> <tr><td colspan='2'> <tt:section-header> |
|
From: Tomas M. <to...@us...> - 2010-12-01 11:11:19
|
Update of /cvsroot/unitime/UniTime/WebContent/tt In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/WebContent/tt Modified Files: assigned.jsp solutions.jsp solutionReport.jsp solver.jsp unassigned.jsp history.jsp timetable.jsp info.jsp log.jsp changes.jsp suggestions.jsp cbs.jsp manageSolvers.jsp Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: solutions.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/tt/solutions.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** solutions.jsp 16 Oct 2008 16:33:28 -0000 1.4 --- solutions.jsp 1 Dec 2010 11:10:39 -0000 1.5 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 113,117 **** <input type='hidden' name='confirm' value='y'/> <logic:notEmpty name="listSolutionsForm" property="messages"> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR><TD colspan="2" align="left" class="errorCell"> <font color="red"><B>ERRORS:</B><BR> --- 113,117 ---- <input type='hidden' name='confirm' value='y'/> <logic:notEmpty name="listSolutionsForm" property="messages"> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR><TD colspan="2" align="left" class="errorCell"> <font color="red"><B>ERRORS:</B><BR> *************** *** 168,172 **** status = "Solver not started."; %> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> --- 168,172 ---- status = "Solver not started."; %> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> *************** *** 216,225 **** <TD valign="top">Note:</TD><TD><html:textarea property="solverNote" rows="4" cols="80" disabled="<%=solver.isWorking()%>"/></TD> </TR> ! <% Hashtable info = solver.currentSolutionInfo(); ! Vector keys = new Vector(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (Enumeration e=keys.elements();e.hasMoreElements();) { ! String key = (String)e.nextElement(); ! String val = info.get(key).toString(); %> <TR><TD nowrap><%=key%>:</TD><TD><%=val%></TD></TR> --- 216,224 ---- <TD valign="top">Note:</TD><TD><html:textarea property="solverNote" rows="4" cols="80" disabled="<%=solver.isWorking()%>"/></TD> </TR> ! <% Map<String,String> info = solver.currentSolutionInfo(); ! List<String> keys = new ArrayList<String>(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (String key: keys) { ! String val = info.get(key); %> <TR><TD nowrap><%=key%>:</TD><TD><%=val%></TD></TR> *************** *** 280,284 **** <html:hidden property="selectedSolutionBean"/><html:errors property="selectedSolutionBean"/> <html:hidden property="note"/> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR><TD colspan='2'> </TD></TR> <logic:iterate name="listSolutionsForm" property="solutionBeans" id="sb" indexId="idx"> --- 279,283 ---- <html:hidden property="selectedSolutionBean"/><html:errors property="selectedSolutionBean"/> <html:hidden property="note"/> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR><TD colspan='2'> </TD></TR> <logic:iterate name="listSolutionsForm" property="solutionBeans" id="sb" indexId="idx"> *************** *** 373,377 **** </logic:notEmpty> <BR> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <%= request.getAttribute("ListSolutions.table") %> </TABLE> --- 372,376 ---- </logic:notEmpty> <BR> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <%= request.getAttribute("ListSolutions.table") %> </TABLE> *************** *** 379,383 **** <logic:notEmpty name="listSolutionsForm" property="owners"> <% if (solver==null) { %> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD nowrap> --- 378,382 ---- <logic:notEmpty name="listSolutionsForm" property="owners"> <% if (solver==null) { %> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD nowrap> Index: solutionReport.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/tt/solutionReport.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** solutionReport.jsp 16 Oct 2008 16:33:28 -0000 1.4 --- solutionReport.jsp 1 Dec 2010 11:10:39 -0000 1.5 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 28,32 **** <html:form action="/solutionReport"> <logic:notEmpty name="SolutionReport.message" scope="request"> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD> --- 28,32 ---- <html:form action="/solutionReport"> <logic:notEmpty name="SolutionReport.message" scope="request"> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD> *************** *** 43,47 **** <logic:notEmpty name='<%="SolutionReport.roomReportTable."+ref%>' scope="request"> <% if (!atLeastOneRoomReport) { %> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <% atLeastOneRoomReport = true; } %> <bean:write name='<%="SolutionReport.roomReportTable."+ref%>' scope="request" filter="false"/> --- 43,47 ---- <logic:notEmpty name='<%="SolutionReport.roomReportTable."+ref%>' scope="request"> <% if (!atLeastOneRoomReport) { %> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <% atLeastOneRoomReport = true; } %> <bean:write name='<%="SolutionReport.roomReportTable."+ref%>' scope="request" filter="false"/> *************** *** 50,54 **** <logic:notEmpty name="SolutionReport.roomReportTable.nonUniv" scope="request"> <% if (!atLeastOneRoomReport) { %> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <% atLeastOneRoomReport = true; } %> <bean:write name="SolutionReport.roomReportTable.nonUniv" scope="request" filter="false"/> --- 50,54 ---- <logic:notEmpty name="SolutionReport.roomReportTable.nonUniv" scope="request"> <% if (!atLeastOneRoomReport) { %> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <% atLeastOneRoomReport = true; } %> <bean:write name="SolutionReport.roomReportTable.nonUniv" scope="request" filter="false"/> *************** *** 76,80 **** if (violatedDistrPreferencesReportTable!=null) { %> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <%=violatedDistrPreferencesReportTable%> <tr><td colspan='5'><tt:displayPrefLevelLegend/></td></tr> --- 76,80 ---- if (violatedDistrPreferencesReportTable!=null) { %> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <%=violatedDistrPreferencesReportTable%> <tr><td colspan='5'><tt:displayPrefLevelLegend/></td></tr> *************** *** 87,91 **** if (discouragedInstructorBtbReportReportTable!=null) { %> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <%=discouragedInstructorBtbReportReportTable%> <tr><td colspan='6'><tt:displayPrefLevelLegend/></td></tr> --- 87,91 ---- if (discouragedInstructorBtbReportReportTable!=null) { %> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <%=discouragedInstructorBtbReportReportTable%> <tr><td colspan='6'><tt:displayPrefLevelLegend/></td></tr> *************** *** 97,103 **** if (studentConflictsReportTable!=null) { %> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <%=studentConflictsReportTable%> ! <tr><td colspan='8'><tt:displayPrefLevelLegend/></td></tr> </TABLE><BR><BR><BR> <% --- 97,103 ---- if (studentConflictsReportTable!=null) { %> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <%=studentConflictsReportTable%> ! <tr><td colspan='9'><tt:displayPrefLevelLegend/></td></tr> </TABLE><BR><BR><BR> <% *************** *** 107,111 **** if (sameSubpartBalancingReportTable!=null) { %> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <%=sameSubpartBalancingReportTable%> <tr><td colspan='<%=2+Constants.SLOTS_PER_DAY_NO_EVENINGS/6%>'><tt:displayPrefLevelLegend/></td></tr> --- 107,111 ---- if (sameSubpartBalancingReportTable!=null) { %> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <%=sameSubpartBalancingReportTable%> <tr><td colspan='<%=2+Constants.SLOTS_PER_DAY_NO_EVENINGS/6%>'><tt:displayPrefLevelLegend/></td></tr> *************** *** 117,121 **** if (deptBalancingReportTable!=null) { %> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <%=deptBalancingReportTable%> <tr><td colspan='<%=2+Constants.SLOTS_PER_DAY_NO_EVENINGS/6%>'><tt:displayPrefLevelLegend/></td></tr> --- 117,121 ---- if (deptBalancingReportTable!=null) { %> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <%=deptBalancingReportTable%> <tr><td colspan='<%=2+Constants.SLOTS_PER_DAY_NO_EVENINGS/6%>'><tt:displayPrefLevelLegend/></td></tr> *************** *** 127,131 **** if (perturbationReportTable!=null) { %> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <%=perturbationReportTable%> <tr><td><i>Class</i></td><td colspan='23'>Class name</td></tr> --- 127,131 ---- if (perturbationReportTable!=null) { %> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <%=perturbationReportTable%> <tr><td><i>Class</i></td><td colspan='23'>Class name</td></tr> *************** *** 158,162 **** %> <BR> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD align="right"> --- 158,162 ---- %> <BR> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD align="right"> Index: solver.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/tt/solver.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** solver.jsp 16 Oct 2008 16:33:28 -0000 1.6 --- solver.jsp 1 Dec 2010 11:10:39 -0000 1.7 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 112,116 **** status = "Solver not started."; %> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> --- 112,116 ---- status = "Solver not started."; %> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> *************** *** 152,156 **** <% if (parameter.getType().startsWith("enum(") && parameter.getType().endsWith(")")) { %> <html:select property='<%="parameterValue["+parameter.getId()+"]"%>' disabled="<%=disabled || parameter.getDisabled()%>"> ! <html:options property='<%="enum("+parameter.getType()+")"%>'/> </html:select> <html:errors property='<%="parameterValue["+parameter.getId()+"]"%>'/> --- 152,156 ---- <% if (parameter.getType().startsWith("enum(") && parameter.getType().endsWith(")")) { %> <html:select property='<%="parameterValue["+parameter.getId()+"]"%>' disabled="<%=disabled || parameter.getDisabled()%>"> ! <html:options property='<%=parameter.getType()%>'/> </html:select> <html:errors property='<%="parameterValue["+parameter.getId()+"]"%>'/> *************** *** 228,232 **** </TABLE> <BR><BR> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <% if (solver==null) { --- 228,232 ---- </TABLE> <BR><BR> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <% if (solver==null) { *************** *** 310,314 **** } } ! Hashtable info = solver.bestSolutionInfo(); if (info!=null) { %> --- 310,314 ---- } } ! Map<String,String> info = solver.bestSolutionInfo(); if (info!=null) { %> *************** *** 321,329 **** </TR> <% ! Vector keys = new Vector(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (Enumeration e=keys.elements();e.hasMoreElements();) { ! String key = (String)e.nextElement(); ! String val = info.get(key).toString(); %> <TR><TD><%=key%>:</TD><TD><%=val%></TD></TR> --- 321,328 ---- </TR> <% ! List<String> keys = new ArrayList<String>(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (String key: keys) { ! String val = info.get(key); %> <TR><TD><%=key%>:</TD><TD><%=val%></TD></TR> *************** *** 376,384 **** <% info = solver.currentSolutionInfo(); ! Vector keys = new Vector(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (Enumeration e=keys.elements();e.hasMoreElements();) { ! String key = (String)e.nextElement(); ! String val = info.get(key).toString(); %> <TR><TD><%=key%>:</TD><TD><%=val%></TD></TR> --- 375,382 ---- <% info = solver.currentSolutionInfo(); ! List<String> keys = new ArrayList<String>(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (String key: keys) { ! String val = info.get(key); %> <TR><TD><%=key%>:</TD><TD><%=val%></TD></TR> *************** *** 428,432 **** <tt:propertyEquals name="tmtbl.solver.remote.allow_jnlp_exec" value="true"> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD><DIV class="WelcomeRowHeadBlank"> </DIV></TD> --- 426,430 ---- <tt:propertyEquals name="tmtbl.solver.remote.allow_jnlp_exec" value="true"> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD><DIV class="WelcomeRowHeadBlank"> </DIV></TD> Index: cbs.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/tt/cbs.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cbs.jsp 17 Jun 2008 21:24:45 -0000 1.2 --- cbs.jsp 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 45,49 **** %> <script language="JavaScript">blToggleHeader('Filter','dispFilter');blStart('dispFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD>Mode:</TD> --- 45,49 ---- %> <script language="JavaScript">blToggleHeader('Filter','dispFilter');blStart('dispFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD>Mode:</TD> *************** *** 69,73 **** </TABLE> <script language="JavaScript">blEnd('dispFilter');blStartCollapsed('dispFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan='2' align='right'> --- 69,73 ---- </TABLE> <script language="JavaScript">blEnd('dispFilter');blStartCollapsed('dispFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan='2' align='right'> *************** *** 112,116 **** %> </font> ! <table border='0' width='90%'><tr><td> <tt:displayPrefLevelLegend/> </td></tr></table> --- 112,116 ---- %> </font> ! <table border='0' width='100%'><tr><td> <tt:displayPrefLevelLegend/> </td></tr></table> *************** *** 118,122 **** } else { %> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> --- 118,122 ---- } else { %> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> Index: unassigned.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/tt/unassigned.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** unassigned.jsp 17 Jun 2008 21:24:45 -0000 1.2 --- unassigned.jsp 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 30,41 **** <html:form action="/unassigned"> <% SolverProxy solver = WebSolver.getSolver(session); %> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <td colspan='4'> <i> NOTE: Only classes that are <%=solver==null?"included in the selected solution":"loaded into the solver"%> ! are displayed in the below list. This means that classes that are assigned to other timetabling managers (e.g., LLR or LAB) as well as classes that <%=solver==null?"were":"are"%> not loaded into the solver ! (e.g., Arrange Hours classes) are excluded. For the full list of classes see <a href='classShowSearch.do'>Classes</a> or <a href='classAssignmentsReportShowSearch.do'>Class Assignments</a> page.<br> --- 30,41 ---- <html:form action="/unassigned"> <% SolverProxy solver = WebSolver.getSolver(session); %> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <td colspan='4'> <i> NOTE: Only classes that are <%=solver==null?"included in the selected solution":"loaded into the solver"%> ! are displayed in the below list. This means that classes that are assigned to other<br/>timetabling managers (e.g., LLR or LAB) as well as classes that <%=solver==null?"were":"are"%> not loaded into the solver ! (e.g., Arrange Hours classes) are excluded.<br/> For the full list of classes see <a href='classShowSearch.do'>Classes</a> or <a href='classAssignmentsReportShowSearch.do'>Class Assignments</a> page.<br> *************** *** 66,74 **** <i> NOTE: Only classes that are <%=solver==null?"included in the selected solution":"loaded into the solver"%> ! are displayed in the above list. This means that classes that are assigned to other timetabling managers (e.g., LLR or LAB) as well as classes that <%=solver==null?"were":"are"%> not loaded into the solver ! (e.g., Arrange Hours classes) are excluded. For the full list of classes see <a href='classShowSearch.do'>Classes</a> or ! <a href='classAssignmentsReportShowSearch.do'>Class Assignments</a> page. </i> </TD> --- 66,74 ---- <i> NOTE: Only classes that are <%=solver==null?"included in the selected solution":"loaded into the solver"%> ! are displayed in the below list. This means that classes that are assigned to other<br/>timetabling managers (e.g., LLR or LAB) as well as classes that <%=solver==null?"were":"are"%> not loaded into the solver ! (e.g., Arrange Hours classes) are excluded.<br/> For the full list of classes see <a href='classShowSearch.do'>Classes</a> or ! <a href='classAssignmentsReportShowSearch.do'>Class Assignments</a> page.<br> </i> </TD> Index: log.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/tt/log.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** log.jsp 16 Oct 2008 16:33:28 -0000 1.4 --- log.jsp 1 Dec 2010 11:10:39 -0000 1.5 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 31,35 **** <html:form action="/solverLog"> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> --- 31,35 ---- <html:form action="/solverLog"> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> *************** *** 64,68 **** <BR> <logic:greaterThan name="solverLogForm" property="nrLogs" value="1"> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> --- 64,68 ---- <BR> <logic:greaterThan name="solverLogForm" property="nrLogs" value="1"> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> *************** *** 79,83 **** <logic:equal name="solverLogForm" property="nrLogs" value="0"> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> --- 79,83 ---- <logic:equal name="solverLogForm" property="nrLogs" value="0"> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> Index: assigned.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/tt/assigned.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** assigned.jsp 16 Oct 2008 16:33:28 -0000 1.3 --- assigned.jsp 1 Dec 2010 11:10:39 -0000 1.4 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 33,37 **** %> <script language="JavaScript">blToggleHeader('Filter','dispFilter');blStart('dispFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD>Simplified mode:</TD> --- 33,37 ---- %> <script language="JavaScript">blToggleHeader('Filter','dispFilter');blStart('dispFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD>Simplified mode:</TD> *************** *** 49,53 **** </TABLE> <script language="JavaScript">blEnd('dispFilter');blStartCollapsed('dispFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan='2' align='right'> --- 49,53 ---- </TABLE> <script language="JavaScript">blEnd('dispFilter');blStartCollapsed('dispFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan='2' align='right'> *************** *** 65,78 **** if (assigned!=null) { %> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <tr> <td colspan='<%=request.getAttribute("AssignedClasses.table.colspan")%>'> <i> ! NOTE: Only classes that are <%=solver==null?"included in the selected solution":"loaded into the solver"%> ! are displayed in the below list. This means that classes that are assigned to other timetabling managers ! (e.g., LLR or LAB) as well as classes that <%=solver==null?"were":"are"%> not loaded into the solver ! (e.g., Arrange Hours classes) are excluded. ! For the full list of classes see <a href='classShowSearch.do'>Classes</a> or ! <a href='classAssignmentsReportShowSearch.do'>Class Assignments</a> page. </i> </td> --- 65,78 ---- if (assigned!=null) { %> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <tr> <td colspan='<%=request.getAttribute("AssignedClasses.table.colspan")%>'> <i> ! NOTE: Only classes that are <%=solver==null?"included in the selected solution":"loaded into the solver"%> ! are displayed in the below list. This means that classes that are assigned to other<br/>timetabling managers ! (e.g., LLR or LAB) as well as classes that <%=solver==null?"were":"are"%> not loaded into the solver ! (e.g., Arrange Hours classes) are excluded.<br/> ! For the full list of classes see <a href='classShowSearch.do'>Classes</a> or ! <a href='classAssignmentsReportShowSearch.do'>Class Assignments</a> page.<br> </i> </td> *************** *** 89,98 **** <br> <i> ! NOTE: Only classes that are <%=solver==null?"included in the selected solution":"loaded into the solver"%> ! are displayed in the above list. This means that classes that are assigned to other timetabling managers ! (e.g., LLR or LAB) as well as classes that <%=solver==null?"were":"are"%> not loaded into the solver ! (e.g., Arrange Hours classes) are excluded. ! For the full list of classes see <a href='classShowSearch.do'>Classes</a> or ! <a href='classAssignmentsReportShowSearch.do'>Class Assignments</a> page. </i> </td> --- 89,98 ---- <br> <i> ! NOTE: Only classes that are <%=solver==null?"included in the selected solution":"loaded into the solver"%> ! are displayed in the below list. This means that classes that are assigned to other<br/>timetabling managers ! (e.g., LLR or LAB) as well as classes that <%=solver==null?"were":"are"%> not loaded into the solver ! (e.g., Arrange Hours classes) are excluded.<br/> ! For the full list of classes see <a href='classShowSearch.do'>Classes</a> or ! <a href='classAssignmentsReportShowSearch.do'>Class Assignments</a> page.<br> </i> </td> *************** *** 102,106 **** } else { %> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> --- 102,106 ---- } else { %> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> Index: timetable.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/tt/timetable.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** timetable.jsp 12 Jan 2010 23:05:06 -0000 1.3 --- timetable.jsp 1 Dec 2010 11:10:39 -0000 1.4 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 32,36 **** %> <script language="JavaScript">blToggleHeader('Filter','dispFilter');blStart('dispFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD>Week:</TD> --- 32,36 ---- %> <script language="JavaScript">blToggleHeader('Filter','dispFilter');blStart('dispFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD>Week:</TD> *************** *** 44,48 **** <TD>Resource:</TD> <TD> ! <html:select property="resource" onchange="document.getElementById('show_instructors').style.display=(this.value=='Room'?'':'none');"> <html:options name="timetableForm" property="resources"/> </html:select> --- 44,48 ---- <TD>Resource:</TD> <TD> ! <html:select property="resource" onchange="document.getElementById('show_instructors').style.display=(this.value=='Room'?'':'none'); document.getElementById('show_events').style.display=(this.value=='Room'?'':'none');"> <html:options name="timetableForm" property="resources"/> </html:select> *************** *** 99,102 **** --- 99,108 ---- </TD> </TR> + <TR id="show_events"> + <TD>Show events:</TD> + <TD> + <html:checkbox property="showEvents"/> + </TD> + </TR> <TR> <TD>Order By:</TD> *************** *** 117,123 **** <logic:notEqual name="timetableForm" property="resource" value="Room"> <script language="JavaScript">document.getElementById('show_instructors').style.display='none';</script> </logic:notEqual> <script language="JavaScript">blEnd('dispFilter');blStartCollapsed('dispFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan='2' align='right'> --- 123,130 ---- <logic:notEqual name="timetableForm" property="resource" value="Room"> <script language="JavaScript">document.getElementById('show_instructors').style.display='none';</script> + <script language="JavaScript">document.getElementById('show_events').style.display='none';</script> </logic:notEqual> <script language="JavaScript">blEnd('dispFilter');blStartCollapsed('dispFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan='2' align='right'> *************** *** 131,135 **** <br><br> <a name='timetable'/> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> --- 138,142 ---- <br><br> <a name='timetable'/> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> *************** *** 172,176 **** <BR> <a name='legend'/> ! <TABLE width="90%" border="0" > <TR> <TD colspan="3"> --- 179,183 ---- <BR> <a name='legend'/> ! <TABLE width="100%" border="0" > <TR> <TD colspan="3"> Index: manageSolvers.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/tt/manageSolvers.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** manageSolvers.jsp 7 Jul 2008 21:13:46 -0000 1.4 --- manageSolvers.jsp 1 Dec 2010 11:10:39 -0000 1.5 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 28,48 **** <html:form action="/manageSolvers"> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <%= request.getAttribute("ManageSolvers.table") %> </TABLE> <BR> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <%= request.getAttribute("ManageSolvers.xtable") %> </TABLE> <BR> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <%= request.getAttribute("ManageSolvers.stable") %> </TABLE> <BR> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <%= request.getAttribute("ManageSolvers.table2") %> </TABLE> <BR> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan='2'><DIV class="WelcomeRowHeadBlank"> </DIV></TD> --- 28,48 ---- <html:form action="/manageSolvers"> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <%= request.getAttribute("ManageSolvers.table") %> </TABLE> <BR> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <%= request.getAttribute("ManageSolvers.xtable") %> </TABLE> <BR> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <%= request.getAttribute("ManageSolvers.stable") %> </TABLE> <BR> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <%= request.getAttribute("ManageSolvers.table2") %> </TABLE> <BR> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan='2'><DIV class="WelcomeRowHeadBlank"> </DIV></TD> Index: changes.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/tt/changes.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** changes.jsp 16 Oct 2008 16:33:28 -0000 1.3 --- changes.jsp 1 Dec 2010 11:10:39 -0000 1.4 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 32,36 **** %> <script language="JavaScript">blToggleHeader('Filter','dispFilter');blStart('dispFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD>Compare with:</TD> --- 32,36 ---- %> <script language="JavaScript">blToggleHeader('Filter','dispFilter');blStart('dispFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD>Compare with:</TD> *************** *** 62,66 **** </TABLE> <script language="JavaScript">blEnd('dispFilter');blStartCollapsed('dispFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan='2' align='right'> --- 62,66 ---- </TABLE> <script language="JavaScript">blEnd('dispFilter');blStartCollapsed('dispFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan='2' align='right'> *************** *** 76,80 **** if (changes!=null) { %> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <%=changes%> <tr> --- 76,80 ---- if (changes!=null) { %> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <%=changes%> <tr> *************** *** 87,91 **** } else { %> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> --- 87,91 ---- } else { %> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> Index: suggestions.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/tt/suggestions.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** suggestions.jsp 17 Jun 2008 21:24:45 -0000 1.2 --- suggestions.jsp 1 Dec 2010 11:10:39 -0000 1.3 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 136,140 **** <logic:equal name="suggestionsForm" property="op" value="close"> <script language="JavaScript" type="text/javascript"> ! window.close(); </script> </logic:equal> --- 136,141 ---- <logic:equal name="suggestionsForm" property="op" value="close"> <script language="JavaScript" type="text/javascript"> ! parent.hideGwtDialog(); ! parent.refreshPage(); </script> </logic:equal> *************** *** 151,155 **** <html:hidden property="timeout" /> <script language="JavaScript">blToggleHeader('Filter','dispSugFilter');blStart('dispSugFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD width='10%'>Display conflict table:</TD> --- 152,156 ---- <html:hidden property="timeout" /> <script language="JavaScript">blToggleHeader('Filter','dispSugFilter');blStart('dispSugFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD width='10%'>Display conflict table:</TD> *************** *** 198,204 **** </table> <script language="JavaScript">blEnd('dispSugFilter');blStartCollapsed('dispSugFilter');</script> - </table> <script language="JavaScript">blEndCollapsed('dispSugFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD width="10%" nowrap>Allow placements:</TD> --- 199,204 ---- </table> <script language="JavaScript">blEnd('dispSugFilter');blStartCollapsed('dispSugFilter');</script> <script language="JavaScript">blEndCollapsed('dispSugFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD width="10%" nowrap>Allow placements:</TD> *************** *** 228,232 **** <TD colspan='2' align='right'> <html:submit onclick="displayLoading();" property="op" title="Apply changes" value="Apply"/> ! <html:button onclick="displayLoading();" accesskey="C" title="Close window (Alt+C)" property="op" value="Close" onclick="window.close();"/> </TD> </TR> --- 228,232 ---- <TD colspan='2' align='right'> <html:submit onclick="displayLoading();" property="op" title="Apply changes" value="Apply"/> ! <html:button onclick="displayLoading();" accesskey="C" title="Close window (Alt+C)" property="op" value="Close" onclick="parent.hideGwtDialog();"/> </TD> </TR> *************** *** 236,240 **** %> <br><br> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> --- 236,240 ---- %> <br><br> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> *************** *** 257,261 **** <logic:equal name="suggestionsForm" property="showFilter" value="false"> <BR><BR> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> --- 257,261 ---- <logic:equal name="suggestionsForm" property="showFilter" value="false"> <BR><BR> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> *************** *** 267,271 **** <TR> <TD> ! <I>No timetable is loaded. However, you can load one <a target='__idContentFrame' href='listSolutions.do' onclick='window.close();'>here</a>.</I> </TD> </TR> --- 267,271 ---- <TR> <TD> ! <I>No timetable is loaded. However, you can load one <a href="" onclick="parent.hideGwtDialog(); parent.location='listSolutions.do';">here</a>.</I> </TD> </TR> *************** *** 286,290 **** %> <BR><BR> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <%=(selectedAssignment==null?"":selectedAssignment)%> <%=(selectedSuggestion==null?"":selectedSuggestion)%> --- 286,290 ---- %> <BR><BR> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <%=(selectedAssignment==null?"":selectedAssignment)%> <%=(selectedSuggestion==null?"":selectedSuggestion)%> *************** *** 295,299 **** %> <BR> ! <TABLE border="0" cellspacing="0" cellpadding="3" width="90%"> <%=selectedInfo%> <TR><TD align='right' colspan='3'> --- 295,299 ---- %> <BR> ! <TABLE border="0" cellspacing="0" cellpadding="3" width="100%"> <%=selectedInfo%> <TR><TD align='right' colspan='3'> *************** *** 312,316 **** %> <BR><BR> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <%=conftable%> </TABLE> --- 312,316 ---- %> <BR><BR> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <%=conftable%> </TABLE> *************** *** 322,329 **** %> <BR><BR> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <%=suggestions%> </TABLE> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD><I><%=(suggestionsMessage==null?"":suggestionsMessage)%></I></TD> --- 322,329 ---- %> <BR><BR> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <%=suggestions%> </TABLE> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD><I><%=(suggestionsMessage==null?"":suggestionsMessage)%></I></TD> *************** *** 343,347 **** %> <BR><BR> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <%=placements%> </TABLE> --- 343,347 ---- %> <BR><BR> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <%=placements%> </TABLE> *************** *** 349,353 **** if (placementsMessage!=null) { %> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR><TD><I><%=placementsMessage%></I></TD></TR> </TABLE> --- 349,353 ---- if (placementsMessage!=null) { %> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR><TD><I><%=placementsMessage%></I></TD></TR> </TABLE> *************** *** 384,388 **** %> <BR> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> --- 384,388 ---- %> <BR> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> Index: history.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/tt/history.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** history.jsp 16 Oct 2008 16:33:28 -0000 1.3 --- history.jsp 1 Dec 2010 11:10:39 -0000 1.4 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 32,36 **** %> <script language="JavaScript">blToggleHeader('Filter','dispFilter');blStart('dispFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD>Simplified mode:</TD> --- 32,36 ---- %> <script language="JavaScript">blToggleHeader('Filter','dispFilter');blStart('dispFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD>Simplified mode:</TD> *************** *** 48,52 **** </TABLE> <script language="JavaScript">blEnd('dispFilter');blStartCollapsed('dispFilter');</script> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan='2' align='right'> --- 48,52 ---- </TABLE> <script language="JavaScript">blEnd('dispFilter');blStartCollapsed('dispFilter');</script> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan='2' align='right'> *************** *** 62,66 **** if (history!=null) { %> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <%=history%> <tr> --- 62,66 ---- if (history!=null) { %> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <%=history%> <tr> *************** *** 73,77 **** } else { %> ! <TABLE width="90%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> --- 73,77 ---- } else { %> ! <TABLE width="100%" border="0" cellspacing="0" cellpadding="3"> <TR> <TD colspan="2"> Index: info.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/tt/info.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** info.jsp 16 Feb 2010 18:02:35 -0000 1.5 --- info.jsp 1 Dec 2010 11:10:39 -0000 1.6 *************** *** 1,9 **** <%-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <%-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --%> <%@ page language="java" autoFlush="true"%> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --%> <%@ page language="java" autoFlush="true"%> *************** *** 40,51 **** <logic:equal name="classInfoForm" property="op" value="Close"> <script language="JavaScript" type="text/javascript"> ! if (document.parentWindow && document.parentWindow.frames[5]) { ! document.parentWindow.frames[5].location = document.parentWindow.frames[5].location+'?backId=<%=classId%>&backType=Class'; ! } ! window.close(); </script> </logic:equal> <tt:confirm name="confirmAssign"><bean:write name="model" property="assignConfirm"/></tt:confirm> ! <table border='0' width='95%'> <tr><td colspan='2'> <tt:section-header> --- 40,49 ---- <logic:equal name="classInfoForm" property="op" value="Close"> <script language="JavaScript" type="text/javascript"> ! parent.hideGwtDialog(); ! parent.refreshPage(); </script> </logic:equal> <tt:confirm name="confirmAssign"><bean:write name="model" property="assignConfirm"/></tt:confirm> ! <table border='0' width='100%'> <tr><td colspan='2'> <tt:section-header> *************** *** 63,66 **** --- 61,67 ---- <tr><td>Number of Rooms:</td><td><bean:write name="clazz" property="numberOfRooms"/></td></tr> <tr><td>Room Ration:</td><td><bean:write name="clazz" property="roomRatio"/> ( Minimum Room Capacity: <bean:write name="clazz" property="minRoomCapacity"/> )</td></tr> + <logic:notEmpty name="clazz" property="datePatternHtml"> + <tr><td>Date Pattern:</td><td><bean:write name="clazz" property="datePatternHtml" filter="false"/></td></tr> + </logic:notEmpty> <logic:notEmpty name="clazz" property="instructors"> <tr><td valign="top">Conflict Checked Instructor(s):</td><td> |
Update of /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/Documentation/Interfaces/Examples Modified Files: posMinorImport.xml posMajorResvImport.xml studentEnrollmentImport.xml studentGroupImport.xml courseCatalogImport.xml eventImportResponse.xml courseOfferingWithExamsExport.xml studentAccomodationImport.xml buildingRoomImport.xml courseOfferingExport.xml studentSectioningNotification.xml studentInfoImport.xml acadAreaResvImport.xml studentGroupResvImport.xml eventLoad.xml departmentImport.xml studentSectioningResponse.xml crsOfferResvImport.xml studentCrsDemandImport.xml subjectAreaImport.xml staffImport.xml studentSectioningRequest.xml sessionImport.xml academicClassificationImport.xml posMajorImport.xml academicAreaImport.xml courseOfferingWithExamsImport.xml eventImportRequest.xml courseTimetableExport.xml Added Files: curricula.xml woebegonStudents.xml Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: courseTimetableExport.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/courseTimetableExport.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** courseTimetableExport.xml 17 Jun 2008 21:24:36 -0000 1.4 --- courseTimetableExport.xml 1 Dec 2010 11:10:37 -0000 1.5 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: eventLoad.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/eventLoad.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** eventLoad.xml 14 Oct 2009 20:03:17 -0000 1.2 --- eventLoad.xml 1 Dec 2010 11:10:37 -0000 1.3 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2009, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2009 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: posMinorImport.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/posMinorImport.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** posMinorImport.xml 17 Jun 2008 21:24:33 -0000 1.3 --- posMinorImport.xml 1 Dec 2010 11:10:37 -0000 1.4 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: posMajorImport.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/posMajorImport.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** posMajorImport.xml 17 Jun 2008 21:24:36 -0000 1.3 --- posMajorImport.xml 1 Dec 2010 11:10:37 -0000 1.4 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: eventImportResponse.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/eventImportResponse.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** eventImportResponse.xml 17 Jun 2008 21:24:36 -0000 1.3 --- eventImportResponse.xml 1 Dec 2010 11:10:37 -0000 1.4 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: courseCatalogImport.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/courseCatalogImport.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** courseCatalogImport.xml 17 Jun 2008 21:24:36 -0000 1.3 --- courseCatalogImport.xml 1 Dec 2010 11:10:37 -0000 1.4 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: sessionImport.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/sessionImport.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** sessionImport.xml 14 Oct 2009 19:49:26 -0000 1.4 --- sessionImport.xml 1 Dec 2010 11:10:37 -0000 1.5 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: eventImportRequest.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/eventImportRequest.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** eventImportRequest.xml 17 Jun 2008 21:24:36 -0000 1.3 --- eventImportRequest.xml 1 Dec 2010 11:10:37 -0000 1.4 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: academicAreaImport.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/academicAreaImport.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** academicAreaImport.xml 17 Jun 2008 21:24:36 -0000 1.3 --- academicAreaImport.xml 1 Dec 2010 11:10:37 -0000 1.4 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: studentSectioningResponse.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/studentSectioningResponse.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** studentSectioningResponse.xml 17 Jun 2008 21:24:33 -0000 1.3 --- studentSectioningResponse.xml 1 Dec 2010 11:10:37 -0000 1.4 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: studentGroupResvImport.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/studentGroupResvImport.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** studentGroupResvImport.xml 17 Jun 2008 21:24:33 -0000 1.3 --- studentGroupResvImport.xml 1 Dec 2010 11:10:37 -0000 1.4 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> <!-- groupReservation ==> Required: subject, courseNumber {Instructional Offering identification} --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> <!-- groupReservation ==> Required: subject, courseNumber {Instructional Offering identification} Index: posMajorResvImport.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/posMajorResvImport.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** posMajorResvImport.xml 17 Jun 2008 21:24:33 -0000 1.3 --- posMajorResvImport.xml 1 Dec 2010 11:10:37 -0000 1.4 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: staffImport.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/staffImport.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** staffImport.xml 17 Jun 2008 21:24:36 -0000 1.3 --- staffImport.xml 1 Dec 2010 11:10:37 -0000 1.4 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: crsOfferResvImport.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/crsOfferResvImport.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** crsOfferResvImport.xml 17 Jun 2008 21:24:36 -0000 1.3 --- crsOfferResvImport.xml 1 Dec 2010 11:10:37 -0000 1.4 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: studentSectioningRequest.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/studentSectioningRequest.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** studentSectioningRequest.xml 17 Jun 2008 21:24:36 -0000 1.3 --- studentSectioningRequest.xml 1 Dec 2010 11:10:37 -0000 1.4 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: academicClassificationImport.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/academicClassificationImport.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** academicClassificationImport.xml 17 Jun 2008 21:24:36 -0000 1.3 --- academicClassificationImport.xml 1 Dec 2010 11:10:37 -0000 1.4 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: subjectAreaImport.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/subjectAreaImport.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** subjectAreaImport.xml 17 Jun 2008 21:24:36 -0000 1.3 --- subjectAreaImport.xml 1 Dec 2010 11:10:37 -0000 1.4 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: courseOfferingWithExamsExport.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/courseOfferingWithExamsExport.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** courseOfferingWithExamsExport.xml 17 Jun 2008 21:24:36 -0000 1.5 --- courseOfferingWithExamsExport.xml 1 Dec 2010 11:10:37 -0000 1.6 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: studentCrsDemandImport.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/studentCrsDemandImport.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** studentCrsDemandImport.xml 15 Mar 2009 23:29:50 -0000 1.4 --- studentCrsDemandImport.xml 1 Dec 2010 11:10:37 -0000 1.5 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: departmentImport.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/departmentImport.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** departmentImport.xml 17 Jun 2008 21:24:33 -0000 1.3 --- departmentImport.xml 1 Dec 2010 11:10:37 -0000 1.4 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> --- NEW FILE: woebegonStudents.xml --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE request PUBLIC "-//UniTime//DTD University Course Timetabling/EN" "http://www.unitime.org/interface/StudentSectioning.dtd"> <!-- * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * --> <request campus='woebegon' year='2010' term='Fal'> <student key='1001'> <updateDemographics> <name first='Andrew' middle='' last='Student'/> <acadArea abbv='A' classification='02'> <major code='M3'/> </acadArea> </updateDemographics> <updateCourseRequests commit='true'> <courseOffering subjectArea='ALG' courseNumber='101'/> <courseOffering subjectArea='COM' courseNumber='101'/> <courseOffering subjectArea='PSY' courseNumber='101'/> <courseOffering subjectArea='ECON' courseNumber='101'/> <courseOffering subjectArea='SOC' courseNumber='101'/> </updateCourseRequests> </student> <student key='1002'> <updateDemographics> <name first='Brian' middle='' last='Student'/> <acadArea abbv='A' classification='02'> <major code='M3'/> </acadArea> </updateDemographics> <updateCourseRequests commit='true'> <courseOffering subjectArea='ALG' courseNumber='101'/> <courseOffering subjectArea='COM' courseNumber='101'/> <courseOffering subjectArea='PSY' courseNumber='101'/> <courseOffering subjectArea='ECON' courseNumber='101'/> <courseOffering subjectArea='GER' courseNumber='101'/> </updateCourseRequests> </student> <student key='1003'> <updateDemographics> <name first='Charles' middle='' last='Student'/> <acadArea abbv='A' classification='02'> <major code='M2'/> </acadArea> </updateDemographics> <updateCourseRequests commit='true'> <courseOffering subjectArea='CALC' courseNumber='101'/> <courseOffering subjectArea='ENGL' courseNumber='101'/> <courseOffering subjectArea='PSY' courseNumber='101'/> <courseOffering subjectArea='ECON' courseNumber='101'/> <courseOffering subjectArea='C S' courseNumber='101'/> </updateCourseRequests> </student> <student key='1004'> <updateDemographics> <name first='David' middle='' last='Student'/> <acadArea abbv='A' classification='01'> <major code='M1'/> </acadArea> </updateDemographics> <updateCourseRequests commit='true'> <courseOffering subjectArea='BIOL' courseNumber='101'/> <courseOffering subjectArea='CHM' courseNumber='101'/> <courseOffering subjectArea='CALC' courseNumber='101'/> <courseOffering subjectArea='PHAR' courseNumber='101'/> <courseOffering subjectArea='ENGL' courseNumber='101'/> </updateCourseRequests> </student> <student key='1005'> <updateDemographics> <name first='Edward' middle='' last='Student'/> <acadArea abbv='A' classification='01'> <major code='M1'/> </acadArea> </updateDemographics> <updateCourseRequests commit='true'> <courseOffering subjectArea='BIOL' courseNumber='101'/> <courseOffering subjectArea='CHM' courseNumber='101'/> <courseOffering subjectArea='CALC' courseNumber='101'/> <courseOffering subjectArea='PHAR' courseNumber='101'/> <courseOffering subjectArea='ENGL' courseNumber='101'/> </updateCourseRequests> </student> <student key='1006'> <updateDemographics> <name first='Frank' middle='' last='Student'/> <acadArea abbv='A' classification='01'> <major code='M1'/> </acadArea> </updateDemographics> <updateCourseRequests commit='true'> <courseOffering subjectArea='BIOL' courseNumber='101'/> <courseOffering subjectArea='CHM' courseNumber='101'/> <courseOffering subjectArea='CALC' courseNumber='101'/> <courseOffering subjectArea='PHAR' courseNumber='101'/> <courseOffering subjectArea='ENGL' courseNumber='101'/> </updateCourseRequests> </student> <student key='1007'> <updateDemographics> <name first='George' middle='' last='Student'/> <acadArea abbv='A' classification='01'> <major code='M2'/> </acadArea> </updateDemographics> <updateCourseRequests commit='true'> <courseOffering subjectArea='CHM' courseNumber='101'/> <courseOffering subjectArea='PHYS' courseNumber='101'/> <courseOffering subjectArea='ENGR' courseNumber='101'/> <courseOffering subjectArea='CALC' courseNumber='101'/> <courseOffering subjectArea='COM' courseNumber='101'/> <courseOffering subjectArea='BAND' courseNumber='101'/> </updateCourseRequests> </student> <student key='1008'> <updateDemographics> <name first='Henry' middle='' last='Student'/> <acadArea abbv='A' classification='01'> <major code='M2'/> </acadArea> </updateDemographics> <updateCourseRequests commit='true'> <courseOffering subjectArea='CHM' courseNumber='101'/> <courseOffering subjectArea='BIOL' courseNumber='101'/> <courseOffering subjectArea='ENGR' courseNumber='101'/> <courseOffering subjectArea='CALC' courseNumber='101'/> <courseOffering subjectArea='COM' courseNumber='101'/> </updateCourseRequests> </student> <student key='1009'> <updateDemographics> <name first='Ivan' middle='' last='Student'/> <acadArea abbv='A' classification='01'> <major code='M2'/> </acadArea> </updateDemographics> <updateCourseRequests commit='true'> <courseOffering subjectArea='CHM' courseNumber='101'/> <courseOffering subjectArea='PHYS' courseNumber='101'/> <courseOffering subjectArea='ENGR' courseNumber='101'/> <courseOffering subjectArea='CALC' courseNumber='101'/> <courseOffering subjectArea='ENGL' courseNumber='101'/> </updateCourseRequests> </student> <student key='1010'> <updateDemographics> <name first='James' middle='' last='Student'/> <acadArea abbv='A' classification='01'> <major code='M2'/> </acadArea> </updateDemographics> <updateCourseRequests commit='true'> <courseOffering subjectArea='CHM' courseNumber='101'/> <courseOffering subjectArea='PHYS' courseNumber='101'/> <courseOffering subjectArea='C S' courseNumber='101'/> <courseOffering subjectArea='CALC' courseNumber='101'/> <courseOffering subjectArea='ENGL' courseNumber='101'/> </updateCourseRequests> </student> <student key='1011'> <updateDemographics> <name first='Kevin' middle='' last='Student'/> <acadArea abbv='A' classification='02'> <major code='M1'/> </acadArea> </updateDemographics> <updateCourseRequests commit='true'> <courseOffering subjectArea='BIOL' courseNumber='101'/> <courseOffering subjectArea='COM' courseNumber='101'/> <courseOffering subjectArea='POL' courseNumber='101'/> <courseOffering subjectArea='PSY' courseNumber='101'/> <courseOffering subjectArea='SPAN' courseNumber='101'/> </updateCourseRequests> </student> <student key='1012'> <updateDemographics> <name first='Larry' middle='' last='Student'/> <acadArea abbv='A' classification='02'> <major code='M1'/> </acadArea> </updateDemographics> <updateCourseRequests commit='true'> <courseOffering subjectArea='COM' courseNumber='101'/> <courseOffering subjectArea='ENGL' courseNumber='101'/> <courseOffering subjectArea='GER' courseNumber='101'/> <courseOffering subjectArea='PHIL' courseNumber='101'/> <courseOffering subjectArea='HIST' courseNumber='101'/> <courseOffering subjectArea='BAND' courseNumber='101'/> </updateCourseRequests> </student> <student key='1013'> <updateDemographics> <name first='Michael' middle='' last='Student'/> <acadArea abbv='A' classification='02'> <major code='M1'/> </acadArea> </updateDemographics> <updateCourseRequests commit='true'> <courseOffering subjectArea='SOC' courseNumber='101'/> <courseOffering subjectArea='HIST' courseNumber='101'/> <courseOffering subjectArea='LING' courseNumber='101'/> <courseOffering subjectArea='PHIL' courseNumber='101'/> <courseOffering subjectArea='PHYS' courseNumber='101'/> </updateCourseRequests> </student> <student key='1014'> <updateDemographics> <name first='Norman' middle='' last='Student'/> <acadArea abbv='A' classification='02'> <major code='M1'/> </acadArea> </updateDemographics> <updateCourseRequests commit='true'> <courseOffering subjectArea='BIOL' courseNumber='101'/> <courseOffering subjectArea='MBIO' courseNumber='101'/> <courseOffering subjectArea='CHM' courseNumber='101'/> <courseOffering subjectArea='CALC' courseNumber='101'/> <courseOffering subjectArea='ENGL' courseNumber='101'/> </updateCourseRequests> </student> <student key='1015'> <updateDemographics> <name first='Oscar' middle='' last='Student'/> <acadArea abbv='A' classification='01'> <major code='M3'/> </acadArea> </updateDemographics> <updateCourseRequests commit='true'> <courseOffering subjectArea='BIOL' courseNumber='101'/> <courseOffering subjectArea='MBIO' courseNumber='101'/> <courseOffering subjectArea='CHM' courseNumber='101'/> <courseOffering subjectArea='CALC' courseNumber='101'/> <courseOffering subjectArea='GER' courseNumber='101'/> </updateCourseRequests> </student> <student key='1016'> <updateDemographics> <name first='Peter' middle='' last='Student'/> <acadArea abbv='A' classification='01'> <major code='M3'/> </acadArea> </updateDemographics> <updateCourseRequests commit='true'> <courseOffering subjectArea='BIOL' courseNumber='101'/> <courseOffering subjectArea='MBIO' courseNumber='101'/> <courseOffering subjectArea='CHM' courseNumber='101'/> <courseOffering subjectArea='CALC' courseNumber='101'/> <courseOffering subjectArea='SPAN' courseNumber='101'/> </updateCourseRequests> </student> <student key='1017'> <updateDemographics> <name first='Richard' middle='' last='Student'/> <acadArea abbv='A' classification='01'> <major code='M1'/> </acadArea> </updateDemographics> <updateCourseRequests commit='true'> <courseOffering subjectArea='POL' courseNumber='101'/> <courseOffering subjectArea='BIOL' courseNumber='101'/> <courseOffering subjectArea='CHM' courseNumber='101'/> <courseOffering subjectArea='ENGL' courseNumber='101'/> <courseOffering subjectArea='SPAN' courseNumber='101'/> </updateCourseRequests> </student> <student key='1018'> <updateDemographics> <name first='Steve' middle='' last='Student'/> <acadArea abbv='A' classification='01'> <major code='M1'/> </acadArea> </updateDemographics> <updateCourseRequests commit='true'> <courseOffering subjectArea='HIST' courseNumber='101'/> <courseOffering subjectArea='BIOL' courseNumber='101'/> <courseOffering subjectArea='CHM' courseNumber='101'/> <courseOffering subjectArea='ENGL' courseNumber='101'/> <courseOffering subjectArea='GER' courseNumber='101'/> </updateCourseRequests> </student> <student key='1019'> <updateDemographics> <name first='Thomas' middle='' last='Student'/> <acadArea abbv='A' classification='02'> <major code='M2'/> </acadArea> </updateDemographics> <updateCourseRequests commit='true'> <courseOffering subjectArea='C S' courseNumber='101'/> <courseOffering subjectArea='PHYS' courseNumber='101'/> <courseOffering subjectArea='CALC' courseNumber='101'/> <courseOffering subjectArea='COM' courseNumber='101'/> <courseOffering subjectArea='POL' courseNumber='101'/> </updateCourseRequests> </student> </request> Index: studentGroupImport.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/studentGroupImport.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** studentGroupImport.xml 17 Jun 2008 21:24:36 -0000 1.3 --- studentGroupImport.xml 1 Dec 2010 11:10:37 -0000 1.4 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: courseOfferingExport.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/courseOfferingExport.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** courseOfferingExport.xml 8 Dec 2009 19:08:32 -0000 1.5 --- courseOfferingExport.xml 1 Dec 2010 11:10:37 -0000 1.6 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> *************** *** 29,40 **** <course subject="A&AE" courseNbr="101H" controlling="false" title="" scheduleBookNote=""/> <config name="1" limit="20"> ! <subpart type="Lec" suffix="" minPerWeek="100"> <subpartCredit creditType="collegiate" creditUnitType="semesterHours" creditFormat="fixedUnit" fixedCredit="1"/> ! <subpart type="Rec" suffix="" minPerWeek="50"> <subpartCredit creditType="collegiate" creditUnitType="semesterHours" creditFormat="fixedUnit" fixedCredit="1"/> </subpart> <subpart type="Lab" suffix="" minPerWeek="100"> <subpartCredit creditType="collegiate" creditUnitType="semesterHours" creditFormat="fixedUnit" fixedCredit="1"/> - <subpart type="Lab" suffix="a" minPerWeek="50"/> </subpart> </subpart> --- 29,40 ---- <course subject="A&AE" courseNbr="101H" controlling="false" title="" scheduleBookNote=""/> <config name="1" limit="20"> ! <subpart type="Lec" suffix="" minPerWeek="50"> <subpartCredit creditType="collegiate" creditUnitType="semesterHours" creditFormat="fixedUnit" fixedCredit="1"/> ! <subpart type="Rec" suffix="" minPerWeek="100"> <subpartCredit creditType="collegiate" creditUnitType="semesterHours" creditFormat="fixedUnit" fixedCredit="1"/> + <subpart type="Rec" suffix="a" minPerWeek="50"/> </subpart> <subpart type="Lab" suffix="" minPerWeek="100"> <subpartCredit creditType="collegiate" creditUnitType="semesterHours" creditFormat="fixedUnit" fixedCredit="1"/> </subpart> </subpart> Index: studentEnrollmentImport.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/studentEnrollmentImport.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** studentEnrollmentImport.xml 17 Jun 2008 21:24:34 -0000 1.3 --- studentEnrollmentImport.xml 1 Dec 2010 11:10:37 -0000 1.4 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: studentAccomodationImport.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/studentAccomodationImport.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** studentAccomodationImport.xml 17 Jun 2008 21:24:36 -0000 1.3 --- studentAccomodationImport.xml 1 Dec 2010 11:10:37 -0000 1.4 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> --- NEW FILE: curricula.xml --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE curricula PUBLIC "-//UniTime//DTD University Course Timetabling/EN" "http://www.unitime.org/interface/Curricula_3_2.dtd"> <!-- * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * --> <curricula campus="PWL" year="2010" term="Spring" created="Fri Jul 02 17:32:09 CEST 2010"> <curriculum abbreviation="A/AGEC,AGFN" name="Agriculture / Agricultural Economics & Finance"> <!-- one academic area is required --> <!-- academic area usually corresponds to a school, faculty, etc. --> <academicArea abbreviation="A"/> <!-- department is optional --> <!-- only curriculum or scheduling managers of this department are able to edit this curriculum --> <!-- if none is provided, one is computed based on the courses of the curriculum (controlling department with highest enrollment within the curriculum) --> <department code="1145"/> <!-- there can be more than one major, but all of them have to be of the same academic area --> <!-- no major means all majors of the academic area --> <!-- major usually corresponds to a particular field of study, e.g., Agricultural Economics and Agricultural Finance --> <major code="AGEC"/> <major code="AGFN"/> <!-- name is optional (defaults to the academic classification code), enrollment is required --> <classification name="03" enrollment="15"> <!-- exactly one academic classification --> <!-- academic classification usually corresponds to a year / semester of study (e.g., First Semester Sophmore --> <academicClassification code="03"/> <!-- list of courses --> <!-- fields subject and courseNbr are required, share defaults to 1.0 --> <!-- share is a percentage of the students of this classification (within this curriculum) that are expected to attend the course (1.0 ~ all students of the classification, 0.0 ~ none) --> <course subject="AGEC" courseNbr="21700" share="0.5385"/> <course subject="ENGL" courseNbr="10600A" share="0.4615"/> <course subject="AGEC" courseNbr="20200" share="0.3846"> <!-- groups are optional, and there to be able to express some relations between these courses --> <!-- only id is required (group id needs to be unique only within the curriculum, type defaults to OPT) --> <!-- type == OPT .. group is optional (e.g., students should attend one of these courses) this means there there are no student conflicts between courses of this group within this curriculum type == REQ .. group is required (e.g., students taking one course of this group are required to take at least some other one of this group) this means that there are always conflicts between courses of this group within this curriculum --> <group id="1" name="O 04 4" type="OPT"/> </course> <course subject="COM" courseNbr="11400A" share="0.3077"> <group id="1" name="O 04 4" type="OPT"/> </course> <course subject="PSY" courseNbr="12000B" share="0.0769"/> </classification> <classification name="05" enrollment="10"> <academicClassification code="05"/> <course subject="AGEC" courseNbr="21700" share="0.4444"> <group id="1" name="O 04 4" type="OPT"/> </course> <!-- ... --> </classification> <!-- ... --> </curriculum> <!-- external ids may be also provided --> <curriculum abbreviation="A/ANPD" name="Agriculture / Animal Products"> <academicArea externalId="A" abbreviation="A"/> <department externalId="1392" code="1392"/> <major externalId="ANPD" code="ANPD"/> <classification name="04" enrollment="3"> <academicClassification externalId="04" code="04"/> <course externalId="ANSC18100OrientationToAnSci" subject="ANSC" courseNbr="18100" share="1.0000"/> <course externalId="BIOL11100FundamentalsBiolII" subject="BIOL" courseNbr="11100" share="1.0000"/> <course externalId="COM11400FundamentOfSpeech" subject="COM" courseNbr="11400A" share="0.6667"/> </classification> <classification name="07" enrollment="1"> <academicClassification externalId="07" code="07"/> <course externalId="BIOL22100IntroToMicrobiology" subject="BIOL" courseNbr="22100" share="1.0000"/> <course externalId="AGEC33000MgmtMethodsAgrBus" subject="AGEC" courseNbr="33000" share="1.0000"/> <course externalId="ANSC32400AppldAnimalNutrition" subject="ANSC" courseNbr="32400" share="1.0000"/> <course externalId="ANSC49500LdrshpForADiverseWorkplace" subject="ANSC" courseNbr="49500A" share="1.0000"/> <course externalId="PSY12000ElementaryPsychology" subject="PSY" courseNbr="12000B" share="1.0000"/> </classification> <!-- ... --> </curriculum> <!-- an example with only required fields --> <curriculum> <academicArea abbreviation="A"/> <major code="FDSC"/> <classification enrollment="4"> <academicClassification code="02"/> <course subject="COM" courseNbr="11400A"/> <course subject="BIOL" courseNbr="11100"/> </classification> <classification enrollment="4"> <academicClassification code="03"/> <course subject="COM" courseNbr="11400A" share="0.3333"> <group id="1"/> </course> <course subject="CHM" courseNbr="11500" share="0.6667"> <group id="1"/> </course> </classification> <!-- ... --> </curriculum> <!-- ... --> </curricula> Index: buildingRoomImport.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/Interfaces/Examples/buildingRoomImport.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** buildingRoomImport.xml 17 Jun 2008 21:24:36 -0000 1.3 --- buildingRoomImport.xml 1 Dec 2010 11:10:37 -0000 1.4 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by !... [truncated message content] |
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/dataexchange In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/JavaSource/org/unitime/timetable/dataexchange Modified Files: EventRelatedImports.java PosMajorImport.java CourseOfferingExport.java BaseImport.java DepartmentImport.java EventImport.java StudentEnrollmentImport.java StudentImport.java CourseOfferingReservationImport.java AcademicAreaImport.java CourseCatalogImport.java DataExchangeHelper.java BuildingRoomImport.java CourseTimetableExport.java PosMinorImport.java BaseCourseOfferingImport.java SessionImport.java AcademicClassificationImport.java LastLikeCourseDemandImport.java StudentSectioningImport.java StaffImport.java BaseExport.java SubjectAreaImport.java AcadAreaReservationImport.java CourseOfferingImport.java Added Files: CurriculaExport.java CurriculaImport.java Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: EventImport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/dataexchange/EventImport.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EventImport.java 28 Jan 2009 18:50:12 -0000 1.1 --- EventImport.java 1 Dec 2010 11:10:35 -0000 1.2 *************** *** 1,9 **** /* * UniTime 3.1 (University Course Timetabling & Student Sectioning Application) ! * Copyright (C) 2009, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* * UniTime 3.1 (University Course Timetabling & Student Sectioning Application) ! * Copyright (C) 2009 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ *************** *** 97,103 **** beginTransaction(); - if (manager == null){ - manager = findDefaultManager(); - } if (session == null){ // Use the session for the academicInitiative that is effective for events now as the session to use for logging changes --- 97,100 ---- *************** *** 106,110 **** if (created != null) { addNote("Loading Events XML file created on: " + created); ! ChangeLog.addChange(getHibSession(), manager, session, session, created, ChangeLog.Source.DATA_IMPORT_EVENTS, ChangeLog.Operation.CREATE, null, null); updateChangeList(true); } --- 103,107 ---- if (created != null) { addNote("Loading Events XML file created on: " + created); ! ChangeLog.addChange(getHibSession(), getManager(), session, session, created, ChangeLog.Source.DATA_IMPORT_EVENTS, ChangeLog.Operation.CREATE, null, null); updateChangeList(true); } Index: CourseTimetableExport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/dataexchange/CourseTimetableExport.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CourseTimetableExport.java 16 Jul 2007 19:50:41 -0000 1.1 --- CourseTimetableExport.java 1 Dec 2010 11:10:35 -0000 1.2 *************** *** 1,2 **** --- 1,21 ---- + /* + * UniTime 3.2 (University Timetabling Application) + * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors + * as indicated by the @authors tag. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ package org.unitime.timetable.dataexchange; *************** *** 65,68 **** --- 84,89 ---- for (Iterator i=clazz.getClassInstructors().iterator();i.hasNext();) { ClassInstructor instructor = (ClassInstructor)i.next(); + if (instructor.getInstructor().getExternalUniqueId()!=null) + exportInstructor(classElement.addElement("instructor"), instructor, session); } } Index: StudentSectioningImport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/dataexchange/StudentSectioningImport.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** StudentSectioningImport.java 18 Aug 2010 18:04:21 -0000 1.4 --- StudentSectioningImport.java 1 Dec 2010 11:10:35 -0000 1.5 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.dataexchange; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.dataexchange; *************** *** 225,229 **** PosMajor major = PosMajor.findByCodeAcadAreaId(student.getSession().getUniqueId(), majorCode, area.getUniqueId()); if (major==null) { ! warn("Major "+code+" not found."); continue; } student.getPosMajors().add(major); --- 225,229 ---- PosMajor major = PosMajor.findByCodeAcadAreaId(student.getSession().getUniqueId(), majorCode, area.getUniqueId()); if (major==null) { ! warn("Major "+majorCode+" not found."); continue; } student.getPosMajors().add(major); *************** *** 234,238 **** PosMinor minor = PosMinor.findByCodeAcadAreaId(student.getSession().getUniqueId(), minorCode, area.getUniqueId()); if (minor==null) { ! warn("Major "+code+" not found."); continue; } student.getPosMinors().add(minor); --- 234,238 ---- PosMinor minor = PosMinor.findByCodeAcadAreaId(student.getSession().getUniqueId(), minorCode, area.getUniqueId()); if (minor==null) { ! warn("Major "+minorCode+" not found."); continue; } student.getPosMinors().add(minor); *************** *** 284,291 **** } int startSlot = (((Integer.parseInt(startTime)/100)*60 + Integer.parseInt(startTime)%100) - Constants.FIRST_SLOT_TIME_MIN)/Constants.SLOT_LENGTH_MIN; - int breakTime = 0; int nrSlots = 0; if (length!=null) { - breakTime = Integer.parseInt(length) - ((Integer.parseInt(endTime)/100)*60 + Integer.parseInt(endTime)%100) + ((Integer.parseInt(startTime)/100)*60 + Integer.parseInt(startTime)%100); nrSlots = Integer.parseInt(length) / Constants.SLOT_LENGTH_MIN; } else { --- 284,289 ---- Index: DepartmentImport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/dataexchange/DepartmentImport.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DepartmentImport.java 17 Jun 2008 21:24:49 -0000 1.2 --- DepartmentImport.java 1 Dec 2010 11:10:35 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.dataexchange; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.dataexchange; Index: BuildingRoomImport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/dataexchange/BuildingRoomImport.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** BuildingRoomImport.java 17 Jun 2008 21:24:49 -0000 1.8 --- BuildingRoomImport.java 1 Dec 2010 11:10:35 -0000 1.9 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.dataexchange; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.dataexchange; *************** *** 30,34 **** import org.unitime.timetable.model.RoomType; import org.unitime.timetable.model.Session; - import org.unitime.timetable.model.TimetableManager; --- 30,33 ---- *************** *** 39,45 **** */ public class BuildingRoomImport extends BaseImport { ! ! TimetableManager manager = null; ! private static int BATCH_SIZE = 100; public BuildingRoomImport() { --- 38,42 ---- */ public class BuildingRoomImport extends BaseImport { ! private static int BATCH_SIZE = 100; public BuildingRoomImport() { *************** *** 58,66 **** throw new Exception("No session found for the given campus, year, and term."); } - if (manager == null){ - manager = findDefaultManager(); - } if (created != null) { ! ChangeLog.addChange(getHibSession(), manager, session, session, created, ChangeLog.Source.DATA_IMPORT_EXT_BUILDING_ROOM, ChangeLog.Operation.UPDATE, null, null); } /* --- 55,60 ---- throw new Exception("No session found for the given campus, year, and term."); } if (created != null) { ! ChangeLog.addChange(getHibSession(), getManager(), session, session, created, ChangeLog.Source.DATA_IMPORT_EXT_BUILDING_ROOM, ChangeLog.Operation.UPDATE, null, null); } /* *************** *** 88,93 **** building.setExternalUniqueId(element.attributeValue("externalId")); building.setAbbreviation(element.attributeValue("abbreviation")); ! building.setCoordinateX(Integer.decode(element.attributeValue("locationX"))); ! building.setCoordinateY(Integer.decode(element.attributeValue("locationY"))); building.setDisplayName(element.attributeValue("name")); building.setSession(session); --- 82,87 ---- building.setExternalUniqueId(element.attributeValue("externalId")); building.setAbbreviation(element.attributeValue("abbreviation")); ! building.setCoordinateX(element.attributeValue("locationX") == null ? null : Double.valueOf(element.attributeValue("locationX"))); ! building.setCoordinateY(element.attributeValue("locationY") == null ? null : Double.valueOf(element.attributeValue("locationY"))); building.setDisplayName(element.attributeValue("name")); building.setSession(session); *************** *** 104,112 **** ExternalRoom room = new ExternalRoom(); room.setExternalUniqueId(element.attributeValue("externalId")); ! room.setCoordinateX(Integer.decode(element.attributeValue("locationX"))); ! room.setCoordinateY(Integer.decode(element.attributeValue("locationY"))); room.setRoomNumber(element.attributeValue("roomNumber")); ! room.setClassification(element.attributeValue("roomClassification")); ! room.setCapacity(Integer.decode(element.attributeValue("capacity"))); String examCapacityStr = element.attributeValue("examCapacity"); if (examCapacityStr != null && examCapacityStr.trim().length() > 0){ --- 98,110 ---- ExternalRoom room = new ExternalRoom(); room.setExternalUniqueId(element.attributeValue("externalId")); ! room.setCoordinateX(element.attributeValue("locationX") == null ? building.getCoordinateX() : Double.valueOf(element.attributeValue("locationX"))); ! room.setCoordinateY(element.attributeValue("locationY") == null ? building.getCoordinateY() : Double.valueOf(element.attributeValue("locationY"))); room.setRoomNumber(element.attributeValue("roomNumber")); ! room.setClassification(element.attributeValue("roomClassification", "")); ! if (room.getClassification().length() > 20) { ! warn("Room classification " + room.getClassification() + " is too long, truncated to " + room.getClassification().substring(0, 20)); ! room.setClassification(room.getClassification().substring(0, 20)); ! } ! room.setCapacity(Integer.decode(element.attributeValue("capacity", "0"))); String examCapacityStr = element.attributeValue("examCapacity"); if (examCapacityStr != null && examCapacityStr.trim().length() > 0){ *************** *** 117,121 **** --- 115,127 ---- room.setIsInstructional(Boolean.valueOf(element.attributeValue("instructional"))); room.setRoomType(RoomType.findByReference(element.attributeValue("scheduledRoomType"))); + if (room.getRoomType() == null) { + room.setRoomType(RoomType.findByReference(element.attributeValue("roomClassification"))); + if (room.getRoomType() == null) { + warn("Invalid scheduled room type '" + element.attributeValue("scheduledRoomType", element.attributeValue("roomClassification")) + "' for room " + building.getAbbreviation() + " " + room.getRoomNumber() + ", using " + RoomType.findAll(true).first().getReference() + " instead."); + room.setRoomType(RoomType.findAll(true).first()); + } + } room.setBuilding(building); + room.setDisplayName(element.attributeValue("displayName")); building.addTorooms(room); getHibSession().save(room); *************** *** 156,159 **** --- 162,169 ---- throw new Exception("Room feature name for room " + room.getExternalUniqueId() + " not present."); feature.setValue(element.attributeValue("value")); + if (feature.getValue() != null && feature.getValue().length() > 20) { + warn("Feature value " + feature.getValue() + " is too long, truncated to " + feature.getValue().substring(0, 20)); + feature.setValue(feature.getValue().substring(0, 20)); + } feature.setRoom(room); room.addToroomFeatures(feature); Index: CourseOfferingImport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/dataexchange/CourseOfferingImport.java,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** CourseOfferingImport.java 3 Jun 2009 01:20:20 -0000 1.31 --- CourseOfferingImport.java 1 Dec 2010 11:10:35 -0000 1.32 *************** *** 5,9 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 5,9 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.dataexchange; --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.dataexchange; Index: EventRelatedImports.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/dataexchange/EventRelatedImports.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EventRelatedImports.java 28 Jan 2009 18:50:12 -0000 1.1 --- EventRelatedImports.java 1 Dec 2010 11:10:35 -0000 1.2 *************** *** 1,9 **** /* * UniTime 3.1 (University Course Timetabling & Student Sectioning Application) ! * Copyright (C) 2009, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* * UniTime 3.1 (University Course Timetabling & Student Sectioning Application) ! * Copyright (C) 2009 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,24 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.dataexchange; - import java.io.IOException; import java.text.SimpleDateFormat; import java.util.ArrayList; --- 14,23 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.dataexchange; import java.text.SimpleDateFormat; import java.util.ArrayList; *************** *** 35,39 **** import org.unitime.timetable.model.Meeting; import org.unitime.timetable.model.Session; - import org.unitime.timetable.model.TimetableManager; import org.unitime.timetable.util.CalendarUtils; import org.unitime.timetable.util.Constants; --- 34,37 ---- *************** *** 49,53 **** protected TreeSet<String> missingLocations = new TreeSet<String>(); protected Vector<String> notes = new Vector<String>(); - protected TimetableManager manager = null; protected String dateFormat = null; protected boolean trimLeadingZerosFromExternalId = false; --- 47,50 ---- *************** *** 100,123 **** protected void mailLoadResults(){ - Email email = new Email(); - - String subject = getEmailSubject(); //"Course Offering Import Results"; - String mail = ""; - for (Iterator<String> it = changeList.iterator(); it.hasNext(); ){ - mail += (String) it.next() + "\n"; - } - try { ! email.sendMail( ! (String)ApplicationProperties.getProperty("tmtbl.smtp.host", "smtp.purdue.edu"), ! (String)ApplicationProperties.getProperty("tmtbl.smtp.domain", "smtp.purdue.edu"), ! (String)ApplicationProperties.getProperty("tmtbl.inquiry.sender", "sm...@pu..."), ! (manager != null?manager.getEmailAddress():(String)ApplicationProperties.getProperty("tmtbl.inquiry.sender", "sm...@pu...")), ! (String)ApplicationProperties.getProperty("tmtbl.inquiry.email","sm...@pu..."), ! "Timetabling (Data Import): "+subject, ! mail, ! new Vector<Object>()); ! } catch (IOException e) { ! e.printStackTrace(); } } --- 97,118 ---- protected void mailLoadResults(){ try { ! Email email = new Email(); ! email.setSubject("UniTime (Data Import): " + getEmailSubject()); ! ! String mail = ""; ! for (Iterator<String> it = changeList.iterator(); it.hasNext(); ){ ! mail += (String) it.next() + "\n"; ! } ! email.setText(mail); ! ! email.addRecipient(getManager().getEmailAddress(), getManager().getName()); ! ! if ("true".equals(ApplicationProperties.getProperty("unitime.email.notif.data", "false"))) ! email.addNotifyCC(); ! ! email.send(); ! } catch (Exception e) { ! sLog.error(e.getMessage(), e); } } Index: PosMinorImport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/dataexchange/PosMinorImport.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PosMinorImport.java 17 Jun 2008 21:24:49 -0000 1.2 --- PosMinorImport.java 1 Dec 2010 11:10:35 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.dataexchange; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.dataexchange; Index: BaseExport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/dataexchange/BaseExport.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BaseExport.java 17 Jun 2008 21:24:49 -0000 1.2 --- BaseExport.java 1 Dec 2010 11:10:35 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.dataexchange; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.dataexchange; Index: CourseCatalogImport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/dataexchange/CourseCatalogImport.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CourseCatalogImport.java 17 Jun 2008 21:24:49 -0000 1.2 --- CourseCatalogImport.java 1 Dec 2010 11:10:35 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.dataexchange; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.dataexchange; --- NEW FILE: CurriculaExport.java --- /* * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * */ package org.unitime.timetable.dataexchange; import java.text.DecimalFormat; import java.util.Collection; import java.util.Date; import java.util.Hashtable; import java.util.List; import java.util.Properties; import java.util.TreeSet; import net.sf.cpsolver.ifs.util.ToolBox; import org.dom4j.Document; import org.dom4j.Element; import org.unitime.commons.hibernate.util.HibernateUtil; import org.unitime.timetable.ApplicationProperties; import org.unitime.timetable.model.Curriculum; import org.unitime.timetable.model.CurriculumClassification; import org.unitime.timetable.model.CurriculumCourse; import org.unitime.timetable.model.CurriculumCourseGroup; import org.unitime.timetable.model.PosMajor; import org.unitime.timetable.model.Session; public class CurriculaExport extends BaseExport{ protected static DecimalFormat sShareDF = new DecimalFormat("0.0000"); public void saveXml(Document document, Session session, Properties parameters) throws Exception { try { beginTransaction(); List<Curriculum> curricula = getHibSession().createQuery( "select c from Curriculum c where c.academicArea.session.uniqueId = :sessionId" ).setLong("sessionId", session.getUniqueId()).list(); boolean externalIds = "true".equals(parameters.getProperty("tmtbl.export.curricula.externalIds", "true")); boolean minimalistic = "true".equals(parameters.getProperty("tmtbl.export.curricula.minimalistic", "false")); Element root = document.addElement("curricula"); root.addAttribute("campus", session.getAcademicInitiative()); root.addAttribute("year", session.getAcademicYear()); root.addAttribute("term", session.getAcademicTerm()); root.addAttribute("created", new Date().toString()); document.addDocType("curricula", "-//UniTime//DTD University Course Timetabling/EN", "http://www.unitime.org/interface/Curricula_3_2.dtd"); if (curricula.isEmpty()) throw new Exception("No curricula defined for " + session.getLabel()); for (Curriculum curriculum: new TreeSet<Curriculum>(curricula)) { Element curriculumElement = root.addElement("curriculum"); Hashtable<Long, Integer> groupId = new Hashtable<Long, Integer>(); if (!minimalistic && curriculum.getAbbv() != null) curriculumElement.addAttribute("abbreviation", curriculum.getAbbv()); if (!minimalistic && curriculum.getName() != null) curriculumElement.addAttribute("name", curriculum.getName()); if (curriculum.getAcademicArea() != null) { Element acadAreaElement = curriculumElement.addElement("academicArea"); if (externalIds && curriculum.getAcademicArea().getExternalUniqueId() != null) { acadAreaElement.addAttribute("externalId", curriculum.getAcademicArea().getExternalUniqueId()); } acadAreaElement.addAttribute("abbreviation", curriculum.getAcademicArea().getAcademicAreaAbbreviation()); } if (!minimalistic && curriculum.getDepartment() != null) { Element departmentElement = curriculumElement.addElement("department"); if (externalIds && curriculum.getDepartment().getExternalUniqueId() != null) { departmentElement.addAttribute("externalId", curriculum.getDepartment().getExternalUniqueId()); } departmentElement.addAttribute("code", curriculum.getDepartment().getDeptCode()); } for (PosMajor major: (Collection<PosMajor>)curriculum.getMajors()) { Element majorElement = curriculumElement.addElement("major"); if (externalIds && major.getExternalUniqueId() != null) { majorElement.addAttribute("externalId", major.getExternalUniqueId()); } majorElement.addAttribute("code", major.getCode()); } for (CurriculumClassification clasf: new TreeSet<CurriculumClassification>(curriculum.getClassifications())) { Element clasfElement = curriculumElement.addElement("classification"); if (!minimalistic && clasf.getName() != null) { clasfElement.addAttribute("name", clasf.getName()); } if (clasf.getAcademicClassification() != null) { Element acadClasfElement = clasfElement.addElement("academicClassification"); if (externalIds && clasf.getAcademicClassification().getExternalUniqueId() != null) { acadClasfElement.addAttribute("externalId", clasf.getAcademicClassification().getExternalUniqueId()); } acadClasfElement.addAttribute("code", clasf.getAcademicClassification().getCode()); } if (clasf.getNrStudents() != null) clasfElement.addAttribute("enrollment", clasf.getNrStudents().toString()); for (CurriculumCourse course: new TreeSet<CurriculumCourse>(clasf.getCourses())) { Element courseElement = clasfElement.addElement("course"); if (externalIds && course.getCourse().getExternalUniqueId() != null) courseElement.addAttribute("externalId", course.getCourse().getExternalUniqueId()); courseElement.addAttribute("subject", course.getCourse().getSubjectArea().getSubjectAreaAbbreviation()); courseElement.addAttribute("courseNbr", course.getCourse().getCourseNbr()); if (!minimalistic || course.getPercShare() != 1.0f) courseElement.addAttribute("share", sShareDF.format(course.getPercShare())); for (CurriculumCourseGroup group: (Collection<CurriculumCourseGroup>)course.getGroups()) { Integer gid = groupId.get(group.getUniqueId()); if (gid == null) { gid = groupId.size() + 1; groupId.put(group.getUniqueId(), gid); } Element groupElement = courseElement.addElement("group"); groupElement.addAttribute("id", gid.toString()); if (!minimalistic && group.getName() != null) groupElement.addAttribute("name", group.getName()); if (!minimalistic || group.getType() != 0) groupElement.addAttribute("type", group.getType() == 1 ? "REQ" : "OPT"); } } } } commitTransaction(); } catch (Exception e) { fatal("Exception: "+e.getMessage(),e); rollbackTransaction(); } } public static void main(String[] args) { try { if (args.length==0) args = new String[] { "curricula.xml", "PWL", "2010", "Spring"}; ToolBox.configureLogging(); HibernateUtil.configureHibernate(ApplicationProperties.getProperties()); Session session = Session.getSessionUsingInitiativeYearTerm(args[1], args[2], args[3]); if (session==null) throw new Exception("Session "+args[1]+" "+args[2]+args[3]+" not found!"); new CurriculaExport().saveXml(args[0], session, ApplicationProperties.getProperties()); } catch (Exception e) { e.printStackTrace(); } } } Index: AcademicClassificationImport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/dataexchange/AcademicClassificationImport.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AcademicClassificationImport.java 17 Jun 2008 21:24:49 -0000 1.2 --- AcademicClassificationImport.java 1 Dec 2010 11:10:35 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.dataexchange; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.dataexchange; Index: CourseOfferingExport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/dataexchange/CourseOfferingExport.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** CourseOfferingExport.java 8 Dec 2009 19:08:32 -0000 1.11 --- CourseOfferingExport.java 1 Dec 2010 11:10:35 -0000 1.12 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.dataexchange; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.dataexchange; *************** *** 383,387 **** int dayOfWeek = startDate.get(Calendar.DAY_OF_WEEK); - //TODO: checked OK for (int m=startMonth;m<=endMonth;m++) { int daysOfMonth = DateUtils.getNrDaysOfMonth(m, startYear); --- 383,386 ---- Index: SessionImport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/dataexchange/SessionImport.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SessionImport.java 14 Oct 2009 19:49:26 -0000 1.4 --- SessionImport.java 1 Dec 2010 11:10:35 -0000 1.5 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.dataexchange; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.dataexchange; Index: BaseCourseOfferingImport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/dataexchange/BaseCourseOfferingImport.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** BaseCourseOfferingImport.java 3 Dec 2009 17:29:17 -0000 1.10 --- BaseCourseOfferingImport.java 1 Dec 2010 11:10:35 -0000 1.11 *************** *** 5,9 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 5,9 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ *************** *** 90,93 **** --- 90,94 ---- boolean useMeetsWithElement = false; boolean useCanShareRoomElement = false; + boolean incremental = false; PreferenceLevel requiredPrefLevel = null; MakeAssignmentsForClassEvents assignmentHelper = null; *************** *** 113,116 **** --- 114,121 ---- } beginTransaction(); + + incremental = "true".equalsIgnoreCase(rootElement.attributeValue("incremental", "false")); + if (incremental) + info("Incremental mode."); initializeLoad(rootElement, rootElementName); *************** *** 118,123 **** loadOfferings(rootElement); ! deleteUnmatchedInstructionalOfferings(); ! deleteUnmatchedCourseOfferings(); deleteUnmatchedClasses(); commitTransaction(); --- 123,130 ---- loadOfferings(rootElement); ! if (!incremental) { ! deleteUnmatchedInstructionalOfferings(); ! deleteUnmatchedCourseOfferings(); ! } deleteUnmatchedClasses(); commitTransaction(); *************** *** 337,342 **** for(Iterator<Long> cIt = deleteClasses.iterator(); cIt.hasNext(); ){ Long uniqueId = (Long) cIt.next(); ! Class_ unusedC = findClassForUniqueId(uniqueId) ; if (unusedC != null){ addNote("\tDeleted: " + unusedC.getClassLabel()); deleteClass(unusedC); --- 344,356 ---- for(Iterator<Long> cIt = deleteClasses.iterator(); cIt.hasNext(); ){ Long uniqueId = (Long) cIt.next(); ! Class_ unusedC = findClassForUniqueId(uniqueId); if (unusedC != null){ + if (incremental) { + try { + if (existingInstructionalOfferings.contains(unusedC.getSchedulingSubpart().getInstrOfferingConfig().getInstructionalOffering().getUniqueId()) || + existingCourseOfferings.contains(unusedC.getSchedulingSubpart().getInstrOfferingConfig().getInstructionalOffering().getControllingCourseOffering().getUniqueId())) + continue; + } catch (NullPointerException e) {} + } addNote("\tDeleted: " + unusedC.getClassLabel()); deleteClass(unusedC); *************** *** 354,358 **** initializeMeetsWith(rootElement); initializeCanShareRoom(rootElement); - initializeManager(); initializeAssignmentHelper(); loadSetupData(); --- 368,371 ---- *************** *** 364,368 **** if (created != null) { addNote("Loading offerings XML file created on: " + created); ! ChangeLog.addChange(getHibSession(), manager, session, session, created, ChangeLog.Source.DATA_IMPORT_OFFERINGS, ChangeLog.Operation.UPDATE, null, null); updateChangeList(true); } --- 377,381 ---- if (created != null) { addNote("Loading offerings XML file created on: " + created); ! ChangeLog.addChange(getHibSession(), getManager(), session, session, created, ChangeLog.Source.DATA_IMPORT_OFFERINGS, ChangeLog.Operation.UPDATE, null, null); updateChangeList(true); } *************** *** 373,382 **** } - protected void initializeManager() { - if (manager == null){ - manager = findDefaultManager(); - } - } - protected void initializeMeetsWith(Element rootElement) { Boolean useMeetsWith = getOptionalBooleanAttribute(rootElement, "useMeetsWith"); --- 386,389 ---- *************** *** 582,586 **** if (changed){ this.getHibSession().saveOrUpdate(io); ! ChangeLog.addChange(getHibSession(), manager, session, io, ChangeLog.Source.DATA_IMPORT_OFFERINGS, (action.equalsIgnoreCase("insert")?ChangeLog.Operation.CREATE:ChangeLog.Operation.UPDATE), io.getControllingCourseOffering().getSubjectArea(), io.getDepartment()); } --- 589,593 ---- if (changed){ this.getHibSession().saveOrUpdate(io); ! ChangeLog.addChange(getHibSession(), getManager(), session, io, ChangeLog.Source.DATA_IMPORT_OFFERINGS, (action.equalsIgnoreCase("insert")?ChangeLog.Operation.CREATE:ChangeLog.Operation.UPDATE), io.getControllingCourseOffering().getSubjectArea(), io.getDepartment()); } *************** *** 669,673 **** this.getHibSession().flush(); this.getHibSession().refresh(dp); ! ChangeLog.addChange(getHibSession(), manager, session, dp, ChangeLog.Source.DATA_IMPORT_OFFERINGS, ChangeLog.Operation.CREATE, c.getSchedulingSubpart().getControllingCourseOffering().getSubjectArea(), c.getSchedulingSubpart().getControllingCourseOffering().getDepartment()); } if (dp.isDefault()){ --- 676,680 ---- this.getHibSession().flush(); this.getHibSession().refresh(dp); ! ChangeLog.addChange(getHibSession(), getManager(), session, dp, ChangeLog.Source.DATA_IMPORT_OFFERINGS, ChangeLog.Operation.CREATE, c.getSchedulingSubpart().getControllingCourseOffering().getSubjectArea(), c.getSchedulingSubpart().getControllingCourseOffering().getDepartment()); } if (dp.isDefault()){ *************** *** 679,698 **** } - private CourseOffering findCourseOfferingWithUniqueId(Long uniqueId, InstructionalOffering instructionalOffering){ - CourseOffering courseOffering = null; - boolean found = false; - if (instructionalOffering.getCourseOfferings() != null) { - for (Iterator<?> it = instructionalOffering.getCourseOfferings().iterator(); it.hasNext() && !found;){ - courseOffering = (CourseOffering) it.next(); - if(courseOffering.getUniqueId().equals(uniqueId)) - found = true; - } - } - if (found) - return(courseOffering); - else - return(null); - } - protected ArrayList<ImportCourseOffering> getCourses(Element element) throws Exception { ArrayList<ImportCourseOffering> courses = new ArrayList<ImportCourseOffering>(); --- 686,689 ---- *************** *** 757,761 **** int year; if (index2 == date.length()){ - //TODO: checked OK, tested OK year = session.getSessionStartYear(); } else { --- 748,751 ---- *************** *** 1042,1046 **** getHibSession().flush(); getHibSession().refresh(di); ! ChangeLog.addChange(getHibSession(), manager, session, di, ChangeLog.Source.DATA_IMPORT_OFFERINGS, ChangeLog.Operation.CREATE, c.getSchedulingSubpart().getControllingCourseOffering().getSubjectArea(), c.getSchedulingSubpart().getControllingCourseOffering().getDepartment()); } ci = new ClassInstructor(); --- 1032,1036 ---- getHibSession().flush(); getHibSession().refresh(di); ! ChangeLog.addChange(getHibSession(), getManager(), session, di, ChangeLog.Source.DATA_IMPORT_OFFERINGS, ChangeLog.Operation.CREATE, c.getSchedulingSubpart().getControllingCourseOffering().getSubjectArea(), c.getSchedulingSubpart().getControllingCourseOffering().getDepartment()); } ci = new ClassInstructor(); *************** *** 1071,1075 **** getHibSession().flush(); getHibSession().refresh(c); ! ChangeLog.addChange(getHibSession(), manager, session, ci, ChangeLog.Source.DATA_IMPORT_OFFERINGS, (addNew?ChangeLog.Operation.CREATE:ChangeLog.Operation.UPDATE), c.getSchedulingSubpart().getControllingCourseOffering().getSubjectArea(), c.getSchedulingSubpart().getControllingCourseOffering().getDepartment()); } } --- 1061,1065 ---- getHibSession().flush(); getHibSession().refresh(c); ! ChangeLog.addChange(getHibSession(), getManager(), session, ci, ChangeLog.Source.DATA_IMPORT_OFFERINGS, (addNew?ChangeLog.Operation.CREATE:ChangeLog.Operation.UPDATE), c.getSchedulingSubpart().getControllingCourseOffering().getSubjectArea(), c.getSchedulingSubpart().getControllingCourseOffering().getDepartment()); } } *************** *** 1131,1135 **** getHibSession().flush(); getHibSession().refresh(io); ! ChangeLog.addChange(getHibSession(), manager, session, io.getCredit(), ChangeLog.Source.DATA_IMPORT_OFFERINGS, ChangeLog.Operation.UPDATE, io.getControllingCourseOffering().getSubjectArea(), io.getControllingCourseOffering().getDepartment()); } } --- 1121,1125 ---- getHibSession().flush(); getHibSession().refresh(io); ! ChangeLog.addChange(getHibSession(), getManager(), session, io.getCredit(), ChangeLog.Source.DATA_IMPORT_OFFERINGS, ChangeLog.Operation.UPDATE, io.getControllingCourseOffering().getSubjectArea(), io.getControllingCourseOffering().getDepartment()); } } *************** *** 1175,1179 **** getHibSession().flush(); getHibSession().refresh(ss); ! ChangeLog.addChange(getHibSession(), manager, session, ss.getCredit(), ChangeLog.Source.DATA_IMPORT_OFFERINGS, ChangeLog.Operation.UPDATE, ss.getControllingCourseOffering().getSubjectArea(), ss.getControllingCourseOffering().getDepartment()); } } --- 1165,1169 ---- getHibSession().flush(); getHibSession().refresh(ss); ! ChangeLog.addChange(getHibSession(), getManager(), session, ss.getCredit(), ChangeLog.Source.DATA_IMPORT_OFFERINGS, ChangeLog.Operation.UPDATE, ss.getControllingCourseOffering().getSubjectArea(), ss.getControllingCourseOffering().getDepartment()); } } *************** *** 1253,1257 **** String cei = null; boolean allFound = true; ! HashSet<?> existingDistObjs = new HashSet<Object>(); existingDistObjs.addAll(dp.getDistributionObjects()); for (Iterator<?> ceiIt = classExternalIds.iterator(); ceiIt.hasNext();){ --- 1243,1247 ---- String cei = null; boolean allFound = true; ! HashSet<DistributionObject> existingDistObjs = new HashSet<DistributionObject>(); existingDistObjs.addAll(dp.getDistributionObjects()); for (Iterator<?> ceiIt = classExternalIds.iterator(); ceiIt.hasNext();){ *************** *** 1306,1310 **** getHibSession().flush(); getHibSession().refresh(io); ! ChangeLog.addChange(getHibSession(), manager, session, co, ChangeLog.Source.DATA_IMPORT_OFFERINGS, ChangeLog.Operation.CREATE, co.getSubjectArea(), co.getDepartment()); handleCustomCourseChildElements(co, ico.getElement()); } --- 1296,1300 ---- getHibSession().flush(); getHibSession().refresh(io); ! ChangeLog.addChange(getHibSession(), getManager(), session, co, ChangeLog.Source.DATA_IMPORT_OFFERINGS, ChangeLog.Operation.CREATE, co.getSubjectArea(), co.getDepartment()); handleCustomCourseChildElements(co, ico.getElement()); } *************** *** 1372,1376 **** } if(changed){ ! ChangeLog.addChange(getHibSession(), manager, session, oco, ChangeLog.Source.DATA_IMPORT_OFFERINGS, ChangeLog.Operation.UPDATE, oco.getSubjectArea(), oco.getDepartment()); } } --- 1362,1366 ---- } if(changed){ ! ChangeLog.addChange(getHibSession(), getManager(), session, oco, ChangeLog.Source.DATA_IMPORT_OFFERINGS, ChangeLog.Operation.UPDATE, oco.getSubjectArea(), oco.getDepartment()); } } *************** *** 1393,1397 **** getHibSession().refresh(io); handleCustomCourseChildElements(nco, ico.getElement()); ! ChangeLog.addChange(getHibSession(), manager, session, nco, ChangeLog.Source.DATA_IMPORT_OFFERINGS, ChangeLog.Operation.CREATE, nco.getSubjectArea(), nco.getDepartment()); } } --- 1383,1387 ---- getHibSession().refresh(io); handleCustomCourseChildElements(nco, ico.getElement()); ! ChangeLog.addChange(getHibSession(), getManager(), session, nco, ChangeLog.Source.DATA_IMPORT_OFFERINGS, ChangeLog.Operation.CREATE, nco.getSubjectArea(), nco.getDepartment()); } } *************** *** 1511,1515 **** if (changed){ addNote("\tconfig element changed: " + name); ! ChangeLog.addChange(getHibSession(), manager, session, ioc, ChangeLog.Source.DATA_IMPORT_OFFERINGS, (addNew?ChangeLog.Operation.CREATE:ChangeLog.Operation.UPDATE), ioc.getControllingCourseOffering().getSubjectArea(), ioc.getControllingCourseOffering().getDepartment()); this.getHibSession().saveOrUpdate(ioc); } --- 1501,1505 ---- if (changed){ addNote("\tconfig element changed: " + name); ! ChangeLog.addChange(getHibSession(), getManager(), session, ioc, ChangeLog.Source.DATA_IMPORT_OFFERINGS, (addNew?ChangeLog.Operation.CREATE:ChangeLog.Operation.UPDATE), ioc.getControllingCourseOffering().getSubjectArea(), ioc.getControllingCourseOffering().getDepartment()); this.getHibSession().saveOrUpdate(ioc); } *************** *** 1720,1726 **** } - HashMap<String, Vector<Calendar>> dates = elementDates(classElement); DatePattern dp = null; ! if (dates != null){ dp = findDatePattern(dates.get("startDates"), dates.get("endDates"), clazz); } --- 1710,1719 ---- } DatePattern dp = null; ! if (classElement.element("time") != null && classElement.element("time").attributeValue("datePattern") != null) { ! dp = DatePattern.findByName(session, classElement.element("time").attributeValue("datePattern")); ! } ! HashMap<String, Vector<Calendar>> dates = elementDates(classElement); ! if (dp == null && dates != null){ dp = findDatePattern(dates.get("startDates"), dates.get("endDates"), clazz); } *************** *** 1834,1838 **** } if (changed){ ! ChangeLog.addChange(getHibSession(), manager, session, clazz, ChangeLog.Source.DATA_IMPORT_OFFERINGS, (isAdd?ChangeLog.Operation.CREATE:ChangeLog.Operation.UPDATE), ioc.getControllingCourseOffering().getSubjectArea(), ioc.getDepartment()); } } --- 1827,1831 ---- } if (changed){ ! ChangeLog.addChange(getHibSession(), getManager(), session, clazz, ChangeLog.Source.DATA_IMPORT_OFFERINGS, (isAdd?ChangeLog.Operation.CREATE:ChangeLog.Operation.UPDATE), ioc.getControllingCourseOffering().getSubjectArea(), ioc.getDepartment()); } } *************** *** 1989,1993 **** getHibSession().flush(); getHibSession().refresh(dp); ! ChangeLog.addChange(getHibSession(), manager, session, dp, ChangeLog.Source.DATA_IMPORT_OFFERINGS, ChangeLog.Operation.CREATE, null, clazz.getSchedulingSubpart().getControllingDept()); } --- 1982,1986 ---- getHibSession().flush(); getHibSession().refresh(dp); ! ChangeLog.addChange(getHibSession(), getManager(), session, dp, ChangeLog.Source.DATA_IMPORT_OFFERINGS, ChangeLog.Operation.CREATE, null, clazz.getSchedulingSubpart().getControllingDept()); } *************** *** 2018,2022 **** changed = true; addNote("\tdid not find matching event, added new event: " + c.getSchedulingSubpart().getInstrOfferingConfig().getCourseName() + " " + c.getSchedulingSubpart().getItype().getAbbv().trim() + " " + c.getClassSuffix()); ! ChangeLog.addChange(getHibSession(), manager, session, newEvent, ChangeLog.Source.DATA_IMPORT_OFFERINGS, ChangeLog.Operation.CREATE, c.getSchedulingSubpart().getControllingCourseOffering().getSubjectArea(), c.getSchedulingSubpart().getControllingCourseOffering().getDepartment()); } else if... [truncated message content] |
Update of /cvsroot/unitime/UniTime/JavaSource In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/JavaSource Modified Files: hibernate-mapping-3.0.dtd SolverInfo.hbm.xml WaitList.hbm.xml SponsoringOrganization.hbm.xml dbupdate.xml ExamPeriod.hbm.xml DatePattern.hbm.xml SolverParameterDef.hbm.xml messages.properties Meeting.hbm.xml ExamOwner.hbm.xml DistributionObject.hbm.xml Building.hbm.xml User.hbm.xml SubjectArea.hbm.xml History.hbm.xml RefTableEntry.hbm.xml CourseOffering.hbm.xml Reservation.hbm.xml StudentStatusType.hbm.xml Event.hbm.xml ExternalRoom.hbm.xml SolverParameter.hbm.xml InstrOfferingConfig.hbm.xml ExternalRoomFeature.hbm.xml JointEnrollment.hbm.xml Designator.hbm.xml ExternalBuilding.hbm.xml TimePattern.hbm.xml AcademicArea.hbm.xml StudentSectHistory.hbm.xml CourseCatalog.hbm.xml CourseRequest.hbm.xml Assignment.hbm.xml CourseSubpartCredit.hbm.xml Settings.hbm.xml Room.hbm.xml ehcache.xml log4j.properties Solution.hbm.xml RoomDept.hbm.xml SolverPredefinedSetting.hbm.xml ExamConflict.hbm.xml RoomFeature.hbm.xml ClassInstructor.hbm.xml RoomTypeOption.hbm.xml hibernate.cfg.xml LastLikeCourseDemand.hbm.xml ChangeLog.hbm.xml AcademicAreaClassification.hbm.xml StudentEnrollment.hbm.xml TimetableManager.hbm.xml Staff.hbm.xml StandardEventNote.hbm.xml RelatedCourseInfo.hbm.xml ApplicationConfig.hbm.xml EventContact.hbm.xml CourseCreditUnitConfig.hbm.xml SolverGroup.hbm.xml PositionCodeType.hbm.xml StudentEnrollmentMessage.hbm.xml PosMinor.hbm.xml Curriculum.hbm.xml CourseDemand.hbm.xml StudentGroup.hbm.xml Preference.hbm.xml Student.hbm.xml StudentAccomodation.hbm.xml SolverInfoDef.hbm.xml RoomGroup.hbm.xml application.properties PreferenceLevel.hbm.xml EventNote.hbm.xml AcademicClassification.hbm.xml SectioningInfo.hbm.xml struts-layout.properties ManagerSettings.hbm.xml CourseRequestOption.hbm.xml ItypeDesc.hbm.xml InstructionalOffering.hbm.xml ManagerRole.hbm.xml UserData.hbm.xml PosMajor.hbm.xml hibernate-configuration-3.0.dtd FreeTime.hbm.xml Roles.hbm.xml PreferenceGroup.hbm.xml ExternalRoomDepartment.hbm.xml ClassWaitList.hbm.xml ExactTimeMins.hbm.xml StudentClassEnrollment.hbm.xml SolverParameterGroup.hbm.xml Added Files: menu-custom.xml QueryLog.hbm.xml menu.xml StudentSectQueue.hbm.xml Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: User.hbm.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/User.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** User.hbm.xml 17 Jun 2008 21:24:47 -0000 1.2 --- User.hbm.xml 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,14 **** ! <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping PUBLIC ! "-//Hibernate/Hibernate Mapping DTD 3.0//EN" ! "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,12 ---- ! <?xml version="1.0" encoding="UTF-8"?> ! <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 19,58 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> - <hibernate-mapping package="org.unitime.timetable.model"> ! <class ! name="User" ! abstract="false" ! table="USERS"> ! ! <cache include="non-lazy" usage="read-write"/> ! ! <id name="username" ! column="USERNAME" ! type="java.lang.String" ! length="15"> ! <generator class="assigned" /> </id> ! ! <property ! name="password" ! column="PASSWORD" ! type="string" ! not-null="true" ! length="25" ! /> ! ! <property ! name="externalUniqueId" ! column="EXTERNAL_UID" ! type="string" ! not-null="false" ! length="40" ! /> ! ! </class> </hibernate-mapping> --- 17,53 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> <hibernate-mapping package="org.unitime.timetable.model"> ! <class ! name="User" ! abstract="false" ! table="users"> ! <cache include="non-lazy" usage="read-write"/> ! <id name="username" ! column="username" ! type="java.lang.String" ! length="15"> ! ! <generator class="assigned"/> </id> ! ! <property ! name="password" ! column="password" ! type="string" ! not-null="true" ! length="25"/> ! ! <property ! name="externalUniqueId" ! column="external_uid" ! type="string" ! not-null="false" ! length="40"/> ! ! </class> ! </hibernate-mapping> Index: Building.hbm.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/Building.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Building.hbm.xml 17 Jun 2008 21:24:47 -0000 1.2 --- Building.hbm.xml 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,14 **** ! <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping PUBLIC ! "-//Hibernate/Hibernate Mapping DTD 3.0//EN" ! "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,12 ---- ! <?xml version="1.0" encoding="UTF-8"?> ! <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 19,92 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> - <hibernate-mapping package="org.unitime.timetable.model"> ! <class ! name="Building" ! table="BUILDING"> ! ! <cache include="non-lazy" usage="nonstrict-read-write"/> ! <id name="uniqueId" ! column="UNIQUEID" ! type="java.lang.Long" ! > <generator class="org.unitime.commons.hibernate.id.UniqueIdGenerator"> <param name="sequence">building_seq</param> </generator> </id> - - - <property - name="externalUniqueId" - column="EXTERNAL_UID" - type="java.lang.String" - not-null="false" - length="40" - /> ! <property ! name="abbreviation" ! column="ABBREVIATION" ! type="java.lang.String" ! not-null="true" ! length="10" ! /> ! ! <property ! name="name" ! column="NAME" ! type="java.lang.String" ! not-null="true" ! length="100" ! /> ! <property ! name="coordinateX" ! column="COORDINATE_X" ! type="java.lang.Integer" ! not-null="true" ! length="5" ! /> ! ! <property ! name="coordinateY" ! column="COORDINATE_Y" ! type="java.lang.Integer" ! not-null="true" ! length="5" ! /> ! ! <many-to-one ! name="session" ! class="Session" ! column="SESSION_ID" ! not-null="true" ! foreign-key="FK_BUILDING_SESSION" ! /> ! ! </class> </hibernate-mapping> --- 17,75 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> <hibernate-mapping package="org.unitime.timetable.model"> ! <class name="Building" table="building"> ! <cache include="non-lazy" usage="nonstrict-read-write"/> <id name="uniqueId" ! column="uniqueid" ! type="java.lang.Long"> <generator class="org.unitime.commons.hibernate.id.UniqueIdGenerator"> <param name="sequence">building_seq</param> </generator> </id> ! <property ! name="externalUniqueId" ! column="external_uid" ! type="java.lang.String" ! not-null="false" ! length="40"/> ! <property ! name="abbreviation" ! column="abbreviation" ! type="java.lang.String" ! not-null="true" ! length="10"/> ! ! <property ! name="name" ! column="name" ! type="java.lang.String" ! not-null="true" ! length="100"/> ! ! <property ! name="coordinateX" ! column="coordinate_x" ! type="java.lang.Double" ! not-null="false"/> ! ! <property ! name="coordinateY" ! column="coordinate_y" ! type="java.lang.Double" ! not-null="false"/> ! ! <many-to-one ! name="session" ! class="Session" ! column="session_id" ! not-null="true" ! foreign-key="fk_building_session"/> ! ! </class> </hibernate-mapping> Index: PreferenceGroup.hbm.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/PreferenceGroup.hbm.xml,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** PreferenceGroup.hbm.xml 4 May 2010 16:31:13 -0000 1.21 --- PreferenceGroup.hbm.xml 1 Dec 2010 11:10:38 -0000 1.22 *************** *** 1,14 **** ! <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping PUBLIC ! "-//Hibernate/Hibernate Mapping DTD 3.0//EN" ! "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <!-- ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2008-2009, UniTime LLC * * This program is free software; you can redistribute it and/or modify [...2204 lines suppressed...] ! ! <cache include="non-lazy" usage="read-write"/> ! <key column="exam_id" foreign-key="fk_xconflict_ex_conf_exam"/> ! <many-to-many ! class="ExamConflict" ! column="conflict_id" ! foreign-key="fk_xconflict_ex_conf"/> ! ! </set> ! ! <property ! name="uniqueIdRolledForwardFrom" ! column="uid_rolled_fwd_from" ! type="java.lang.Long" ! not-null="false" ! length="20"/> ! ! </union-subclass> ! </class> </hibernate-mapping> --- NEW FILE: menu.xml --- <?xml version="1.0"?> <!-- * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * --> <unitime-menu> <menu name="Courses" title="Course Timetabling"> <condition> <isAuthenticated/> <or> <propertyEquals name="tmtbl.menu.display_course_timetabling" value="true" defaultValue="true"/> <hasRole name="Administrator"/> </or> <canSeeCourses/> </condition> <menu name="Input Data" title="Course Timetabling Input Data"> <item name="Instructional Offerings" page="instructionalOfferingShowSearch.do"/> <item name="Classes" page="classShowSearch.do"/> <separator/> <menu name="Curricula" page="curricula" type="gwt"> <item name="Projection Rules" page="curprojrules" type="gwt"/> </menu> <separator/> <menu name="Instructors" page="instructorSearch.do"> <item name="Designator List" page="designatorList.do"/> </menu> <separator/> <menu name="Rooms" page="roomSearch.do"> <item name="Room Features" page="roomFeatureSearch.do"/> <item name="Room Groups" page="roomGroupSearch.do"/> </menu> <separator/> <item name="Distribution Preferences" page="distributionPrefs.do"/> <item name="Reservations" page="reservationList.do"/> <item name="Class Assignments" page="classAssignmentsReportShowSearch.do"> <condition> <canSeeTimetable/> </condition> </item> </menu> <menu name="Course Timetabling" title="Course Timetabling Solver"> <condition> <hasASolverGroup/> <canSeeTimetable/> <canDoTimetable/> </condition> <item name="Saved Timetables" page="listSolutions.do"/> <item name="Solver" page="solver.do"/> <item name="Timetable Grid" page="timetable.do"/> <separator/> <item name="Assigned Classes" page="assignedClasses.do"/> <item name="Not-assigned Classes" page="unassigned.do"/> <item name="Changes" page="solutionChanges.do"/> <item name="History" page="assignmentHistory.do"/> <item name="Conflict Statistics" page="cbs.do"/> <item name="Solver Log" page="solverLog.do"/> <item name="Reports" page="solutionReport.do"/> <separator> <condition> <hasRole name="Administrator"/> </condition> </separator> <item name="Manage Solvers" page="manageSolvers.do"> <condition> <hasRole name="Administrator"/> </condition> </item> </menu> <menu name="Course Timetabling" title="Course Timetabling Solver"> <condition> <hasASolverGroup/> <canSeeTimetable/> <not> <canDoTimetable/> </not> </condition> <item name="Saved Timetables" page="listSolutions.do"/> <item name="Timetable Grid" page="timetable.do"/> </menu> <menu name="Course Audit" title="Course Timetabling Audit"> <condition> <hasASolverGroup/> <not> <canSeeTimetable/> </not> <canAudit/> </condition> <item name="Solver" page="solver.do"/> <item name="Conflict Statistics" page="cbs.do"/> <item name="Solver Log" page="solverLog.do"/> <item name="Reports" page="solutionReport.do"/> </menu> </menu> <menu name="Curricula" title="Curriculum Timetabling"> <condition> <hasRole name="Curriculum Mgr"/> </condition> <item name="Curricula" page="curricula" type="gwt"/> <item name="Projection Rules" page="curprojrules" type="gwt"/> </menu> <menu name="Students"> <condition> <or> <propertyEquals name="tmtbl.menu.display_student_sectioning" value="true" defaultValue="true"/> <hasRole name="Administrator"/> </or> <canSectionStudents/> </condition> <menu name="Batch Solver" page="studentSolver.do"> <item name="Solver Log" page="studentSolverLog.do"/> </menu> <separator/> <item name="Scheduling Assistant" page="sectioning" type="gwt"> <condition> <isSectioningEnabled/> </condition> </item> <item name="Course Requests" page="requests" type="gwt"> <condition> <isRegistrationEnabled/> </condition> </item> <item name="Enrollment Audits" page="enrollmentAuditPdfReport.do"/> </menu> <menu name="Examinations"> <condition> <or> <propertyEquals name="tmtbl.menu.display_exam_timetabling" value="true" defaultValue="true"/> <hasRole name="Administrator"/> </or> <canSeeExams/> </condition> <menu name="Input Data"> <item name="Instructors" page="instructorSearch.do"/> <separator/> <menu name="Rooms" page="roomSearch.do?default=Exam"> <item name="Room Features" page="roomFeatureSearch.do?default=Exam"/> <item name="Room Groups" page="roomGroupSearch.do?default=Exam"/> <item name="Room Availability" page="roomAvailability.do"> <condition> <hasRoomAvailability/> </condition> </item> </menu> <separator/> <item name="Examinations" page="examList.do"/> <item name="Distribution Preferences" page="examDistributionPrefs.do"/> </menu> <menu name="Examination Timetabling"> <condition> <canTimetableExams/> </condition> <item name="Examination Solver" page="examSolver.do"/> <item name="Timetable Grid" page="examGrid.do"/> <separator/> <item name="Assigned Exams" page="assignedExams.do"/> <item name="Not-assigned Exams" page="unassignedExams.do"/> <item name="Changes" page="examChanges.do"/> <item name="Conflict Statistics" page="ecbs.do"/> <item name="Solver Log" page="examSolverLog.do"/> <separator/> <item name="Reports" page="examAssignmentReport.do"/> </menu> <item name="Pdf Reports" page="examPdfReport.do"> <condition> <or> <hasRole name="Administrator"/> <hasRole name="Exam Mgr"/> </or> </condition> </item> </menu> <item name="Classes" page="classes.do"> <condition> <or> <not> <isAuthenticated/> </not> <not> <hasRole/> </not> </or> </condition> </item> <item name="Examinations" page="exams.do"> <condition> <or> <not> <isAuthenticated/> </not> <not> <hasRole/> </not> </or> </condition> </item> <item name="Timetable" page="timetable" type="gwt"> <condition> <and> <not> <isAuthenticated/> </not> <propertyEquals name="unitime.event_timetable.requires_authentication" value="false" defaultValue="true"/> </and> </condition> </item> <menu name="Events"> <condition> <or> <propertyEquals name="tmtbl.menu.display_event_management" value="true" defaultValue="true"/> <hasRole name="Administrator"/> </or> <canSeeEvents/> </condition> <menu name="Rooms" page="roomSearch.do?default=Exam"> <condition> <hasRole name="Event Mgr"/> </condition> <item name="Room Features" page="roomFeatureSearch.do"/> <item name="Room Groups" page="roomGroupSearch.do"/> </menu> <separator> <condition> <hasRole name="Event Mgr"/> </condition> </separator> <item name="Events" page="eventList.do"/> <item name="Meetings" page="meetingList.do"/> <item name="Add Event" page="eventAdd.do"/> <item name="Room Availability" page="eventGrid.do"/> <separator/> <item name="Timetable" page="timetable" type="gwt" /> </menu> <item name="Course Requests" page="requests" type="gwt"> <condition> <and> <isStudent/> <isRegistrationEnabled/> </and> </condition> </item> <item name="Scheduling Assistant" page="sectioning" type="gwt"> <condition> <and> <or> <not> <isAuthenticated/> </not> <not> <hasRole/> </not> </or> <isSectioningEnabled/> </and> </condition> </item> <item name="Personal Schedule" page="personalSchedule.do"> <condition> <or> <hasRole name="Administrator"/> <and> <propertyEquals name="tmtbl.menu.display_personal_schedule" value="true" defaultValue="true"/> <hasPersonalReport/> </and> </or> </condition> </item> <separator/> <menu name="Administration"> <condition> <hasRole name="Administrator"/> </condition> <menu name="Academic Sessions"> <item name="Academic Sessions" page="sessionList.do"/> <item name="Managers" page="timetableManagerList.do"/> <item name="Departments" page="departmentList.do"/> <item name="Subject Areas" page="subjectList.do"/> <item name="Buildings" page="buildingList.do"/> <separator/> <item name="Date Patterns" page="datePatternEdit.do"/> <item name="Time Patterns" page="timePatternEdit.do"/> <item name="Exact Time" page="exactTimeEdit.do"/> <separator/> <item name="Academic Areas" page="admin&type=area" type="gwt"/> <item name="Academic Classifications" page="admin&type=classification" type="gwt"/> <item name="Majors" page="admin&type=major" type="gwt"/> <item name="Minors" page="admin&type=minor" type="gwt"/> <separator/> <item name="Examination Periods" page="examPeriodEdit.do"/> <item name="Data Exchange" page="dataImport.do"/> <item name="Roll Forward Session" page="rollForwardSession.do"/> <item name="Change Log" page="lastChanges.do"/> </menu> <menu name="Solver"> <item name="Manage Solvers" page="manageSolvers.do"/> <separator/> <item name="Parameter Groups" page="solverParamGroups.do"/> <item name="Parameters" page="solverParamDef.do"/> <item name="Configurations" page="solverSettings.do"/> <separator/> <item name="Solver Groups" page="solverGroupEdit.do"/> <item name="Distribution Types" page="distributionTypeList.do"/> </menu> <menu name="Other"> <item name="Instructional Types" page="itypeDescList.do"/> <item name="Status Types" page="deptStatusTypeEdit.do"/> <item name="Room Types" page="roomTypeEdit.do"/> <item name="Sponsoring Organizations" page="sponsoringOrgList.do"/> <item name="Standard Notes" page="eventStandardNotes.do"/> </menu> <menu name="Defaults"> <item name="Configuration" page="applicationConfig.do"/> <item name="User Settings" page="settings.do"/> </menu> <menu name="Utilities"> <item name="Page Statistics" page="stats.do"/> <item name="Hibernate Statistics" page="hibernateStats.do"/> <item name="Test HQL" page="hibernateQueryTest.do"/> </menu> </menu> <menu name="Preferences"> <condition> <isAuthenticated/> <hasRole/> </condition> <item name="Change Role" page="selectPrimaryRole.do?list=Y"/> <item name="Switch User" page="chameleon.do"> <condition> <or> <hasRole name="Administrator"/> <isChameleon/> </or> </condition> </item> <item name="Settings" page="managerSettings.do"/> </menu> <menu name="Help"> <condition> <isAuthenticated/> </condition> <item name="Event Manual" page="tmtbl.help.manual.events" type="property" target="download"> <condition> <canSeeEvents/> </condition> </item> <item name="Data Entry Manual" page="tmtbl.help.manual.input_data" type="property" target="download"> <condition> <canSeeCourses/> </condition> </item> <item name="Solver Manual" page="tmtbl.help.manual.solver" type="property" target="download"> <condition> <or> <canDoTimetable/> <canAudit/> <canSeeTimetable/> </or> </condition> </item> <item name="Tips & Tricks" page="tmtbl.help.tricks" type="property" target="dialog"/> <item name="FAQ" page="tmtbl.help.faq" type="property" target="dialog"/> <item name="Release Notes" page="tmtbl.help.release_notes" type="property" target="dialog"/> <item name="Contact Us" page="inquiry.do"> <condition> <or> <hasProperty name="tmtbl.inquiry.email"/> <hasProperty name="unitime.email.inquiry"/> </or> </condition> </item> </menu> <item name="Log Out" page="logOut.do"> <condition> <isAuthenticated/> </condition> </item> <item name="Log In" page="login.do"> <condition> <not> <isAuthenticated/> </not> </condition> </item> </unitime-menu> Index: Reservation.hbm.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/Reservation.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Reservation.hbm.xml 17 Jun 2008 21:24:47 -0000 1.2 --- Reservation.hbm.xml 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,14 **** ! <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping PUBLIC ! "-//Hibernate/Hibernate Mapping DTD 3.0//EN" ! "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,12 ---- ! <?xml version="1.0" encoding="UTF-8"?> ! <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 19,207 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> - <hibernate-mapping package="org.unitime.timetable.model"> ! <class ! name="Reservation" ! abstract="true"> ! ! <cache include="non-lazy" usage="read-write"/> ! ! <id name="uniqueId" ! column="UNIQUEID" ! type="java.lang.Long"> <generator class="org.unitime.commons.hibernate.id.UniqueIdGenerator"> ! <param name="sequence">RESERVATION_SEQ</param> ! </generator> ! </id> ! <property ! name="ownerClassId" ! column="OWNER_CLASS_ID" ! type="java.lang.String" ! not-null="true" ! length="1" ! /> ! ! <property ! name="owner" ! column="OWNER" ! type="java.lang.Long" ! not-null="true" ! length="20" ! /> ! ! <property ! name="priority" ! column="PRIORITY" ! type="java.lang.Integer" ! not-null="true" ! length="5" ! /> ! ! <many-to-one ! name="reservationType" ! class="ReservationType" ! column="RESERVATION_TYPE" ! not-null="true" ! /> ! ! ! <union-subclass ! name="IndividualReservation" ! table="INDIVIDUAL_RESERVATION" ! abstract="false" ! > ! <property ! name="externalUniqueId" ! column="EXTERNAL_UID" ! type="java.lang.String" ! not-null="true" ! length="40" ! /> ! ! <property ! name="overLimit" ! column="OVER_LIMIT" ! type="java.lang.Boolean" ! not-null="true" ! /> ! ! <property ! name="expirationDate" ! column="EXPIRATION_DATE" ! type="java.sql.Timestamp" ! not-null="true" ! /> ! ! </union-subclass> ! <union-subclass ! name="CharacteristicReservation" ! abstract="true" ! > ! <property ! name="reserved" ! column="RESERVED" ! type="java.lang.Integer" ! not-null="true" ! length="10" ! /> ! ! <property ! name="requested" ! column="REQUESTED" ! type="java.lang.Integer" ! not-null="false" ! length="10" ! /> ! <property ! name="priorEnrollment" ! column="PRIOR_ENROLLMENT" ! type="java.lang.Integer" ! not-null="false" ! length="10" ! /> ! ! <property ! name="projectedEnrollment" ! column="PROJECTED_ENROLLMENT" ! type="java.lang.Integer" ! not-null="false" ! length="10" ! /> ! <union-subclass ! name="StudentGroupReservation" ! table="STUDENT_GROUP_RESERVATION" ! abstract="false" ! > ! <many-to-one name="studentGroup" ! class="StudentGroup" ! column="STUDENT_GROUP" ! not-null="true" ! /> ! ! </union-subclass> ! ! <union-subclass ! name="CourseOfferingReservation" ! table="COURSE_RESERVATION" ! abstract="false" ! > ! <many-to-one name="courseOffering" ! class="CourseOffering" ! column="COURSE_OFFERING" ! not-null="true" ! /> ! ! </union-subclass> ! ! <union-subclass ! name="AcadAreaPosReservation" ! abstract="true" ! > ! <many-to-one name="academicClassification" ! class="AcademicClassification" ! column="ACAD_CLASSIFICATION" ! not-null="false" ! /> ! ! <union-subclass ! name="AcadAreaReservation" ! table="ACAD_AREA_RESERVATION" ! abstract="false" ! > ! <many-to-one name="academicArea" ! class="AcademicArea" ! column="ACAD_AREA" ! not-null="true" ! /> ! ! </union-subclass> ! ! <union-subclass ! name="PosReservation" ! table="POS_RESERVATION" ! abstract="false" ! > ! <many-to-one name="posMajor" ! class="PosMajor" ! column="POS_MAJOR" ! not-null="true" ! /> ! ! </union-subclass> ! ! </union-subclass> ! ! </union-subclass> ! ! </class> </hibernate-mapping> --- 17,173 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> <hibernate-mapping package="org.unitime.timetable.model"> ! <class name="Reservation" abstract="true"> ! <cache include="non-lazy" usage="read-write"/> ! <id name="uniqueId" ! column="uniqueid" ! type="java.lang.Long"> <generator class="org.unitime.commons.hibernate.id.UniqueIdGenerator"> ! <param name="sequence">reservation_seq</param> ! </generator> </id> ! <property ! name="ownerClassId" ! column="owner_class_id" ! type="java.lang.String" ! not-null="true" ! length="1"/> ! <property ! name="owner" ! column="owner" ! type="java.lang.Long" ! not-null="true" ! length="20"/> ! <property ! name="priority" ! column="priority" ! type="java.lang.Integer" ! not-null="true" ! length="5"/> ! <many-to-one ! name="reservationType" ! class="ReservationType" ! column="reservation_type" ! not-null="true"/> ! <union-subclass ! name="IndividualReservation" ! table="individual_reservation" ! abstract="false"> ! <property ! name="externalUniqueId" ! column="external_uid" ! type="java.lang.String" ! not-null="true" ! length="40"/> ! ! <property ! name="overLimit" ! column="over_limit" ! type="java.lang.Boolean" ! not-null="true"/> ! ! <property ! name="expirationDate" ! column="expiration_date" ! type="java.sql.Timestamp" ! not-null="true"/> ! ! </union-subclass> ! ! <union-subclass name="CharacteristicReservation" abstract="true"> ! <property ! name="reserved" ! column="reserved" ! type="java.lang.Integer" ! not-null="true" ! length="10"/> ! ! <property ! name="requested" ! column="requested" ! type="java.lang.Integer" ! not-null="false" ! length="10"/> ! ! <property ! name="priorEnrollment" ! column="prior_enrollment" ! type="java.lang.Integer" ! not-null="false" ! length="10"/> ! ! <property ! name="projectedEnrollment" ! column="projected_enrollment" ! type="java.lang.Integer" ! not-null="false" ! length="10"/> ! ! <union-subclass ! name="StudentGroupReservation" ! table="student_group_reservation" ! abstract="false"> ! <many-to-one ! name="studentGroup" ! class="StudentGroup" ! column="student_group" ! not-null="true"/> ! ! </union-subclass> ! ! <union-subclass ! name="CourseOfferingReservation" ! table="course_reservation" ! abstract="false"> ! <many-to-one ! name="courseOffering" ! class="CourseOffering" ! column="course_offering" ! not-null="true"/> ! ! </union-subclass> ! ! <union-subclass name="AcadAreaPosReservation" abstract="true"> ! <many-to-one ! name="academicClassification" ! class="AcademicClassification" ! column="acad_classification" ! not-null="false"/> ! ! <union-subclass ! name="AcadAreaReservation" ! table="acad_area_reservation" ! abstract="false"> ! <many-to-one ! name="academicArea" ! class="AcademicArea" ! column="acad_area" ! not-null="true"/> ! ! </union-subclass> ! ! <union-subclass ! name="PosReservation" ! table="pos_reservation" ! abstract="false"> ! <many-to-one ! name="posMajor" ! class="PosMajor" ! column="pos_major" ! not-null="true"/> ! ! </union-subclass> ! ! </union-subclass> ! </union-subclass> ! </class> </hibernate-mapping> Index: History.hbm.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/History.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** History.hbm.xml 17 Jun 2008 21:24:47 -0000 1.2 --- History.hbm.xml 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,14 **** ! <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping PUBLIC ! "-//Hibernate/Hibernate Mapping DTD 3.0//EN" ! "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,12 ---- ! <?xml version="1.0" encoding="UTF-8"?> ! <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 19,117 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> - <hibernate-mapping package="org.unitime.timetable.model"> ! <class ! name="History" ! table="HISTORY"> ! ! <cache include="non-lazy" usage="nonstrict-read-write"/> ! <id name="uniqueId" ! column="UNIQUEID" ! type="java.lang.Long" ! > <generator class="org.unitime.commons.hibernate.id.UniqueIdGenerator"> ! <param name="sequence">HISTORY_SEQ</param> </generator> </id> - - <discriminator column="subclass" - type="java.lang.String" - not-null="true" - length="10" - /> - - <property - name="oldValue" - column="OLD_VALUE" - type="java.lang.String" - not-null="true" - length="20" - /> - - <property - name="newValue" - column="NEW_VALUE" - type="java.lang.String" - not-null="true" - length="20" - /> ! <property ! name="sessionId" ! column="SESSION_ID" ! type="java.lang.Long" ! not-null="true" ! insert="false" ! update="false" ! length="20" ! /> ! <many-to-one ! name="session" ! class="Session" ! column="SESSION_ID" ! insert="false" ! update="false" ! foreign-key="FK_HISTORY_SESSION" ! /> ! ! <subclass name="SubjectHistory" ! discriminator-value="Subject"> ! </subclass> ! ! <subclass name="CourseHistory" ! discriminator-value="Course"> ! ! <property ! name="oldNumber" ! column="OLD_NUMBER" ! type="java.lang.String" ! not-null="false" ! length="4" ! /> ! ! <property ! name="newNumber" ! column="NEW_NUMBER" ! type="java.lang.String" ! not-null="false" ! length="4" ! /> ! ! </subclass> ! ! <subclass name="AcademicAreaHistory" ! discriminator-value="AcadArea"> ! </subclass> ! ! <subclass name="BuildingAbbreviationHistory" ! discriminator-value="Building"> ! </subclass> ! ! </class> </hibernate-mapping> --- 17,91 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> <hibernate-mapping package="org.unitime.timetable.model"> ! <class name="History" table="history"> ! <cache include="non-lazy" usage="nonstrict-read-write"/> <id name="uniqueId" ! column="uniqueid" ! type="java.lang.Long"> <generator class="org.unitime.commons.hibernate.id.UniqueIdGenerator"> ! <param name="sequence">history_seq</param> </generator> </id> ! <discriminator ! column="subclass" ! type="java.lang.String" ! not-null="true" ! length="10"/> ! <property ! name="oldValue" ! column="old_value" ! type="java.lang.String" ! not-null="true" ! length="20"/> ! ! <property ! name="newValue" ! column="new_value" ! type="java.lang.String" ! not-null="true" ! length="20"/> ! ! <property ! name="sessionId" ! column="session_id" ! type="java.lang.Long" ! not-null="true" ! insert="false" ! update="false" ! length="20"/> ! ! <many-to-one ! name="session" ! class="Session" ! column="session_id" ! insert="false" ! update="false" ! foreign-key="fk_history_session"/> ! ! <subclass name="SubjectHistory" discriminator-value="Subject"/> ! <subclass name="CourseHistory" discriminator-value="Course"> ! <property ! name="oldNumber" ! column="old_number" ! type="java.lang.String" ! not-null="false" ! length="4"/> ! ! <property ! name="newNumber" ! column="new_number" ! type="java.lang.String" ! not-null="false" ! length="4"/> ! ! </subclass> ! <subclass name="AcademicAreaHistory" discriminator-value="AcadArea"/> ! <subclass name="BuildingAbbreviationHistory" discriminator-value="Building"/> ! </class> </hibernate-mapping> Index: WaitList.hbm.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/WaitList.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WaitList.hbm.xml 17 Jun 2008 21:24:47 -0000 1.2 --- WaitList.hbm.xml 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,14 **** ! <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping PUBLIC ! "-//Hibernate/Hibernate Mapping DTD 3.0//EN" ! "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> ! <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,12 ---- ! <?xml version="1.0" encoding="UTF-8"?> ! <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> ! <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 19,71 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> - <hibernate-mapping package="org.unitime.timetable.model"> ! ! <class name="WaitList" table="WAITLIST"> ! ! <cache include="non-lazy" usage="nonstrict-read-write"/> ! ! <id name="uniqueId" column="UNIQUEID" type="java.lang.Long"> <generator class="org.unitime.commons.hibernate.id.UniqueIdGenerator"> ! <param name="sequence">PREF_GROUP_SEQ</param> </generator> </id> - - <many-to-one - name="student" - class="Student" - column="STUDENT_ID" - not-null="true" - foreign-key="FK_WAITLIST_STUDENT" - /> - - <many-to-one - name="courseOffering" - class="CourseOffering" - column="COURSE_OFFERING_ID" - not-null="true" - foreign-key="FK_WAITLIST_COURSE_OFFERING" - /> ! <property ! name="type" ! column="TYPE" ! type="java.lang.Integer" ! not-null="true" ! length="10" ! /> ! <property ! name="timestamp" ! column="TIMESTAMP" ! type="java.util.Date" ! not-null="true" ! /> ! </class> </hibernate-mapping> --- 17,62 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> <hibernate-mapping package="org.unitime.timetable.model"> ! <class name="WaitList" table="waitlist"> ! <cache include="non-lazy" usage="nonstrict-read-write"/> ! <id ! name="uniqueId" ! column="uniqueid" ! type="java.lang.Long"> <generator class="org.unitime.commons.hibernate.id.UniqueIdGenerator"> ! <param name="sequence">pref_group_seq</param> </generator> </id> ! <many-to-one ! name="student" ! class="Student" ! column="student_id" ! not-null="true" ! foreign-key="fk_waitlist_student"/> ! <many-to-one ! name="courseOffering" ! class="CourseOffering" ! column="course_offering_id" ! not-null="true" ! foreign-key="fk_waitlist_course_offering"/> + <property + name="type" + column="type" + type="java.lang.Integer" + not-null="true" + length="10"/> ! <property ! name="timestamp" ! column="timestamp" ! type="java.util.Date" ! not-null="true"/> + </class> </hibernate-mapping> Index: CourseRequestOption.hbm.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/CourseRequestOption.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CourseRequestOption.hbm.xml 17 Jun 2008 21:24:47 -0000 1.2 --- CourseRequestOption.hbm.xml 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,14 **** ! <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping PUBLIC ! "-//Hibernate/Hibernate Mapping DTD 3.0//EN" ! "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,12 ---- ! <?xml version="1.0" encoding="UTF-8"?> ! <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 19,63 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> - <hibernate-mapping package="org.unitime.timetable.model"> ! ! <class name="CourseRequestOption" table="COURSE_REQUEST_OPTION"> ! ! <cache include="non-lazy" usage="nonstrict-read-write"/> ! ! <id name="uniqueId" column="UNIQUEID" type="java.lang.Long"> <generator class="org.unitime.commons.hibernate.id.UniqueIdGenerator"> ! <param name="sequence">PREF_GROUP_SEQ</param> </generator> </id> - - <many-to-one - name="courseRequest" - class="CourseRequest" - column="COURSE_REQUEST_ID" - not-null="true" - foreign-key="FK_COURSE_REQUEST_OPTIONS_REQ" - /> ! <property ! name="optionType" ! column="OPTION_TYPE" ! type="java.lang.Integer" ! not-null="true" ! length="10" ! /> ! <property ! name="value" ! column="VALUE" ! type="org.unitime.commons.hibernate.blob.XmlBlobType" ! not-null="true" ! length="65535" ! /> ! </class> </hibernate-mapping> --- 17,56 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> <hibernate-mapping package="org.unitime.timetable.model"> ! <class name="CourseRequestOption" table="course_request_option"> ! <cache include="non-lazy" usage="nonstrict-read-write"/> ! <id ! name="uniqueId" ! column="uniqueid" ! type="java.lang.Long"> <generator class="org.unitime.commons.hibernate.id.UniqueIdGenerator"> ! <param name="sequence">pref_group_seq</param> </generator> </id> ! <many-to-one ! name="courseRequest" ! class="CourseRequest" ! column="course_request_id" ! not-null="true" ! foreign-key="fk_course_request_options_req"/> ! <property ! name="optionType" ! column="option_type" ! type="java.lang.Integer" ! not-null="true" ! length="10"/> ! <property ! name="value" ! column="value" ! type="org.unitime.commons.hibernate.blob.XmlBlobType" ! not-null="true" ! length="65535"/> + </class> </hibernate-mapping> Index: SolverInfoDef.hbm.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/SolverInfoDef.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SolverInfoDef.hbm.xml 17 Jun 2008 21:24:47 -0000 1.2 --- SolverInfoDef.hbm.xml 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,14 **** ! <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping PUBLIC ! "-//Hibernate/Hibernate Mapping DTD 3.0//EN" ! "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,12 ---- ! <?xml version="1.0" encoding="UTF-8"?> ! <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 19,66 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> - <hibernate-mapping package="org.unitime.timetable.model"> ! <class ! name="SolverInfoDef" ! table="SOLVER_INFO_DEF"> ! ! <cache include="non-lazy" usage="read-write"/> ! <id name="uniqueId" ! column="UNIQUEID" ! type="java.lang.Long" ! > <generator class="org.unitime.commons.hibernate.id.UniqueIdGenerator"> ! <param name="sequence">SOLVER_INFO_DEF_SEQ</param> </generator> </id> - - <property - name="name" - column="NAME" - type="java.lang.String" - not-null="false" - length="100" - /> ! <property ! name="description" ! column="DESCRIPTION" ! type="java.lang.String" ! not-null="false" ! length="1000" ! /> ! <property ! name="implementation" ! column="IMPLEMENTATION" ! type="java.lang.String" ! not-null="false" ! length="250" ! /> ! </class> </hibernate-mapping> --- 17,56 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> <hibernate-mapping package="org.unitime.timetable.model"> ! <class name="SolverInfoDef" table="solver_info_def"> ! <cache include="non-lazy" usage="read-write"/> <id name="uniqueId" ! column="uniqueid" ! type="java.lang.Long"> <generator class="org.unitime.commons.hibernate.id.UniqueIdGenerator"> ! <param name="sequence">solver_info_def_seq</param> </generator> </id> ! <property ! name="name" ! column="name" ! type="java.lang.String" ! not-null="false" ! length="100"/> ! <property ! name="description" ! column="description" ! type="java.lang.String" ! not-null="false" ! length="1000"/> ! ! <property ! name="implementation" ! column="implementation" ! type="java.lang.String" ! not-null="false" ! length="250"/> ! ! </class> </hibernate-mapping> Index: hibernate-configuration-3.0.dtd =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/hibernate-configuration-3.0.dtd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** hibernate-configuration-3.0.dtd 30 Mar 2010 15:45:09 -0000 1.1 --- hibernate-configuration-3.0.dtd 1 Dec 2010 11:10:38 -0000 1.2 *************** *** 35,42 **** <!ELEMENT event (listener*)> ! <!ATTLIST event type (auto-flush|merge|create|delete|dirty-check|evict|flush|flush-entity|load|load-collection|lock|refresh|replicate|save-update|save|update|pre-load|pre-update|pre-insert|pre-delete|post-load|post-update|post-insert|post-delete|post-commit-update|post-commit-insert|post-commit-delete) #REQUIRED> <!ELEMENT listener EMPTY> ! <!ATTLIST listener type (auto-flush|merge|create|delete|dirty-check|evict|flush|flush-entity|load|load-collection|lock|refresh|replicate|save-update|save|update|pre-load|pre-update|pre-insert|pre-delete|post-load|post-update|post-insert|post-delete|post-commit-update|post-commit-insert|post-commit-delete) #IMPLIED> <!ATTLIST listener class CDATA #REQUIRED> --- 35,42 ---- <!ELEMENT event (listener*)> ! <!ATTLIST event type (auto-flush|merge|create|create-onflush|delete|dirty-check|evict|flush|flush-entity|load|load-collection|lock|refresh|replicate|save-update|save|update|pre-load|pre-update|pre-insert|pre-delete|pre-collection-recreate|pre-collection-remove|pre-collection-update|post-load|post-update|post-insert|post-delete|post-collection-recreate|post-collection-remove|post-collection-update|post-commit-update|post-commit-insert|post-commit-delete) #REQUIRED> <!ELEMENT listener EMPTY> ! <!ATTLIST listener type (auto-flush|merge|create|create-onflush|delete|dirty-check|evict|flush|flush-entity|load|load-collection|lock|refresh|replicate|save-update|save|update|pre-load|pre-update|pre-insert|pre-delete|pre-collection-recreate|pre-collection-remove|pre-collection-update|post-load|post-update|post-insert|post-delete|post-collection-recreate|post-collection-remove|post-collection-update|post-commit-update|post-commit-insert|post-commit-delete) #IMPLIED> <!ATTLIST listener class CDATA #REQUIRED> Index: SolverGroup.hbm.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/SolverGroup.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SolverGroup.hbm.xml 17 Jun 2008 21:24:47 -0000 1.2 --- SolverGroup.hbm.xml 1 Dec 2010 11:10:38 -0000 1.3 *************** *** 1,14 **** ! <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping PUBLIC ! "-//Hibernate/Hibernate Mapping DTD 3.0//EN" ! "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <!-- ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,12 ---- ! <?xml version="1.0" encoding="UTF-8"?> ! <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <!-- ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 19,87 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> - <hibernate-mapping package="org.unitime.timetable.model"> ! <class name="SolverGroup" table="SOLVER_GROUP"> ! ! <cache include="non-lazy" usage="read-write"/> ! ! <id name="uniqueId" column="UNIQUEID" type="java.lang.Long"> <generator class="org.unitime.commons.hibernate.id.UniqueIdGenerator"> ! <param name="sequence">SOLVER_GROUP_SEQ</param> </generator> </id> - - <property - name="name" - column="NAME" - type="string" - not-null="true" - length="50" - /> - - <property - name="abbv" - column="ABBV" - type="string" - not-null="true" - length="10" - /> ! <many-to-one ! name="session" ! class="Session" ! column="SESSION_ID" ! not-null="true" ! foreign-key="FK_SOLVER_GROUP_SESSION" ! /> ! <set name="timetableManagers" table="SOLVER_GR_TO_TT_MGR" > ! <cache include="non-lazy" usage="read-write"/> ! <key column="SOLVER_GROUP_ID"/> ! <many-to-many ! class="TimetableManager" ! column="TIMETABLE_MGR_ID" ! foreign-key="FK_SOLVER_GR_TO_TT_MGR_TTMGR"/> ! </set> ! <set name="departments" table="DEPARTMENT" ! cascade="none" ! lazy="true" ! inverse="true" ! > ! <key column="SOLVER_GROUP_ID"/> ! <one-to-many class="Department" /> ! </set> ! ! <set name="solutions" table="SOLUTION" ! inverse="true" ! lazy="true" ! cascade="all-delete-orphan" > ! <cache include="non-lazy" usage="read-write"/> ! <key column="OWNER_ID"/> ! <one-to-many class="Solution"/> ! </set> ! </class> </hibernate-mapping> --- 17,88 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> <hibernate-mapping package="org.unitime.timetable.model"> ! <class name="SolverGroup" table="solver_group"> ! <cache include="non-lazy" usage="read-write"/> ! <id ! name="uniqueId" ! column="uniqueid" ! type="java.lang.Long"> <generator class="org.unitime.commons.hibernate.id.UniqueIdGenerator"> ! <param name="sequence">solver_group_seq</param> </generator> </id> ! <property ! name="name" ! column="name" ! type="string... [truncated message content] |
|
From: Tomas M. <to...@us...> - 2010-12-01 11:11:05
|
Update of /cvsroot/unitime/UniTime/Documentation/License In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/Documentation/License Modified Files: gpl.txt Added Files: dependencies.txt Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) --- NEW FILE: dependencies.txt --- For The Apache Software License, Version 2.0, see http://www.apache.org/licenses/LICENSE-2.0 For the GNU licenses, see http://www.gnu.org/licenses/ cpsolver-all-1.2.jar Constraint Solver Library URL: http://cpsolver.sf.net Copyright: (C) 2006 - 2010 Tomas Muller License: GNU Lesser General Public License, Version 3.0 log4j-1.2.8.jar Log4J (Apache Logging Services) URL: http://logging.apache.org/log4j/1.2/ Copyright: (C) 1999 - 2010 Apache Software Foundation License: Apache Software License, Version 2.0 dom4j-1.6.1.jar Dom4J (XML Processing Library) URL: http://dom4j.sourceforge.net Copyright: (C) 2001 - 2005 MetaStuff, Ltd. License: Proprietary, included in dom4j-1.6.1.jar ant.jar Apache Ant (build time dependency) URL: http://ant.apache.org/ Copyright: (C) 1999 - 2006 Apache Software Foundation License: Apache Software License, Version 2.0 google-sites-liberation-1.0.3.jar Import/Export tool for Google Sites (build time dependency) URL: http://code.google.com/p/google-sites-liberation/ Copyrigt: (C) 2010 Google License: Apache Software License, Version 2.0 gwt-dev.jar, gwt-user.jar, gwt-servlet.jar Google Web Toolkit 2.1 URL: http://code.google.com/webtoolkit/ Copyrigt: (C) 2010 Google License: Apache Software License, Version 2.0 jsp-api.jar, servlet-api.jar Java API for JSPs and Servlets URL: http://java.sun.com/products/jsp/ Copyrigt: (C) 2006 - 2007 Sun Microsystems, Inc License: Apache Software License, Version 2.0 antlr-2.7.6.jar ANother Tool for Language Recognition (Hibernate dependency, Struts dependency) URL: http://www.antlr.org/ Copyright: (C) 2003-2008, Terence Parr License: BSD, see http://www.antlr.org/license.html backport-util-concurrent.jar Unknown (Hibernate dependency) URL: http://backport-jsr166.sourceforge.net/ Copyright: (C) 2004-2007 Distributed Computing Laboratory, Emory University License: Public Domain, see http://creativecommons.org/licenses/publicdomain/ bsf-2.3.0.jar Bean Scripting Framework (Struts dependency) License: Apache Software License, Version 2.0 commons-beanutils-1.8.0.jar, commons-chain-1.2.jar, commons-configuration-1.6.jar, commons-dbcp-1.4.jar, commons-digester-1.8.jar, commons-fileupload-1.1.1.jar, commons-io-1.1.jar, commons-logging-1.1.1.jar, commons-pool-1.5.4.jar, commons-validator-1.3.1.jar Appache Commons (Hibernate, Struts dependencies) URL: http://commons.apache.org/ Copyright: (C) 2000-2010 The Apache Software Foundation License: Apache Software License, Version 2.0 ehcache-1.5.0.jar Ehcache (Hibernate dependency) URL: http://ehcache.org/ Copyright: (C) 2003-2010 Terracotta, Inc. License: Apache Software License, Version 2.0 hibernate3.jar Hibernate 3.0.5 URL: http://www.hibernate.org/ Copyright: (c) 2008, Adam Warski, JBoss Inc. License: GNU Lesser General Public License, Version 2.1 iText-5.0.2.jar iText is a library that allows you to create and manipulate PDF documents URL: http://itextpdf.com/ Copyright: (C) 2010 1T3XT BVBA License: GNU Affero General Public License, Versin 3 javassist-3.9.0.GA.jar Java Programming Assistant for bytecode manipulation URL: http://www.csg.is.titech.ac.jp/~chiba/javassist/ Copyright: (C) 1999-2010 Shigeru Chiba License: GNU Lesser General Public License jstl-1.0.2.jar JavaServer Pages Standard Tag Library (Struts dependency) URL: https://jstl.dev.java.net/ License: Common Development and Distribution License (CDDL) version 1.0 License: GNU General Public License (GPL) version 2 jta-1.1.jar Java Transaction API (Hibernate dependency) URL: http://www.oracle.com/technetwork/java/javaee/tech/jta-138684.html Copyright: (C) Sun Microsystems, Inc. License: Proprietary Sun's SLA, see https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewLicense-Start log4j-1.2.15.jar Apache Logging Service URL: http://logging.apache.org/log4j/1.2/ Copyright: (C) 1999-2010 Apache Software Foundation License: The Apache Software License, Version 2.0 mail.jar JavaMail API URL: http://www.oracle.com/technetwork/java/index-jsp-139225.html Copyright: Sun Microsystems, Inc. License: Common Development and Distribution License (CDDL) version 1.0 License: GNU General Public License (GPL) version 2 mysql-connector-java-5.1.11-bin.jar MySQL Connector/J Copyright: (C) 2010 Oracle Corp. URL: http://www.mysql.com/products/connector/ License: GNU General Public License (GPL) version 2 org.restlet.ext.net.jar, org.restlet.jar RESTful web framework for Java v2.0.2 URL: http://www.restlet.org/ Copyright: (C) 2005 - 2010 Noelios Technologies License: GNU Lesser General Public License, Version 3.0 oro-2.0.8.jar Text processing Apache Jakarta-ORO (Struts dependency) URL: http://jakarta.apache.org/oro/ Copyright: (C) 1999 - 2004, The Apache Software Foundation License: The Apache Software License, Version 2.0 slf4j-api-1.5.8.jar, slf4j-log4j12-1.5.8.jar Simple Logging Facade for Java (Hibernate dependency) URL: http://www.slf4j.org/ Copyright: (C) 2004-2008 QOS.ch License: Proprietary MIT license, see http://www.slf4j.org/license.html standard-1.0.6.jar Apache Standard Tag Library implementation URL: http://tomcat.apache.org/taglibs/standard/ Copyright: (C) 2001 - 2009 The Apache Software Foundation License: The Apache Software License, Version 2.0 struts-core-1.3.10.jar, struts-el-1.3.10.jar, struts-extras-1.3.10.jar, struts-faces-1.3.10.jar, struts-mailreader-dao-1.3.10.jar, struts-scripting-1.3.10.jar, struts-taglib-1.3.10.jar, struts-tiles-1.3.10.jar Apache Struts URL: http://struts.apache.org/ Copyright: 2000-2008 Apache Software Foundation License: The Apache Software License, Version 2.0 Struts-Layout-1.3.jar Struts Layout URL: http://struts.improve-technologies.com/ Copyright: (C) 2001-2010, Improve SA License: The Apache Software License, Version 2.0 Index: gpl.txt =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/License/gpl.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gpl.txt 12 Jun 2007 02:27:47 -0000 1.1 --- gpl.txt 1 Dec 2010 11:10:54 -0000 1.2 *************** *** 1,20 **** ! GNU GENERAL PUBLIC LICENSE ! Version 2, June 1991 ! Copyright (C) 1989, 1991 Free Software Foundation, Inc., ! 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. ! Preamble ! The licenses for most software are designed to take away your ! freedom to share and change it. By contrast, the GNU General Public ! License is intended to guarantee your freedom to share and change free ! software--to make sure the software is free for all its users. This ! General Public License applies to most of the Free Software ! Foundation's software and to any other program whose authors commit to ! using it. (Some other Free Software Foundation software is covered by ! the GNU Lesser General Public License instead.) You can apply it to your programs, too. --- 1,21 ---- ! GNU GENERAL PUBLIC LICENSE ! Version 3, 29 June 2007 ! Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. ! Preamble ! The GNU General Public License is a free, copyleft license for ! software and other kinds of works. ! ! The licenses for most software and other practical works are designed ! to take away your freedom to share and change the works. By contrast, ! the GNU General Public License is intended to guarantee your freedom to ! share and change all versions of a program--to make sure it remains free ! software for all its users. We, the Free Software Foundation, use the ! GNU General Public License for most of our software; it applies also to ! any other work released this way by its authors. You can apply it to your programs, too. *************** *** 22,280 **** price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for ! this service if you wish), that you receive source code or can get it ! if you want it, that you can change the software or use pieces of it ! in new free programs; and that you know you can do these things. ! To protect your rights, we need to make restrictions that forbid ! anyone to deny you these rights or to ask you to surrender the rights. ! These restrictions translate to certain responsibilities for you if you ! distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether ! gratis or for a fee, you must give the recipients all the rights that ! you have. You must make sure that they, too, receive or can get the ! source code. And you must show them these terms so they know their ! rights. ! We protect your rights with two steps: (1) copyright the software, and ! (2) offer you this license which gives you legal permission to copy, ! distribute and/or modify the software. ! Also, for each author's protection and ours, we want to make certain ! that everyone understands that there is no warranty for this free ! software. If the software is modified by someone else and passed on, we ! want its recipients to know that what they have is not the original, so ! that any problems introduced by others will not reflect on the original ! authors' reputations. ! Finally, any free program is threatened constantly by software ! patents. We wish to avoid the danger that redistributors of a free ! program will individually obtain patent licenses, in effect making the ! program proprietary. To prevent this, we have made it clear that any ! patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. ! GNU GENERAL PUBLIC LICENSE ! TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ! 0. This License applies to any program or other work which contains ! a notice placed by the copyright holder saying it may be distributed ! under the terms of this General Public License. The "Program", below, ! refers to any such program or work, and a "work based on the Program" ! means either the Program or any derivative work under copyright law: ! that is to say, a work containing the Program or a portion of it, ! either verbatim or with modifications and/or translated into another ! language. (Hereinafter, translation is included without limitation in ! the term "modification".) Each licensee is addressed as "you". ! Activities other than copying, distribution and modification are not ! covered by this License; they are outside its scope. The act of ! running the Program is not restricted, and the output from the Program ! is covered only if its contents constitute a work based on the ! Program (independent of having been made by running the Program). ! Whether that is true depends on what the Program does. ! 1. You may copy and distribute verbatim copies of the Program's ! source code as you receive it, in any medium, provided that you ! conspicuously and appropriately publish on each copy an appropriate ! copyright notice and disclaimer of warranty; keep intact all the ! notices that refer to this License and to the absence of any warranty; ! and give any other recipients of the Program a copy of this License ! along with the Program. ! You may charge a fee for the physical act of transferring a copy, and ! you may at your option offer warranty protection in exchange for a fee. ! 2. You may modify your copy or copies of the Program or any portion ! of it, thus forming a work based on the Program, and copy and ! distribute such modifications or work under the terms of Section 1 ! above, provided that you also meet all of these conditions: ! a) You must cause the modified files to carry prominent notices ! stating that you changed the files and the date of any change. ! b) You must cause any work that you distribute or publish, that in ! whole or in part contains or is derived from the Program or any ! part thereof, to be licensed as a whole at no charge to all third ! parties under the terms of this License. ! c) If the modified program normally reads commands interactively ! when run, you must cause it, when started running for such ! interactive use in the most ordinary way, to print or display an ! announcement including an appropriate copyright notice and a ! notice that there is no warranty (or else, saying that you provide ! a warranty) and that users may redistribute the program under ! these conditions, and telling the user how to view a copy of this ! License. (Exception: if the Program itself is interactive but ! does not normally print such an announcement, your work based on ! the Program is not required to print an announcement.) ! These requirements apply to the modified work as a whole. If ! identifiable sections of that work are not derived from the Program, ! and can be reasonably considered independent and separate works in ! themselves, then this License, and its terms, do not apply to those ! sections when you distribute them as separate works. But when you ! distribute the same sections as part of a whole which is a work based ! on the Program, the distribution of the whole must be on the terms of ! this License, whose permissions for other licensees extend to the ! entire whole, and thus to each and every part regardless of who wrote it. ! Thus, it is not the intent of this section to claim rights or contest ! your rights to work written entirely by you; rather, the intent is to ! exercise the right to control the distribution of derivative or ! collective works based on the Program. ! In addition, mere aggregation of another work not based on the Program ! with the Program (or with a work based on the Program) on a volume of ! a storage or distribution medium does not bring the other work under ! the scope of this License. ! 3. You may copy and distribute the Program (or a work based on it, ! under Section 2) in object code or executable form under the terms of ! Sections 1 and 2 above provided that you also do one of the following: ! a) Accompany it with the complete corresponding machine-readable ! source code, which must be distributed under the terms of Sections ! 1 and 2 above on a medium customarily used for software interchange; or, ! b) Accompany it with a written offer, valid for at least three ! years, to give any third party, for a charge no more than your ! cost of physically performing source distribution, a complete ! machine-readable copy of the corresponding source code, to be ! distributed under the terms of Sections 1 and 2 above on a medium ! customarily used for software interchange; or, ! c) Accompany it with the information you received as to the offer ! to distribute corresponding source code. (This alternative is ! allowed only for noncommercial distribution and only if you ! received the program in object code or executable form with such ! an offer, in accord with Subsection b above.) ! The source code for a work means the preferred form of the work for ! making modifications to it. For an executable work, complete source ! code means all the source code for all modules it contains, plus any ! associated interface definition files, plus the scripts used to ! control compilation and installation of the executable. However, as a ! special exception, the source code distributed need not include ! anything that is normally distributed (in either source or binary ! form) with the major components (compiler, kernel, and so on) of the ! operating system on which the executable runs, unless that component ! itself accompanies the executable. ! If distribution of executable or object code is made by offering ! access to copy from a designated place, then offering equivalent ! access to copy the source code from the same place counts as ! distribution of the source code, even though third parties are not ! compelled to copy the source along with the object code. ! 4. You may not copy, modify, sublicense, or distribute the Program ! except as expressly provided under this License. Any attempt ! otherwise to copy, modify, sublicense or distribute the Program is ! void, and will automatically terminate your rights under this License. ! However, parties who have received copies, or rights, from you under ! this License will not have their licenses terminated so long as such ! parties remain in full compliance. ! 5. You are not required to accept this License, since you have not ! signed it. However, nothing else grants you permission to modify or ! distribute the Program or its derivative works. These actions are ! prohibited by law if you do not accept this License. Therefore, by ! modifying or distributing the Program (or any work based on the ! Program), you indicate your acceptance of this License to do so, and ! all its terms and conditions for copying, distributing or modifying ! the Program or works based on it. ! 6. Each time you redistribute the Program (or any work based on the ! Program), the recipient automatically receives a license from the ! original licensor to copy, distribute or modify the Program subject to ! these terms and conditions. You may not impose any further ! restrictions on the recipients' exercise of the rights granted herein. ! You are not responsible for enforcing compliance by third parties to this License. ! 7. If, as a consequence of a court judgment or allegation of patent ! infringement or for any other reason (not limited to patent issues), ! conditions are imposed on you (whether by court order, agreement or ! otherwise) that contradict the conditions of this License, they do not ! excuse you from the conditions of this License. If you cannot ! distribute so as to satisfy simultaneously your obligations under this ! License and any other pertinent obligations, then as a consequence you ! may not distribute the Program at all. For example, if a patent ! license would not permit royalty-free redistribution of the Program by ! all those who receive copies directly or indirectly through you, then ! the only way you could satisfy both it and this License would be to ! refrain entirely from distribution of the Program. ! If any portion of this section is held invalid or unenforceable under ! any particular circumstance, the balance of the section is intended to ! apply and the section as a whole is intended to apply in other ! circumstances. ! It is not the purpose of this section to induce you to infringe any ! patents or other property right claims or to contest validity of any ! such claims; this section has the sole purpose of protecting the ! integrity of the free software distribution system, which is ! implemented by public license practices. Many people have made ! generous contributions to the wide range of software distributed ! through that system in reliance on consistent application of that ! system; it is up to the author/donor to decide if he or she is willing ! to distribute software through any other system and a licensee cannot ! impose that choice. ! This section is intended to make thoroughly clear what is believed to ! be a consequence of the rest of this License. ! 8. If the distribution and/or use of the Program is restricted in ! certain countries either by patents or by copyrighted interfaces, the ! original copyright holder who places the Program under this License ! may add an explicit geographical distribution limitation excluding ! those countries, so that distribution is permitted only in or among ! countries not thus excluded. In such case, this License incorporates ! the limitation as if written in the body of this License. ! 9. The Free Software Foundation may publish revised and/or new versions ! of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. ! Each version is given a distinguishing version number. If the Program ! specifies a version number of this License which applies to it and "any ! later version", you have the option of following the terms and conditions ! either of that version or of any later version published by the Free ! Software Foundation. If the Program does not specify a version number of ! this License, you may choose any version ever published by the Free Software ! Foundation. ! 10. If you wish to incorporate parts of the Program into other free ! programs whose distribution conditions are different, write to the author ! to ask for permission. For software which is copyrighted by the Free ! Software Foundation, write to the Free Software Foundation; we sometimes ! make exceptions for this. Our decision will be guided by the two goals ! of preserving the free status of all derivatives of our free software and ! of promoting the sharing and reuse of software generally. ! NO WARRANTY ! 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY ! FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN ! OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES ! PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED ! OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ! MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS ! TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE ! PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, ! REPAIR OR CORRECTION. ! 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING ! WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR ! REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, ! INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING ! OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED ! TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY ! YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER ! PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE ! POSSIBILITY OF SUCH DAMAGES. ! END OF TERMS AND CONDITIONS \ No newline at end of file --- 23,621 ---- price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for ! them if you wish), that you receive source code or can get it if you ! want it, that you can change the software or use pieces of it in new ! free programs, and that you know you can do these things. ! To protect your rights, we need to prevent others from denying you ! these rights or asking you to surrender the rights. Therefore, you have ! certain responsibilities if you distribute copies of the software, or if ! you modify it: responsibilities to respect the freedom of others. For example, if you distribute copies of such a program, whether ! gratis or for a fee, you must pass on to the recipients the same ! freedoms that you received. You must make sure that they, too, receive ! or can get the source code. And you must show them these terms so they ! know their rights. ! Developers that use the GNU GPL protect your rights with two steps: ! (1) assert copyright on the software, and (2) offer you this License ! giving you legal permission to copy, distribute and/or modify it. ! For the developers' and authors' protection, the GPL clearly explains ! that there is no warranty for this free software. For both users' and ! authors' sake, the GPL requires that modified versions be marked as ! changed, so that their problems will not be attributed erroneously to ! authors of previous versions. ! Some devices are designed to deny users access to install or run ! modified versions of the software inside them, although the manufacturer ! can do so. This is fundamentally incompatible with the aim of ! protecting users' freedom to change the software. The systematic ! pattern of such abuse occurs in the area of products for individuals to ! use, which is precisely where it is most unacceptable. Therefore, we ! have designed this version of the GPL to prohibit the practice for those ! products. If such problems arise substantially in other domains, we ! stand ready to extend this provision to those domains in future versions ! of the GPL, as needed to protect the freedom of users. ! ! Finally, every program is threatened constantly by software patents. ! States should not allow patents to restrict development and use of ! software on general-purpose computers, but in those that do, we wish to ! avoid the special danger that patents applied to a free program could ! make it effectively proprietary. To prevent this, the GPL assures that ! patents cannot be used to render the program non-free. The precise terms and conditions for copying, distribution and modification follow. ! TERMS AND CONDITIONS ! 0. Definitions. ! "This License" refers to version 3 of the GNU General Public License. ! "Copyright" also means copyright-like laws that apply to other kinds of ! works, such as semiconductor masks. ! "The Program" refers to any copyrightable work licensed under this ! License. Each licensee is addressed as "you". "Licensees" and ! "recipients" may be individuals or organizations. ! To "modify" a work means to copy from or adapt all or part of the work ! in a fashion requiring copyright permission, other than the making of an ! exact copy. The resulting work is called a "modified version" of the ! earlier work or a work "based on" the earlier work. ! A "covered work" means either the unmodified Program or a work based ! on the Program. ! To "propagate" a work means to do anything with it that, without ! permission, would make you directly or secondarily liable for ! infringement under applicable copyright law, except executing it on a ! computer or modifying a private copy. Propagation includes copying, ! distribution (with or without modification), making available to the ! public, and in some countries other activities as well. ! To "convey" a work means any kind of propagation that enables other ! parties to make or receive copies. Mere interaction with a user through ! a computer network, with no transfer of a copy, is not conveying. ! An interactive user interface displays "Appropriate Legal Notices" ! to the extent that it includes a convenient and prominently visible ! feature that (1) displays an appropriate copyright notice, and (2) ! tells the user that there is no warranty for the work (except to the ! extent that warranties are provided), that licensees may convey the ! work under this License, and how to view a copy of this License. If ! the interface presents a list of user commands or options, such as a ! menu, a prominent item in the list meets this criterion. ! 1. Source Code. ! The "source code" for a work means the preferred form of the work ! for making modifications to it. "Object code" means any non-source ! form of a work. ! A "Standard Interface" means an interface that either is an official ! standard defined by a recognized standards body, or, in the case of ! interfaces specified for a particular programming language, one that ! is widely used among developers working in that language. ! The "System Libraries" of an executable work include anything, other ! than the work as a whole, that (a) is included in the normal form of ! packaging a Major Component, but which is not part of that Major ! Component, and (b) serves only to enable use of the work with that ! Major Component, or to implement a Standard Interface for which an ! implementation is available to the public in source code form. A ! "Major Component", in this context, means a major essential component ! (kernel, window system, and so on) of the specific operating system ! (if any) on which the executable work runs, or a compiler used to ! produce the work, or an object code interpreter used to run it. ! The "Corresponding Source" for a work in object code form means all ! the source code needed to generate, install, and (for an executable ! work) run the object code and to modify the work, including scripts to ! control those activities. However, it does not include the work's ! System Libraries, or general-purpose tools or generally available free ! programs which are used unmodified in performing those activities but ! which are not part of the work. For example, Corresponding Source ! includes interface definition files associated with source files for ! the work, and the source code for shared libraries and dynamically ! linked subprograms that the work is specifically designed to require, ! such as by intimate data communication or control flow between those ! subprograms and other parts of the work. ! The Corresponding Source need not include anything that users ! can regenerate automatically from other parts of the Corresponding ! Source. ! The Corresponding Source for a work in source code form is that ! same work. ! 2. Basic Permissions. ! All rights granted under this License are granted for the term of ! copyright on the Program, and are irrevocable provided the stated ! conditions are met. This License explicitly affirms your unlimited ! permission to run the unmodified Program. The output from running a ! covered work is covered by this License only if the output, given its ! content, constitutes a covered work. This License acknowledges your ! rights of fair use or other equivalent, as provided by copyright law. ! You may make, run and propagate covered works that you do not ! convey, without conditions so long as your license otherwise remains ! in force. You may convey covered works to others for the sole purpose ! of having them make modifications exclusively for you, or provide you ! with facilities for running those works, provided that you comply with ! the terms of this License in conveying all material for which you do ! not control copyright. Those thus making or running the covered works ! for you must do so exclusively on your behalf, under your direction ! and control, on terms that prohibit them from making any copies of ! your copyrighted material outside their relationship with you. ! Conveying under any other circumstances is permitted solely under ! the conditions stated below. Sublicensing is not allowed; section 10 ! makes it unnecessary. ! ! 3. Protecting Users' Legal Rights From Anti-Circumvention Law. ! ! No covered work shall be deemed part of an effective technological ! measure under any applicable law fulfilling obligations under article ! 11 of the WIPO copyright treaty adopted on 20 December 1996, or ! similar laws prohibiting or restricting circumvention of such ! measures. ! ! When you convey a covered work, you waive any legal power to forbid ! circumvention of technological measures to the extent such circumvention ! is effected by exercising rights under this License with respect to ! the covered work, and you disclaim any intention to limit operation or ! modification of the work as a means of enforcing, against the work's ! users, your or third parties' legal rights to forbid circumvention of ! technological measures. ! ! 4. Conveying Verbatim Copies. ! ! You may convey verbatim copies of the Program's source code as you ! receive it, in any medium, provided that you conspicuously and ! appropriately publish on each copy an appropriate copyright notice; ! keep intact all notices stating that this License and any ! non-permissive terms added in accord with section 7 apply to the code; ! keep intact all notices of the absence of any warranty; and give all ! recipients a copy of this License along with the Program. ! ! You may charge any price or no price for each copy that you convey, ! and you may offer support or warranty protection for a fee. ! ! 5. Conveying Modified Source Versions. ! ! You may convey a work based on the Program, or the modifications to ! produce it from the Program, in the form of source code under the ! terms of section 4, provided that you also meet all of these conditions: ! ! a) The work must carry prominent notices stating that you modified ! it, and giving a relevant date. ! ! b) The work must carry prominent notices stating that it is ! released under this License and any conditions added under section ! 7. This requirement modifies the requirement in section 4 to ! "keep intact all notices". ! ! c) You must license the entire work, as a whole, under this ! License to anyone who comes into possession of a copy. This ! License will therefore apply, along with any applicable section 7 ! additional terms, to the whole of the work, and all its parts, ! regardless of how they are packaged. This License gives no ! permission to license the work in any other way, but it does not ! invalidate such permission if you have separately received it. ! ! d) If the work has interactive user interfaces, each must display ! Appropriate Legal Notices; however, if the Program has interactive ! interfaces that do not display Appropriate Legal Notices, your ! work need not make them do so. ! ! A compilation of a covered work with other separate and independent ! works, which are not by their nature extensions of the covered work, ! and which are not combined with it such as to form a larger program, ! in or on a volume of a storage or distribution medium, is called an ! "aggregate" if the compilation and its resulting copyright are not ! used to limit the access or legal rights of the compilation's users ! beyond what the individual works permit. Inclusion of a covered work ! in an aggregate does not cause this License to apply to the other ! parts of the aggregate. ! ! 6. Conveying Non-Source Forms. ! ! You may convey a covered work in object code form under the terms ! of sections 4 and 5, provided that you also convey the ! machine-readable Corresponding Source under the terms of this License, ! in one of these ways: ! ! a) Convey the object code in, or embodied in, a physical product ! (including a physical distribution medium), accompanied by the ! Corresponding Source fixed on a durable physical medium ! customarily used for software interchange. ! ! b) Convey the object code in, or embodied in, a physical product ! (including a physical distribution medium), accompanied by a ! written offer, valid for at least three years and valid for as ! long as you offer spare parts or customer support for that product ! model, to give anyone who possesses the object code either (1) a ! copy of the Corresponding Source for all the software in the ! product that is covered by this License, on a durable physical ! medium customarily used for software interchange, for a price no ! more than your reasonable cost of physically performing this ! conveying of source, or (2) access to copy the ! Corresponding Source from a network server at no charge. ! ! c) Convey individual copies of the object code with a copy of the ! written offer to provide the Corresponding Source. This ! alternative is allowed only occasionally and noncommercially, and ! only if you received the object code with such an offer, in accord ! with subsection 6b. ! ! d) Convey the object code by offering access from a designated ! place (gratis or for a charge), and offer equivalent access to the ! Corresponding Source in the same way through the same place at no ! further charge. You need not require recipients to copy the ! Corresponding Source along with the object code. If the place to ! copy the object code is a network server, the Corresponding Source ! may be on a different server (operated by you or a third party) ! that supports equivalent copying facilities, provided you maintain ! clear directions next to the object code saying where to find the ! Corresponding Source. Regardless of what server hosts the ! Corresponding Source, you remain obligated to ensure that it is ! available for as long as needed to satisfy these requirements. ! ! e) Convey the object code using peer-to-peer transmission, provided ! you inform other peers where the object code and Corresponding ! Source of the work are being offered to the general public at no ! charge under subsection 6d. ! ! A separable portion of the object code, whose source code is excluded ! from the Corresponding Source as a System Library, need not be ! included in conveying the object code work. ! ! A "User Product" is either (1) a "consumer product", which means any ! tangible personal property which is normally used for personal, family, ! or household purposes, or (2) anything designed or sold for incorporation ! into a dwelling. In determining whether a product is a consumer product, ! doubtful cases shall be resolved in favor of coverage. For a particular ! product received by a particular user, "normally used" refers to a ! typical or common use of that class of product, regardless of the status ! of the particular user or of the way in which the particular user ! actually uses, or expects or is expected to use, the product. A product ! is a consumer product regardless of whether the product has substantial ! commercial, industrial or non-consumer uses, unless such uses represent ! the only significant mode of use of the product. ! ! "Installation Information" for a User Product means any methods, ! procedures, authorization keys, or other information required to install ! and execute modified versions of a covered work in that User Product from ! a modified version of its Corresponding Source. The information must ! suffice to ensure that the continued functioning of the modified object ! code is in no case prevented or interfered with solely because ! modification has been made. ! ! If you convey an object code work under this section in, or with, or ! specifically for use in, a User Product, and the conveying occurs as ! part of a transaction in which the right of possession and use of the ! User Product is transferred to the recipient in perpetuity or for a ! fixed term (regardless of how the transaction is characterized), the ! Corresponding Source conveyed under this section must be accompanied ! by the Installation Information. But this requirement does not apply ! if neither you nor any third party retains the ability to install ! modified object code on the User Product (for example, the work has ! been installed in ROM). ! ! The requirement to provide Installation Information does not include a ! requirement to continue to provide support service, warranty, or updates ! for a work that has been modified or installed by the recipient, or for ! the User Product in which it has been modified or installed. Access to a ! network may be denied when the modification itself materially and ! adversely affects the operation of the network or violates the rules and ! protocols for communication across the network. ! ! Corresponding Source conveyed, and Installation Information provided, ! in accord with this section must be in a format that is publicly ! documented (and with an implementation available to the public in ! source code form), and must require no special password or key for ! unpacking, reading or copying. ! ! 7. Additional Terms. ! ! "Additional permissions" are terms that supplement the terms of this ! License by making exceptions from one or more of its conditions. ! Additional permissions that are applicable to the entire Program shall ! be treated as though they were included in this License, to the extent ! that they are valid under applicable law. If additional permissions ! apply only to part of the Program, that part may be used separately ! under those permissions, but the entire Program remains governed by ! this License without regard to the additional permissions. ! ! When you convey a copy of a covered work, you may at your option ! remove any additional permissions from that copy, or from any part of ! it. (Additional permissions may be written to require their own ! removal in certain cases when you modify the work.) You may place ! additional permissions on material, added by you to a covered work, ! for which you have or can give appropriate copyright permission. ! ! Notwithstanding any other provision of this License, for material you ! add to a covered work, you may (if authorized by the copyright holders of ! that material) supplement the terms of this License with terms: ! ! a) Disclaiming warranty or limiting liability differently from the ! terms of sections 15 and 16 of this License; or ! ! b) Requiring preservation of specified reasonable legal notices or ! author attributions in that material or in the Appropriate Legal ! Notices displayed by works containing it; or ! ! c) Prohibiting misrepresentation of the origin of that material, or ! requiring that modified versions of such material be marked in ! reasonable ways as different from the original version; or ! ! d) Limiting the use for publicity purposes of names of licensors or ! authors of the material; or ! ! e) Declining to grant rights under trademark law for use of some ! trade names, trademarks, or service marks; or ! ! f) Requiring indemnification of licensors and authors of that ! material by anyone who conveys the material (or modified versions of ! it) with contractual assumptions of liability to the recipient, for ! any liability that these contractual assumptions directly impose on ! those licensors and authors. ! ! All other non-permissive additional terms are considered "further ! restrictions" within the meaning of section 10. If the Program as you ! received it, or any part of it, contains a notice stating that it is ! governed by this License along with a term that is a further ! restriction, you may remove that term. If a license document contains ! a further restriction but permits relicensing or conveying under this ! License, you may add to a covered work material governed by the terms ! of that license document, provided that the further restriction does ! not survive such relicensing or conveying. ! ! If you add terms to a covered work in accord with this section, you ! must place, in the relevant source files, a statement of the ! additional terms that apply to those files, or a notice indicating ! where to find the applicable terms. ! ! Additional terms, permissive or non-permissive, may be stated in the ! form of a separately written license, or stated as exceptions; ! the above requirements apply either way. ! ! 8. Termination. ! ! You may not propagate or modify a covered work except as expressly ! provided under this License. Any attempt otherwise to propagate or ! modify it is void, and will automatically terminate your rights under ! this License (including any patent licenses granted under the third ! paragraph of section 11). ! ! However, if you cease all violation of this License, then your ! license from a particular copyright holder is reinstated (a) ! provisionally, unless and until the copyright holder explicitly and ! finally terminates your license, and (b) permanently, if the copyright ! holder fails to notify you of the violation by some reasonable means ! prior to 60 days after the cessation. ! ! Moreover, your license from a particular copyright holder is ! reinstated permanently if the copyright holder notifies you of the ! violation by some reasonable means, this is the first time you have ! received notice of violation of this License (for any work) from that ! copyright holder, and you cure the violation prior to 30 days after ! your receipt of the notice. ! ! Termination of your rights under this section does not terminate the ! licenses of parties who have received copies or rights from you under ! this License. If your rights have been terminated and not permanently ! reinstated, you do not qualify to receive new licenses for the same ! material under section 10. ! ! 9. Acceptance Not Required for Having Copies. ! ! You are not required to accept this License in order to receive or ! run a copy of the Program. Ancillary propagation of a covered work ! occurring solely as a consequence of using peer-to-peer transmission ! to receive a copy likewise does not require acceptance. However, ! nothing other than this License grants you permission to propagate or ! modify any covered work. These actions infringe copyright if you do ! not accept this License. Therefore, by modifying or propagating a ! covered work, you indicate your acceptance of this License to do so. ! ! 10. Automatic Licensing of Downstream Recipients. ! ! Each time you convey a covered work, the recipient automatically ! receives a license from the original licensors, to run, modify and ! propagate that work, subject to this License. You are not responsible ! for enforcing compliance by third parties with this License. ! ! An "entity transaction" is a transaction transferring control of an ! organization, or substantially all assets of one, or subdividing an ! organization, or merging organizations. If propagation of a covered ! work results from an entity transaction, each party to that ! transaction who receives a copy of the work also receives whatever ! licenses to the work the party's predecessor in interest had or could ! give under the previous paragraph, plus a right to possession of the ! Corresponding Source of the work from the predecessor in interest, if ! the predecessor has it or can get it with reasonable efforts. ! ! You may not impose any further restrictions on the exercise of the ! rights granted or affirmed under this License. For example, you may ! not impose a license fee, royalty, or other charge for exercise of ! rights granted under this License, and you may not initiate litigation ! (including a cross-claim or counterclaim in a lawsuit) alleging that ! any patent claim is infringed by making, using, selling, offering for ! sale, or importing the Program or any portion of it. ! ! 11. Patents. ! ! A "contributor" is a copyright holder who authorizes use under this ! License of the Program or a work on which the Program is based. The ! work thus licensed is called the contributor's "contributor version". ! ! A contributor's "essential patent claims" are all patent claims ! owned or controlled by the contributor, whether already acquired or ! hereafter acquired, that would be infringed by some manner, permitted ! by this License, of making, using, or selling its contributor version, ! but do not include claims that would be infringed only as a ! consequence of further modification of the contributor version. For ! purposes of this definition, "control" includes the right to grant ! patent sublicenses in a manner consistent with the requirements of this License. ! Each contributor grants you a non-exclusive, worldwide, royalty-free ! patent license under the contributor's essential patent claims, to ! make, use, sell, offer for sale, import and otherwise run, modify and ! propagate the contents of its contributor version. ! In the following three paragraphs, a "patent license" is any express ! agreement or commitment, however denominated, not to enforce a patent ! (such as an express permission to practice a patent or covenant not to ! sue for patent infringement). To "grant" such a patent license to a ! party means to make such an agreement or commitment not to enforce a ! patent against the party. ! If you convey a covered work, knowingly relying on a patent license, ! and the Corresponding Source of the work is not available for anyone ! to copy, free of charge and under the terms of this License, through a ! publicly available network server or other readily accessible means, ! then you must either (1) cause the Corresponding Source to be so ! available, or (2) arrange to deprive yourself of the benefit of the ! patent license for this particular work, or (3) arrange, in a manner ! consistent with the requirements of this License, to extend the patent ! license to downstream recipients. "Knowingly relying" means you have ! actual knowledge that, but for the patent license, your conveying the ! covered work in a country, or your recipient's use of the covered work ! in a country, would infringe one or more identifiable patents in that ! country that you have reason to believe are valid. ! If, pursuant to or in connection with a single transaction or ! arrangement, you convey, or propagate by procuring conveyance of, a ! covered work, and grant a patent license to some of the parties ! receiving the covered work authorizing them to use, propagate, modify ! or convey a specific copy of the covered work, then the patent license ! you grant is automatically extended to all recipients of the covered ! work and works based on it. ! A patent license is "discriminatory" if it does not include within ! the scope of its coverage, prohibits the exercise of, or is ! conditioned on the non-exercise of one or more of the rights that are ! specifically granted under this License. You may not convey a covered ! work if you are a party to an arrangement with a third party that is ! in the business of distributing software, under which you make payment ! to the third party based on the extent of your activity of conveying ! the work, and under which the third party grants, to any of the ! parties who would receive the covered work from you, a discriminatory ! patent license (a) in connection with copies of the covered work ! conveyed by you (or copies made from those copies), or (b) primarily ! for and in connection with specific products or compilations that ! contain the covered work, unless you entered into that arrangement, ! or that patent license was granted, prior to 28 March 2007. ! Nothing in this License shall be construed as excluding or limiting ! any implied license or other defenses to infringement that may ! otherwise be available to you under applicable patent law. ! ! 12. No Surrender of Others' Freedom. ! ! If conditions are imposed on you (whether by court order, agreement or ! otherwise) that contradict the conditions of this License, they do not ! excuse you from the conditions of this License. If you cannot convey a ! covered work so as to satisfy simultaneously your obligations under this ! License and any other pertinent obligations, then as a consequence you may ! not convey it at all. For example, if you agree to terms that obligate you ! to collect a royalty for further conveying from those to whom you convey ! the Program, the only way you could satisfy both those terms and this ! License would be to refrain entirely from conveying the Program. ! ! 13. Use with the GNU Affero General Public License. ! ! Notwithstanding any other provision of this License, you have ! permission to link or combine any covered work with a work licensed ! under version 3 of the GNU Affero General Public License into a single ! combined work, and to convey the resulting work. The terms of this ! License will continue to apply to the part which is the covered work, ! but the special requirements of the GNU Affero General Public License, ! section 13, concerning interaction through a network will apply to the ! combination as such. ! ! 14. Revised Versions of this License. ! ! The Free Software Foundation may publish revised and/or new versions of ! the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. ! Each version is given a distinguishing version number. If the ! Program specifies that a certain numbered version of the GNU General ! Public License "or any later version" applies to it, you have the ! option of following the terms and conditions either of that numbered ! version or of any later version published by the Free Software ! Foundation. If the Program does not specify a version number of the ! GNU General Public License, you may choose any version ever published ! by the Free Software Foundation. ! If the Program specifies that a proxy can decide which future ! versions of the GNU General Public License can be used, that proxy's ! public statement of acceptance of a version permanently authorizes you ! to choose that version for the Program. ! Later license versions may give you additional or different ! permissions. However, no additional obligations are imposed on any ! author or copyright holder as a result of your choosing to follow a ! later version. ! 15. Disclaimer of Warranty. ! THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY ! APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT ! HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY ! OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ! THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ! PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM ! IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ! ALL NECESSARY SERVICING, REPAIR OR CORRECTION. ! 16. Limitation of Liability. ! ! IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING ! WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS ! THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY ! GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE ! USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF ! DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD ! PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), ! EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF ! SUCH DAMAGES. ! ! 17. Interpretation of Sections 15 and 16. ! ! If the disclaimer of warranty and limitation of liability provided ! above cannot be given local legal effect according to their terms, ! reviewing courts shall apply local law that most closely approximates ! an absolute waiver of all civil liability in connection with the ! Program, unless a warranty or assumption of liability accompanies a ! copy of the Program in return for a fee. ! ! END OF TERMS AND CONDITIONS \ No newline at end of file |
|
From: Tomas M. <to...@us...> - 2010-12-01 11:11:03
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/commands In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/JavaSource/org/unitime/timetable/commands Modified Files: RefTableCommands.java Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: RefTableCommands.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/commands/RefTableCommands.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RefTableCommands.java 17 Jun 2008 21:25:04 -0000 1.2 --- RefTableCommands.java 1 Dec 2010 11:10:55 -0000 1.3 *************** *** 1,10 **** /* ! * UniTime 3.1 (University Timetabling Application) ! * Copyright (C) 2008, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- /* ! * UniTime 3.2 (University Timetabling Application) ! * Copyright (C) 2008 - 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.commands; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.commands; |
|
From: Tomas M. <to...@us...> - 2010-12-01 11:11:03
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/client/events In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13954/JavaSource/org/unitime/timetable/gwt/client/events Added Files: EventResourceTimetable.java TimeGrid.java Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) --- NEW FILE: EventResourceTimetable.java --- /* * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * */ package org.unitime.timetable.gwt.client.events; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.TreeSet; import org.unitime.timetable.gwt.client.Lookup; import org.unitime.timetable.gwt.client.ToolBox; import org.unitime.timetable.gwt.client.page.UniTimePageLabel; import org.unitime.timetable.gwt.client.widgets.LoadingWidget; import org.unitime.timetable.gwt.client.widgets.SimpleForm; import org.unitime.timetable.gwt.client.widgets.UniTimeHeaderPanel; import org.unitime.timetable.gwt.client.widgets.UniTimeTable; import org.unitime.timetable.gwt.client.widgets.UniTimeTableHeader; import org.unitime.timetable.gwt.client.widgets.UniTimeTable.HasCellAlignment; import org.unitime.timetable.gwt.client.widgets.UniTimeTable.HasColSpan; import org.unitime.timetable.gwt.client.widgets.UniTimeTableHeader.Operation; import org.unitime.timetable.gwt.services.EventService; import org.unitime.timetable.gwt.services.EventServiceAsync; import org.unitime.timetable.gwt.shared.EventInterface; import org.unitime.timetable.gwt.shared.EventInterface.IdValueInterface; import org.unitime.timetable.gwt.shared.EventInterface.MeetingInterface; import org.unitime.timetable.gwt.shared.EventInterface.MultiMeetingInterface; import org.unitime.timetable.gwt.shared.EventInterface.ResourceInterface; import org.unitime.timetable.gwt.shared.EventInterface.ResourceType; import org.unitime.timetable.gwt.shared.EventInterface.WeekInterface; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.event.dom.client.ChangeEvent; import com.google.gwt.event.dom.client.ChangeHandler; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.logical.shared.SelectionEvent; import com.google.gwt.event.logical.shared.SelectionHandler; import com.google.gwt.i18n.client.DateTimeFormat; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HasHorizontalAlignment; import com.google.gwt.user.client.ui.HasVerticalAlignment; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.ListBox; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.SuggestBox; import com.google.gwt.user.client.ui.SuggestOracle; import com.google.gwt.user.client.ui.Widget; import com.google.gwt.user.client.ui.SuggestOracle.Suggestion; /** * @author Tomas Muller */ public class EventResourceTimetable extends Composite { private SimpleForm iPanel, iFilter; private SimplePanel iGridPanel, iTablePanel; private UniTimeHeaderPanel iHeader, iTableHeader, iFooter, iFilterHeader; private ListBox iWeek; private TimeGrid iTimeGrid; private UniTimeTable<EventInterface> iTable; private ResourceInterface iResource; private List<EventInterface> iData; private Button iPrevious, iNext; private HorizontalPanel iWeekPanel; private ListBox iSessions; private ListBox iResourceTypes; private SuggestBox iResources; private boolean iCanLookupPeople = false; private int iResourcesRow = -1, iWeekRow = -1, iLastRow = -1; private static EventResourceTimetable sInstance = null; private final EventServiceAsync iEventService = GWT.create(EventService.class); public EventResourceTimetable() { sInstance = this; iFilter = new SimpleForm(2); iFilter.removeStyleName("unitime-NotPrintableBottomLine"); iFilter.getColumnFormatter().setWidth(0, "120px"); iFilterHeader = new UniTimeHeaderPanel("Filter"); iFilterHeader.addButton("search", "<u>S</u>earch", 's', 75, new ClickHandler() { @Override public void onClick(ClickEvent event) { resourceTypeChanged(true); } }); Lookup.getInstance().setOptions("mustHaveExternalId"); Lookup.getInstance().setCallback(createLookupCallback()); iFilterHeader.addButton("lookup", "<u>L</u>ookup", 'p', 75, new ClickHandler() { @Override public void onClick(ClickEvent event) { Lookup.getInstance().center(); } }); iFilterHeader.setEnabled("lookup", false); iFilter.addHeaderRow(iFilterHeader); iSessions = new ListBox(); iFilter.addRow("Academic Session:", iSessions); iEventService.findSessions(Window.Location.getParameter("term"), new AsyncCallback<List<IdValueInterface>>() { @Override public void onFailure(Throwable caught) { iHeader.setErrorMessage(caught.getMessage()); } @Override public void onSuccess(List<IdValueInterface> result) { for (int idx = 0; idx < result.size(); idx++) { IdValueInterface idVal = result.get(idx); iSessions.addItem(idVal.getValue(), idVal.getId()); if (idVal.isSelected()) iSessions.setSelectedIndex(idx); } if (iSessions.getItemCount() > 0) iFilter.setVisible(true); if (iSessions.getSelectedIndex() >= 0) sessionChanged(); } }); iSessions.addChangeHandler(new ChangeHandler() { @Override public void onChange(ChangeEvent event) { sessionChanged(); } }); iResourceTypes = new ListBox(); for (ResourceType resource: ResourceType.values()) { iResourceTypes.addItem(resource.getPageTitle(), resource.toString()); } iResourceTypes.addChangeHandler(new ChangeHandler() { @Override public void onChange(ChangeEvent event) { iResources.setText(""); UniTimePageLabel.getInstance().setPageName(getResourceType().getPageTitle()); for (int i = 1; i < iPanel.getRowCount(); i++) iPanel.getRowFormatter().setVisible(i, false); resourceTypeChanged(false); } }); iFilter.addRow("Resoure Type:", iResourceTypes); iResources = new SuggestBox(new SuggestOracle() { @Override public void requestSuggestions(final Request request, final Callback callback) { if (iSessions.getSelectedIndex() >= 0 && iResourceTypes.getSelectedIndex() >= 0) { iEventService.findResources(iSessions.getValue(iSessions.getSelectedIndex()), ResourceType.valueOf(iResourceTypes.getValue(iResourceTypes.getSelectedIndex())), request.getQuery(), request.getLimit(), new AsyncCallback<List<ResourceInterface>>() { @Override public void onFailure(final Throwable caught) { ArrayList<Suggestion> suggestions = new ArrayList<Suggestion>(); suggestions.add(new Suggestion() { @Override public String getDisplayString() { return "<font color='red'>" + caught.getMessage() + "</font>"; } @Override public String getReplacementString() { return ""; }}); callback.onSuggestionsReady(request, new Response(suggestions)); } @Override public void onSuccess(List<ResourceInterface> result) { ArrayList<Suggestion> suggestions = new ArrayList<Suggestion>(); for (ResourceInterface resource: result) { suggestions.add(new ResourceSuggestion(resource)); } callback.onSuggestionsReady(request, new Response(suggestions)); } }); } } @Override public boolean isDisplayStringHTML() { return true; } }); iResourcesRow = iFilter.addRow("Resource:", iResources); iResources.addSelectionHandler(new SelectionHandler<Suggestion>() { public void onSelection(SelectionEvent<Suggestion> event) { if (event.getSelectedItem() instanceof ResourceSuggestion) { resourceChanged(((ResourceSuggestion)event.getSelectedItem()).getResource()); } } }); iResourceTypes.setSelectedIndex(ResourceType.PERSON.ordinal()); String typeString = Window.Location.getParameter("type"); if (typeString != null) for (int idx = 0; idx < iResourceTypes.getItemCount(); idx ++) { if (iResourceTypes.getValue(idx).equals(typeString.toUpperCase())) { iResourceTypes.setSelectedIndex(idx); } } String name = Window.Location.getParameter("name"); if (name != null) { iResources.setText(name); } UniTimePageLabel.getInstance().setPageName(getResourceType().getPageTitle()); resourceTypeChanged(true); iPanel = new SimpleForm(2); iPanel.removeStyleName("unitime-NotPrintableBottomLine"); iPanel.addRow(iFilter); iHeader = new UniTimeHeaderPanel(); iPanel.addHeaderRow(iHeader); iWeekPanel = new HorizontalPanel(); iWeekPanel.setSpacing(2); iPrevious = new Button("←", new ClickHandler() { @Override public void onClick(ClickEvent event) { if (iWeek.getSelectedIndex() > 0) { iWeek.setSelectedIndex(iWeek.getSelectedIndex() - 1); weekChanged(); } } }); iPrevious.setEnabled(false); iPrevious.setTitle("Previous week (Alt+p)"); iPrevious.setAccessKey('p'); iWeekPanel.add(iPrevious); iWeekPanel.setCellVerticalAlignment(iPrevious, HasVerticalAlignment.ALIGN_MIDDLE); iWeek = new ListBox(); iWeekPanel.add(iWeek); iNext = new Button("→", new ClickHandler() { @Override public void onClick(ClickEvent event) { if (iWeek.getSelectedIndex() + 1 < iWeek.getItemCount()) { iWeek.setSelectedIndex(iWeek.getSelectedIndex() + 1); weekChanged(); } } }); iNext.setTitle("Next week (Alt+n)"); iNext.setAccessKey('n'); iWeekPanel.add(iNext); iWeekPanel.setCellVerticalAlignment(iNext, HasVerticalAlignment.ALIGN_MIDDLE); iWeekRow = iPanel.addRow(iWeekPanel); iPanel.getCellFormatter().setHorizontalAlignment(iWeekRow, 0, HasHorizontalAlignment.ALIGN_RIGHT); iGridPanel = new SimplePanel(); iPanel.addRow(iGridPanel); iTableHeader = new UniTimeHeaderPanel(); iPanel.addHeaderRow(iTableHeader); iTablePanel = new SimplePanel(); iPanel.addRow(iTablePanel); iFooter = iHeader.clonePanel(); iLastRow = iPanel.addBottomRow(iFooter); initWidget(iPanel); for (int i = 1; i < iPanel.getRowCount(); i++) iPanel.getRowFormatter().setVisible(i, false); iHeader.addButton("print", "<u>P</u>rint", 'p', 75, new ClickHandler() { @Override public void onClick(ClickEvent clickEvent) { UniTimeTable<EventInterface> table = createEventTable(); populateEventTable(table); // table.getElement().getStyle().setProperty("page-break-before", "always"); TimeGrid tg = iTimeGrid.getPrintWidget(); WeekInterface week = null; if (iWeek.getSelectedIndex() == 0) { for (EventInterface event: iData) tg.addPrintEvent(event); } else if (iWeek.getSelectedIndex() > 0) { int dayOfYear = Integer.parseInt(iWeek.getValue(iWeek.getSelectedIndex())); for (WeekInterface w: iResource.getWeeks()) if (w.getDayOfYear() == dayOfYear) { week = w; break; } for (EventInterface event: iData) { List<MeetingInterface> meetings = new ArrayList<MeetingInterface>(); for (MeetingInterface meeting: event.getMeetings()) if (meeting.getDayOfYear() >= dayOfYear && meeting.getDayOfYear() < dayOfYear + 7) meetings.add(meeting); if (!meetings.isEmpty()) tg.addPrintEvent(event, meetings); } } tg.labelDays(week); ToolBox.print(iHeader.getHeaderTitle(), "", "", tg, table ); } }); iHeader.addButton("export", "E<u>x</u>port", 'x', 75, new ClickHandler() { @Override public void onClick(ClickEvent clickEvent) { ToolBox.open(iTimeGrid.getCalendarUrl()); } }); iHeader.setTitle("Export timetable in iCalendar format."); iHeader.setEnabled("print", false); iHeader.setEnabled("export", false); iEventService.canLookupPeople(new AsyncCallback<Boolean>() { @Override public void onFailure(Throwable caught) { } @Override public void onSuccess(Boolean result) { iCanLookupPeople = (result == null ? false: result); iFilterHeader.setEnabled("lookup", iCanLookupPeople && getResourceType() == ResourceType.PERSON); } }); } private void sessionChanged() { resourceTypeChanged(true); } public ResourceType getResourceType() { if (iResourceTypes.getSelectedIndex() < 0) return null; return ResourceType.values()[iResourceTypes.getSelectedIndex()]; } public String getSessionName() { if (iSessions.getSelectedIndex() < 0) return null; return iSessions.getValue(iSessions.getSelectedIndex()); } public String getResourceName() { if (getResourceType() == ResourceType.PERSON && !iCanLookupPeople) return ""; return (iResources.getText() == null || iResources.getText().isEmpty() ? null : iResources.getText()); } private void resourceTypeChanged(boolean allowEmptyResource) { ResourceType type = getResourceType(); if (type != null) { iFilter.getRowFormatter().setVisible(iResourcesRow, type != ResourceType.PERSON); ((Label)iFilter.getWidget(iResourcesRow, 0)).setText(type.getLabel().substring(0,1).toUpperCase() + type.getLabel().substring(1) + ":"); iFilterHeader.setEnabled("lookup", iCanLookupPeople && getResourceType() == ResourceType.PERSON); if (getSessionName() != null && ((type == ResourceType.PERSON && allowEmptyResource) || getResourceName() != null)) { LoadingWidget.getInstance().show("Loading " + type.getLabel() + (type != ResourceType.PERSON ? " " + getResourceName() : "") + " ..."); iEventService.findResource(getSessionName(), type, getResourceName(), new AsyncCallback<ResourceInterface>() { @Override public void onFailure(Throwable caught) { LoadingWidget.getInstance().hide(); iHeader.setErrorMessage(caught.getMessage()); for (int i = 1; i < iPanel.getRowCount(); i++) iPanel.getRowFormatter().setVisible(i, i == iLastRow); iHeader.setEnabled("print", false); iHeader.setEnabled("export", false); } @Override public void onSuccess(ResourceInterface result) { LoadingWidget.getInstance().hide(); resourceChanged(result); } }); } } } private void resourceChanged(ResourceInterface resource) { LoadingWidget.getInstance().show("Loading " + resource.getName() + " timetable for " + resource.getSessionName() + " ..."); iResource = resource; iEventService.findEvents(iResource, new AsyncCallback<List<EventInterface>>() { @Override public void onSuccess(List<EventInterface> result) { iData = result; if (iResource.getType() != ResourceType.PERSON) changeUrl(iResource.getSessionAbbv(), iResource.getType().toString().toLowerCase(), iResource.getAbbreviation(), null); LoadingWidget.getInstance().hide(); if (iData.isEmpty()) { iHeader.setErrorMessage((iResource.getType() == ResourceType.PERSON ? "" : iResource.getType().getLabel().substring(0, 1).toUpperCase() + iResource.getType().getLabel().substring(1) + " ") + iResource.getName() + " has no events in " + iResource.getSessionName() + "."); for (int i = 1; i < iPanel.getRowCount(); i++) iPanel.getRowFormatter().setVisible(i, i == iLastRow); iHeader.setEnabled("print", false); iHeader.setEnabled("export", false); } else { Collections.sort(iData); iHeader.setHeaderTitle(iResource.getName() + " timetable for " + iResource.getSessionName()); iHeader.setMessage(null); int nrDays = 4; int firstSlot = -1, lastSlot = -1; for (EventInterface event: iData) { for (MeetingInterface meeting: event.getMeetings()) { if (firstSlot < 0 || firstSlot > meeting.getStartSlot()) firstSlot = meeting.getStartSlot(); if (lastSlot < 0 || lastSlot < meeting.getEndSlot()) lastSlot = meeting.getEndSlot(); nrDays = Math.max(nrDays, meeting.getDayOfWeek()); } } nrDays ++; int firstHour = firstSlot / 12; int lastHour = 1 + (lastSlot - 1) / 12; HashMap<Long, String> colors = new HashMap<Long, String>(); iTimeGrid = new TimeGrid(colors, nrDays, (int)(0.9 * Window.getClientWidth() / nrDays), false, false, (firstHour < 7 ? firstHour : 7), (lastHour > 18 ? lastHour : 18)); String eventIds = ""; iTimeGrid.setOneWeek(false); iTimeGrid.setRoomResource(iResource.getType() == ResourceType.ROOM); for (EventInterface event: iData) { iTimeGrid.addEvent(event); if (!eventIds.isEmpty()) eventIds += ","; eventIds += event.getId(); } if (iResource.hasCalendar()) { iTimeGrid.setCalendarUrl(GWT.getHostPageBaseURL() + "calendar?q=" + iResource.getCalendar()); iHeader.setEnabled("export", true); } else { iHeader.setEnabled("export", false); } iGridPanel.setWidget(iTimeGrid); iTableHeader.setHeaderTitle(iResource.getName() + " events for " + iResource.getSessionName()); iTable = createEventTable(); populateEventTable(iTable); iTablePanel.setWidget(iTable); iWeek.clear(); iWeek.addItem("All weeks", ""); iWeek.setSelectedIndex(0); if (iResource.hasWeeks()) { for (WeekInterface week: iResource.getWeeks()) { boolean hasEvents = false; events: for (EventInterface event: iData) { for (MeetingInterface meeting: event.getMeetings()) { if (meeting.getDayOfYear() >= week.getDayOfYear() && meeting.getDayOfYear() < week.getDayOfYear() + 7) { hasEvents = true; break events; } } } if (!hasEvents) continue; iWeek.addItem("Week " + week.getName(), String.valueOf(week.getDayOfYear())); } iWeek.addChangeHandler(new ChangeHandler() { @Override public void onChange(ChangeEvent changeEvent) { weekChanged(); } }); String start = Window.Location.getParameter("date"); if (start != null) { DateTimeFormat df = DateTimeFormat.getFormat("MM/dd"); String date = start; if ("today".equalsIgnoreCase(start)) { date = df.format(new Date()); } else { try { date = df.format(df.parse(start)); } catch (IllegalArgumentException e) {} } WeekInterface week = null; for (WeekInterface w: iResource.getWeeks()) { if (w.getDayNames().contains(date)) { week = w; break; } } if (week != null) { for (int i = 1; i < iWeek.getItemCount(); i++) { if (iWeek.getValue(i).equals(String.valueOf(week.getDayOfYear()))) { iWeek.setSelectedIndex(i); weekChanged(); break; } } } } } iHeader.setEnabled("print", true); for (int i = 1; i < iPanel.getRowCount(); i++) iPanel.getRowFormatter().setVisible(i, i != iWeekRow || iResource.hasWeeks()); } } @Override public void onFailure(Throwable caught) { LoadingWidget.getInstance().hide(); iHeader.setErrorMessage(caught.getMessage()); for (int i = 1; i < iPanel.getRowCount(); i++) iPanel.getRowFormatter().setVisible(i, i == iLastRow); iHeader.setEnabled("print", false); iHeader.setEnabled("export", false); } }); } private void weekChanged() { iTimeGrid.clear(); populateEventTable(iTable); WeekInterface week = null; if (iWeek.getSelectedIndex() <= 0) { if (iResource.getType() != ResourceType.PERSON) changeUrl(iResource.getSessionAbbv(), iResource.getType().toString().toLowerCase(), iResource.getAbbreviation(), null); iHeader.setHeaderTitle(iResource.getName() + " timetable for " + iResource.getSessionName()); iTableHeader.setHeaderTitle(iResource.getName() + " events for " + iResource.getSessionName()); iTimeGrid.setOneWeek(false); for (EventInterface event: iData) { iTimeGrid.addEvent(event); } } else if (iWeek.getSelectedIndex() > 0) { iHeader.setHeaderTitle(iResource.getName() + " timetable for " + iWeek.getItemText(iWeek.getSelectedIndex()).toLowerCase()); iTableHeader.setHeaderTitle(iResource.getName() + " events for " + iWeek.getItemText(iWeek.getSelectedIndex()).toLowerCase()); iTimeGrid.setOneWeek(true); int dayOfYear = Integer.parseInt(iWeek.getValue(iWeek.getSelectedIndex())); for (WeekInterface w: iResource.getWeeks()) { if (w.getDayOfYear() == dayOfYear) { week = w; break; } } if (iResource.getType() != ResourceType.PERSON && week != null) changeUrl(iResource.getSessionAbbv(), iResource.getType().toString().toLowerCase(), iResource.getAbbreviation(), week.getDayNames().get(0)); for (EventInterface event: iData) { List<MeetingInterface> meetings = new ArrayList<MeetingInterface>(); for (MeetingInterface meeting: event.getMeetings()) { if (meeting.getDayOfYear() >= dayOfYear && meeting.getDayOfYear() < dayOfYear + 7) { meetings.add(meeting); } } if (!meetings.isEmpty()) iTimeGrid.addEvent(event, meetings); } } iTimeGrid.labelDays(week); iTimeGrid.shrink(); iPrevious.setEnabled(iWeek.getSelectedIndex() > 0); iNext.setEnabled(iWeek.getSelectedIndex() < iWeek.getItemCount() - 1); } private UniTimeTable<EventInterface> createEventTable() { final UniTimeTable table = new UniTimeTable<EventInterface>(); List<UniTimeTableHeader> header = new ArrayList<UniTimeTableHeader>(); header.add(new UniTimeTableHeader("Name")); header.add(new UniTimeTableHeader("Section")); header.add(new UniTimeTableHeader("Type")); header.add(new UniTimeTableHeader("Date")); header.add(new UniTimeTableHeader("Time")); header.add(new UniTimeTableHeader("Location")); header.add(new UniTimeTableHeader("Instructor / Sponsor")); header.get(0).addOperation(new Operation() { @Override public void execute() { table.sort(new Comparator<EventInterface>() { @Override public int compare(EventInterface o1, EventInterface o2) { int cmp = o1.getName().compareTo(o2.getName()); if (cmp != 0) return cmp; cmp = o1.getType().compareTo(o2.getType()); if (cmp != 0) return cmp; return o1.getId().compareTo(o2.getId()); } }); } @Override public boolean isApplicable() { return true; } @Override public boolean hasSeparator() { return false; } @Override public String getName() { return "Sort by Name"; } }); header.get(1).addOperation(new Operation() { @Override public void execute() { table.sort(new Comparator<EventInterface>() { @Override public int compare(EventInterface o1, EventInterface o2) { if (o1.hasExternalIds()) { if (o2.hasExternalIds()) { int cmp = o1.getExternalIds().get(0).compareTo(o2.getExternalIds().get(0)); if (cmp != 0) return cmp; } else return -1; } else if (o2.hasExternalIds()) return 1; int cmp = o1.getType().compareTo(o2.getType()); if (cmp != 0) return cmp; if (o1.getInstructionType() != null) { cmp = o1.getInstructionType().compareTo(o2.getInstructionType()); if (cmp != 0) return cmp; } cmp = o1.getName().compareTo(o2.getName()); if (cmp != 0) return cmp; return o1.getId().compareTo(o2.getId()); } }); } @Override public boolean isApplicable() { return true; } @Override public boolean hasSeparator() { return false; } @Override public String getName() { return "Sort by Section"; } }); header.get(2).addOperation(new Operation() { @Override public void execute() { table.sort(new Comparator<EventInterface>() { @Override public int compare(EventInterface o1, EventInterface o2) { int cmp = o1.getType().compareTo(o2.getType()); if (cmp != 0) return cmp; if (o1.getInstructionType() != null) { cmp = o1.getInstructionType().compareTo(o2.getInstructionType()); if (cmp != 0) return cmp; } cmp = o1.getName().compareTo(o2.getName()); if (cmp != 0) return cmp; return o1.getId().compareTo(o2.getId()); } }); } @Override public boolean isApplicable() { return true; } @Override public boolean hasSeparator() { return false; } @Override public String getName() { return "Sort by Type"; } }); header.get(3).addOperation(new Operation() { @Override public void execute() { table.sort(new Comparator<EventInterface>() { @Override public int compare(EventInterface o1, EventInterface o2) { int cmp = o1.getMeetings().first().compareTo(o2.getMeetings().first()); if (cmp != 0) return cmp; cmp = o1.getName().compareTo(o2.getName()); if (cmp != 0) return cmp; cmp = o1.getType().compareTo(o2.getType()); if (cmp != 0) return cmp; return o1.getId().compareTo(o2.getId()); } }); } @Override public boolean isApplicable() { return true; } @Override public boolean hasSeparator() { return false; } @Override public String getName() { return "Sort by Date"; } }); header.get(4).addOperation(new Operation() { @Override public void execute() { table.sort(new Comparator<EventInterface>() { @Override public int compare(EventInterface o1, EventInterface o2) { int cmp = new Integer(o1.getMeetings().first().getDayOfWeek()).compareTo(o2.getMeetings().first().getDayOfWeek()); if (cmp != 0) return cmp; cmp = new Integer(o1.getMeetings().first().getStartSlot()).compareTo(o2.getMeetings().first().getStartSlot()); if (cmp != 0) return cmp; cmp = o1.getMeetings().first().compareTo(o2.getMeetings().first()); if (cmp != 0) return cmp; cmp = o1.getName().compareTo(o2.getName()); if (cmp != 0) return cmp; cmp = o1.getType().compareTo(o2.getType()); if (cmp != 0) return cmp; return o1.getId().compareTo(o2.getId()); } }); } @Override public boolean isApplicable() { return true; } @Override public boolean hasSeparator() { return false; } @Override public String getName() { return "Sort by Time"; } }); header.get(5).addOperation(new Operation() { @Override public void execute() { table.sort(new Comparator<EventInterface>() { @Override public int compare(EventInterface o1, EventInterface o2) { int cmp = o1.getMeetings().first().getLocationName().compareTo(o2.getMeetings().first().getLocationName()); if (cmp != 0) return cmp; cmp = o1.getMeetings().first().compareTo(o2.getMeetings().first()); if (cmp != 0) return cmp; cmp = o1.getName().compareTo(o2.getName()); if (cmp != 0) return cmp; cmp = o1.getType().compareTo(o2.getType()); if (cmp != 0) return cmp; return o1.getId().compareTo(o2.getId()); } }); } @Override public boolean isApplicable() { return true; } @Override public boolean hasSeparator() { return false; } @Override public String getName() { return "Sort by Location"; } }); header.get(6).addOperation(new Operation() { @Override public void execute() { table.sort(new Comparator<EventInterface>() { @Override public int compare(EventInterface o1, EventInterface o2) { int cmp = (o1.hasInstructor() ? o1.getInstructor() : o1.hasSponsor() ? o1.getSponsor() : "").compareTo( o2.hasInstructor() ? o2.getInstructor() : o2.hasSponsor() ? o2.getSponsor() : ""); if (cmp != 0) return cmp; cmp = o1.getName().compareTo(o2.getName()); if (cmp != 0) return cmp; cmp = o1.getType().compareTo(o2.getType()); if (cmp != 0) return cmp; return o1.getId().compareTo(o2.getId()); } }); } @Override public boolean isApplicable() { return true; } @Override public boolean hasSeparator() { return false; } @Override public String getName() { return "Sort by Instructor / Sponsor"; } }); table.addRow(null, header); return table; } public void populateEventTable(UniTimeTable<EventInterface> table) { table.clearTable(1); for (EventInterface event: iData) { List<Widget> line = new ArrayList<Widget>(); if (event.hasCourseNames()) { String name = ""; String section = ""; String prevCn = "", prevExt = ""; for (int i = 0; i < event.getCourseNames().size(); i++) { String cn = event.getCourseNames().get(i); String ext = event.getExternalIds().get(i); if (name.isEmpty()) { name += cn; section += ext; } else if (event.getInstruction() != null) { name += "<br><span style='color:gray;'>" + (cn.equals(prevCn) ? "" : cn) + "</span>"; section += "<br><span style='color:gray;'>" + (ext.equals(prevExt) ? "" : ext) + "</span>"; } else { name += "<br>" + (cn.equals(prevCn) ? "" : cn); section += "<br>" + (ext.equals(prevExt) ? "" : ext); } prevCn = cn; prevExt = ext; } line.add(new HTML(name, false)); line.add(new NumberCell(section)); line.add(new Label(event.getInstruction() == null ? event.getType() : event.getInstruction(), false)); } else { line.add(new DoubleCell(event.getName())); line.add(new Label(event.getType(), false)); } String date = "", time = "", room = ""; TreeSet<MeetingInterface> meetings = null; if (iWeek.getSelectedIndex() <= 0) { meetings = event.getMeetings(); } else { meetings = new TreeSet<MeetingInterface>(); int dayOfYear = Integer.parseInt(iWeek.getValue(iWeek.getSelectedIndex())); for (MeetingInterface meeting: event.getMeetings()) if (meeting.getDayOfYear() >= dayOfYear && meeting.getDayOfYear() < dayOfYear + 7) meetings.add(meeting); } if (meetings.isEmpty()) continue; String prevDate = "", prevTime = "", prevRoom = ""; boolean prevPast = false; for (MultiMeetingInterface m: EventInterface.getMultiMeetings(meetings, false, false)) { if (!date.isEmpty()) { date += "<br>"; time += "<br>"; room += "<br>"; } if (prevPast != m.isPast() || !prevDate.equals(m.getMeetingDates())) date += (m.isPast() ? "<span style='font-style:italic;color:gray;'>" : "") + m.getMeetingDates() + (m.isPast() ? "</span>" : ""); if (prevPast != m.isPast() || !prevTime.equals(m.getMeetingTime())) time += (m.isPast() ? "<span style='font-style:italic;color:gray;'>" : "") + m.getMeetingTime() + (m.isPast() ? "</span>" : ""); if (prevPast != m.isPast() || !prevRoom.equals(m.getLocationName())) room += (m.isPast() ? "<span style='font-style:italic;color:gray;'>" : "") + m.getLocationName() + (m.isPast() ? "</span>" : ""); prevPast = m.isPast(); prevDate = m.getMeetingDates(); prevTime = m.getMeetingTime(); prevRoom = m.getLocationName(); } line.add(new HTML(date, false)); line.add(new HTML(time, false)); line.add(new HTML(room, false)); if (event.hasInstructor()) { line.add(new HTML(event.getInstructor().replace("|", "<br>"), false)); } else { line.add(new Label(event.hasSponsor() ? event.getSponsor() : "")); } int row = table.addRow(event, line); table.getRowFormatter().setVerticalAlign(row, HasVerticalAlignment.ALIGN_TOP); } table.getElement().getStyle().setWidth(100, Unit.PCT); setColumnVisible(table, 3, iWeek.getSelectedIndex() <= 0); setColumnVisible(table, 5, iResource.getType() != ResourceType.ROOM); } public void setColumnVisible(UniTimeTable<EventInterface> table, int col, boolean visible) { for (int r = 0; r < table.getRowCount(); r++) { table.getCellFormatter().setVisible(r, col - (table.getFlexCellFormatter().getColSpan(r, 0) == 2 ? 1 : 0), visible); } } public static class NumberCell extends HTML implements HasCellAlignment { public NumberCell(String text) { super(text, false); } @Override public HorizontalAlignmentConstant getCellAlignment() { return HasHorizontalAlignment.ALIGN_RIGHT; } } public static class DoubleCell extends HTML implements HasColSpan { public DoubleCell(String text) { super(text, false); } @Override public int getColSpan() { return 2; } } public static class ResourceSuggestion implements Suggestion { private ResourceInterface iResource; public ResourceSuggestion(ResourceInterface resource) { iResource = resource; } public ResourceInterface getResource() { return iResource; } @Override public String getDisplayString() { if (iResource.hasTitle()) return iResource.getTitle(); if (iResource.hasAbbreviation() && !iResource.getAbbreviation().equals(iResource.getName())) return iResource.getAbbreviation() + " - " + iResource.getName(); return (iResource.hasAbbreviation() ? iResource.getAbbreviation() : iResource.getName()); } @Override public String getReplacementString() { return (iResource.hasAbbreviation() ? iResource.getAbbreviation() : iResource.getName()); } } public static void personFound(String externalUniqueId) { sInstance.iResources.setText(externalUniqueId); sInstance.resourceTypeChanged(false); } private native JavaScriptObject createLookupCallback() /*-{ return function(person) { @org.unitime.timetable.gwt.client.events.EventResourceTimetable::personFound(Ljava/lang/String;)(person[0]); }; }-*/; private native static void changeUrl(String term, String type, String name, String date) /*-{ try { var state = "term=" + term + "&type=" + type + "&name=" + name.replace(' ', '+') + (date == null ? "" : "&date=" + date); $wnd.history.pushState(state, "", "gwt.jsp?page=timetable&" + state); } catch (err) { } }-*/; } --- NEW FILE: TimeGrid.java --- /* * UniTime 3.0 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * */ package org.unitime.timetable.gwt.client.events; import java.util.ArrayList; import java.util.Collection; import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.TreeSet; import org.unitime.timetable.gwt.client.ToolBox; import org.unitime.timetable.gwt.client.widgets.ImageLink; import org.unitime.timetable.gwt.resources.StudentSectioningConstants; import org.unitime.timetable.gwt.resources.StudentSectioningMessages; import org.unitime.timetable.gwt.resources.StudentSectioningResources; import org.unitime.timetable.gwt.shared.EventInterface; import org.unitime.timetable.gwt.shared.EventInterface.MeetingInterface; import org.unitime.timetable.gwt.shared.EventInterface.WeekInterface; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.EventTarget; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Event; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.AbsolutePanel; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HasHorizontalAlignment; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.ScrollPanel; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; /** * @author Tomas Muller */ public class TimeGrid extends Composite { public static final StudentSectioningResources RESOURCES = GWT.create(StudentSectioningResources.class); public static final StudentSectioningMessages MESSAGES = GWT.create(StudentSectioningMessages.class); public static final StudentSectioningConstants CONSTANTS = GWT.create(StudentSectioningConstants.class); private VerticalPanel iContainer; private SimplePanel iScrollPanel; private AbsolutePanel iPanel; private AbsolutePanel iGrid; private HorizontalPanel iHeader, iDock; private SimplePanel[] iSeparators = new SimplePanel[8]; private SimplePanel iWorkingHours; private ImageLink iCalendar; private ArrayList<ArrayList<Meeting>> iMeetings = new ArrayList<ArrayList<Meeting>>(); @SuppressWarnings("unchecked") private ArrayList<Meeting>[][] iMeetingTable = new ArrayList[7][24 * 60 / 5]; private int iCellWidth = 150; private int iCellHeight = 60; private int iNrDays = 5; private int iStart = 0; private int iEnd = 24; private boolean iScroll = false; private ArrayList<MeetingClickHandler> iMeetingClickHandlers = new ArrayList<MeetingClickHandler>(); private HashMap<Long, String> iColors = new HashMap<Long, String>(); private boolean iOneWeek = false, iRoomResource = false; public TimeGrid() { this(new HashMap<Long, String>(), 5, (int) (0.9 * Window.getClientWidth() / 5), false, false, 0, 24); } private List<Label> iDayLabels = new ArrayList<Label>(); public TimeGrid(HashMap<Long, String> colors, int nrDays, int cellWidth, boolean print, boolean scroll, int start, int end) { iColors = colors; iNrDays = nrDays; iCellWidth = cellWidth; iStart = start; iEnd = end; iScroll = scroll; iContainer = new VerticalPanel(); iContainer.setStyleName("unitime-TimeGrid"); iHeader = new HorizontalPanel(); iDock = new HorizontalPanel(); iPanel = new AbsolutePanel(); AbsolutePanel times = new AbsolutePanel(); for (int i = -1; i < iNrDays; i++) { SimplePanel sp = new SimplePanel(); sp.setStyleName("header-time-interval"); if (i < 0) { sp.setWidth("30px"); iCalendar = new ImageLink(); iCalendar.setImage(new Image(RESOURCES.calendar())); iCalendar.setTarget(null); iCalendar.setTitle("Export in iCalendar format."); iCalendar.setVisible(false); if (!print) sp.setWidget(iCalendar); } else { sp.setWidth(String.valueOf(iCellWidth)); Label l = new Label(CONSTANTS.longDays()[i]); iDayLabels.add(l); sp.setWidget(l); } iHeader.add(sp); } iPanel.setSize(String.valueOf(iNrDays * iCellWidth + (scroll ? 0 : 5)), String.valueOf(iCellHeight * (iEnd - iStart))); times.setSize("30", String.valueOf(iCellHeight * (iEnd - iStart))); iGrid = new AbsolutePanel(); iGrid.setSize("100%", "100%"); iPanel.setStyleName("bottom-line"); iWorkingHours = new SimplePanel(); iWorkingHours.setStyleName("working-hours"); iWorkingHours.setSize(String.valueOf(2 + iCellWidth * 5), String.valueOf(iCellHeight * 10)); iGrid.add(iWorkingHours, 0, 15 * iCellHeight / 2 - (iCellHeight * iStart)); for (int i = iStart; i < iEnd; i++) { //create major interval SimplePanel sp1 = new SimplePanel(); sp1.setStyleName("major-time-interval"); iGrid.add(sp1, 0, iCellHeight * (i - iStart)); SimplePanel sp3 = new SimplePanel(); sp3.setStyleName("dummy-time-interval"); Label title = new Label(i == 0 ? "12am": i <= 11 ? i + "am" : i == 12 ? "12pm" : (i-12) + "pm"); sp3.setWidget(title); times.add(sp3, 0, iCellHeight * (i - iStart)); SimplePanel sp2 = new SimplePanel(); sp2.setStyleName("minor-time-interval"); iGrid.add(sp2, 0, iCellHeight * (i - iStart) + iCellHeight / 2); SimplePanel sp4 = new SimplePanel(); sp4.setStyleName("dummy-time-interval"); times.add(sp4, 0, iCellHeight * (i - iStart) + iCellHeight / 2); } for (int day = 0; day < iNrDays + (scroll ? 0 : 1); day++) { iSeparators[day] = new SimplePanel(); iSeparators[day].setStyleName("day-separator"); iGrid.add(iSeparators[day], iCellWidth * day, 0); } iPanel.add(iGrid); iDock.add(times); iDock.add(iPanel); iContainer.add(iHeader); iHeader.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_RIGHT); if (scroll) { iScrollPanel = new ScrollPanel(); iScrollPanel.setStyleName("calendar-scroll"); } else { iScrollPanel = new SimplePanel(); } iScrollPanel.add(iDock); iContainer.add(iScrollPanel); iScrollPanel.setWidth(String.valueOf(iNrDays * iCellWidth + 30 + (scroll ? ToolBox.getScrollBarWidth() : 5))); initWidget(iContainer); } public boolean isOneWeek() { return iOneWeek; } public void setOneWeek(boolean oneWeek) { iOneWeek = oneWeek; } public boolean isRoomResource() { return iRoomResource; } public void setRoomResource(boolean roomResource) { iRoomResource = roomResource; } public void setCalendarUrl(String url) { iCalendar.setUrl(url); iCalendar.setVisible(true); } public String getCalendarUrl() { return iCalendar.getUrl(); } public TimeGrid getPrintWidget() { int firstHour = firstSlot() / 12; int lastHour = (11 + lastSlot()) / 12; TimeGrid tg = new TimeGrid(iColors, iNrDays, (int) (0.9 * Window.getClientWidth() / iNrDays), true, false, (firstHour < 7 ? firstHour : 7), (lastHour > 18 ? lastHour : 18)); tg.setOneWeek(isOneWeek()); tg.setRoomResource(isRoomResource()); return tg; } public void addPrintEvent(EventInterface event) { addPrintEvent(event, event.getMeetings()); } public void addPrintEvent(EventInterface event, Collection<MeetingInterface> meetings) { for (Meeting m : addEvent(event, meetings)) { m.setDummy(); m.addStyleName("meeting-selected-noshadow"); } } public void labelDays(WeekInterface week) { for (int i = 0; i < iDayLabels.size(); i++) { iDayLabels.get(i).setText(CONSTANTS.longDays()[i] + (week == null ? "" : " " + week.getDayNames().get(i))); } } public void setNrDays(int days) { if (iNrDays == days) return; iNrDays = days; iCellWidth = (int)(0.9 * Window.getClientWidth() / days); iPanel.setWidth(String.valueOf(iNrDays * iCellWidth + (iScroll ? 0 : 5))); iWorkingHours.setWidth(String.valueOf(2 + iCellWidth * (iNrDays < 5 ? iNrDays : 5))); iScrollPanel.setWidth(String.valueOf(iNrDays * iCellWidth + 30 + (iScroll ? ToolBox.getScrollBarWidth() : 5))); for (int day = 0; day < 7 + (iScroll ? 0 : 1); day++) { if (day < days + (iScroll ? 0 : 1)) { if (iSeparators[day] == null) { iSeparators[day] = new SimplePanel(); iSeparators[day].setStyleName("day-separator"); iGrid.add(iSeparators[day], iCellWidth * day, 0); } else { DOM.setStyleAttribute(iSeparators[day].getElement(), "left", String.valueOf(iCellWidth * day)); iSeparators[day].setVisible(true); } } else { if (iSeparators[day] != null) iSeparators[day].setVisible(false); } } iHeader.clear(); iDayLabels.clear(); for (int i = -1; i < iNrDays; i++) { SimplePanel sp = new SimplePanel(); sp.setStyleName("header-time-interval"); if (i < 0) { if (iCalendar != null) sp.setWidget(iCalendar); sp.setWidth("30px"); } else { sp.setWidth(String.valueOf(iCellWidth)); Label l = new Label(CONSTANTS.longDays()[i]); iDayLabels.add(l); sp.setWidget(l); } iHeader.add(sp); } for (ArrayList<Meeting> meetings: iMeetings) for (Meeting meeting: meetings) meeting.move(); } public int firstSlot() { for (int slot = 0; slot < 24 * 60 / 5; slot++) { for (int day = 0; day < 7; day++) { if (iMeetingTable[day][slot] != null && !iMeetingTable[day][slot].isEmpty()) return slot; } } return 24 * 60 / 5 + 1; } public int lastSlot() { for (int slot = 24 * 60 / 5 - 1; slot >= 0; slot--) { for (int day = 0; day < 7; day++) { if (iMeetingTable[day][slot] != null && !iMeetingTable[day][slot].isEmpty()) return slot; } } return 0; } public void shrink() { boolean hasSat = false, hasSun = false; for (int slot = 0; slot < 24 * 60 / 5; slot++) { if (iMeetingTable[5][slot] !=null && !iMeetingTable[5][slot].isEmpty()) hasSat = true; if (iMeetingTable[6][slot] !=null && !iMeetingTable[6][slot].isEmpty()) hasSun = true; } if (!hasSat && !hasSun) setNrDays(5); else if (!hasSun) setNrDays(6); else setNrDays(7); } public String getWidth() { return String.valueOf(iNrDays * iCellWidth + 30 + ToolBox.getScrollBarWidth()); } public void scrollDown() { iScrollPanel.setWidth(String.valueOf(iNrDays * iCellWidth + 30 + ToolBox.getScrollBarWidth())); Scheduler.get().scheduleDeferred(new ScheduledCommand() { @Override public void execute() { if (iScrollPanel instanceof ScrollPanel) ((ScrollPanel)iScrollPanel).setScrollPosition(350); } }); } public void clear() { for (ArrayList<Meeting> meetings: iMeetings) for (Meeting meeting: meetings) iPanel.remove(meeting); iMeetings.clear(); for (int i = 0; i < iMeetingTable.length; i++) for (int j = 0 ; j < iMeetingTable[i].length; j++) if (iMeetingTable[i][j] != null) iMeetingTable[i][j].clear(); } public String getColor(EventInterface event) { String color = iColors.get(event.getId()); if (color == null) { color = CONSTANTS.meetingColors()[iColors.size() % CONSTANTS.meetingColors().length]; iColors.put(event.getId(), color); } return color; } protected Meeting addMeeting(EventInterface event, int day, int startSlot, int length, String name, ArrayList<String> note, String title, String color, ArrayList<Meeting> meetings) { int col = -1; for (int i = 0; i < length; i++) { if (iMeetingTable[day][startSlot + i] != null) { for (Iterator<Meeting> j = iMeetingTable[day][startSlot + i].iterator(); j.hasNext(); ) { Meeting m = j.next(); if (m.getColumn() > col) col = m.getColumn(); } } } col += 1; int cols = col + 1; if (col > 0) { boolean used[] = new boolean[cols - 1]; for (int i = 0; i < cols - 1; i++) used[i] = false; for (int i = 0; i < length; i++) { if (iMeetingTable[day][startSlot + i] != null) { for (Iterator<Meeting> j = iMeetingTable[day][startSlot + i].iterator(); j.hasNext(); ) { Meeting m = j.next(); used[m.getColumn()] = true; } } } for (int i = 0; i < cols - 1; i++) if (!used[i]) {col = i; cols--; break; } } Meeting meeting = new Meeting(event, name, note, day, startSlot, length, col, cols, meetings); meeting.addStyleName(color); meeting.setTitle(title); iPanel.add(meeting); for (int i = 0; i < length; i++) { if (iMeetingTable[day][startSlot + i] == null) iMeetingTable[day][startSlot + i] = new ArrayList<Meeting>(); for (Iterator<Meeting> j = iMeetingTable[day][startSlot + i].iterator(); j.hasNext(); ) { Meeting m = j.next(); m.setNrColumns(cols); } iMeetingTable[day][startSlot + i].add(meeting); } return meeting; } public ArrayList<Meeting> addEvent(EventInterface event) { return addEvent(event, event.getMeetings()); } public ArrayList<Meeting> addEvent(EventInterface event, Collection<MeetingInterface> eventMeetings) { String color = getColor(event); final ArrayList<Meeting> done = new ArrayList<Meeting>(); ArrayList<MeetingInterface> meetings = new ArrayList<MeetingInterface>(eventMeetings); while (!meetings.isEmpty()) { MeetingInterface meeting = null; TreeSet<MeetingInterface> dates = new TreeSet<MeetingInterface>(new Comparator<MeetingInterface>() { public int compare(MeetingInterface m1, MeetingInterface m2) { int cmp = new Integer(m1.getDayOfYear()).compareTo(new Integer(m2.getDayOfYear())); if (cmp != 0) return cmp; return m1.getId().compareTo(m2.getId()); } }); for (Iterator<MeetingInterface> i = meetings.iterator(); i.hasNext(); ) { MeetingInterface m = i.next(); if (meeting == null) { meeting = m; dates.add(m); i.remove(); } else if (meeting.getStartSlot() == m.getStartSlot() && meeting.getEndSlot() == m.getEndSlot() && meeting.getDayOfWeek() == m.getDayOfWeek()) { dates.add(m); i.remove(); } } String dateString = null; TreeSet<String> rooms = new TreeSet<String>(); int lastDay = 0; String endDate = null; for (MeetingInterface m: dates) { if (m.getLocation() != null) rooms.add(m.getLocation().getName()); if (dateString == null) { dateString = m.getMeetingDate(); lastDay = m.getDayOfYear(); endDate = null; } else if (lastDay == m.getDayOfYear()) { } else if (lastDay + 7 == m.getDayOfYear()) { endDate = m.getMeetingDate(); lastDay = m.getDayOfYear(); } else { if (endDate != null) dateString += " - " + endDate; dateString += ", " + m.getMeetingDate(); lastDay = m.getDayOfYear(); endDate = null; } } if (endDate != null) { dateString += " - " + endDate; } ArrayList<String> notes = new ArrayList<String>(); notes.add(meeting.getMeetingTime()); if (!iOneWeek) notes.add(dateString); String roomString = ""; for (String room: rooms) { if (!roomString.isEmpty()) roomString += ", "; roomString += room; } if (!iRoomResource) notes.add(roomString); if (event.hasInstructor()) notes.add(event.getInstructor().replace("|", "<br>")); if (event.hasSponsor()) notes.add(event.getSponsor()); done.add(addMeeting( event, meeting.getDayOfWeek(), meeting.getStartSlot(), meeting.getEndSlot() - meeting.getStartSlot(), event.getName() + " (" + (event.hasInstruction() ? event.getInstruction() : event.getType()) + ")", notes, (event.hasInstruction() ? event.getInstruction() : event.getType()) + " " + event.getName() + ": " + dateString + " " + meeting.getMeetingTime() + " " + roomString, color, done)); } iMeetings.add(done); return done; } public interface MeetingClickHandler { public void onMeetingClick(MeetingClickEvent event); } public class MeetingClickEvent { private Meeting iMeeting; MeetingClickEvent(Meeting meeting) { iMeeting = meeting; } public EventInterface getEvent() { return iMeeting.getEvent(); } } public void addMeetingClickHandler(MeetingClickHandler h) { iMeetingClickHandlers.add(h); } public class Meeting extends AbsolutePanel { private EventInterface iEvent; private int iColumn, iDay, iNrColumns; private int iLeft, iWidth; private ArrayList<Meeting> iMeetings; private HorizontalPanel iHeaderPanel; private boolean iDummy = false; private Meeting(EventInterface event, String name, ArrayList<String> note, int day, int start, int length, int column, int nrColumns, ArrayList<Meeting> meetings) { super(); iEvent = event; iMeetings = meetings; iDay = day; iColumn = column; iNrColumns = nrColumns; iHeaderPanel = new HorizontalPanel(); iHeaderPanel.setStylePrimaryName("header"); Label nameLabel = new Label(name); nameLabel.setStyleName("label"); iHeaderPanel.add(nameLabel); SimplePanel mbot = new SimplePanel(); mbot.setStylePrimaryName("footer"); String notes = ""; String delim = "<br>"; if (note.size() > 2 && length < 12) delim = ", "; if (note.size() > 3 && length < 18) delim = ", "; for (String n: note) { if (n == null || n.isEmpty()) continue; if (notes.length() > 0) notes += delim; notes += "<span style=\"white-space: nowrap\">" + n + "</span>"; } mbot.add(new HTML(notes)); setStylePrimaryName("meeting"); add(iHeaderPanel); add(mbot); iWidth = (iCellWidth - 6) / nrColumns + (column + 1 != nrColumns && nrColumns > 1 ? -3 : 0); setSize(String.valueOf(iWidth), String.valueOf(iCellHeight * length / 12 - 3)); DOM.setStyleAttribute(getElement(), "position", "absolute"); iLeft = 4 + iCellWidth * day + column * (iCellWidth - 6) / nrColumns; DOM.setStyleAttribute(getElement(), "left", String.valueOf(iLeft)); DOM.setStyleAttribute(getElement(), "top", String.valueOf(1 + iCellHeight * start / 12 - iCellHeight * iStart)); sinkEvents(Event.ONCLICK); sinkEvents(Event.ONMOUSEOVER); sinkEvents(Event.ONMOUSEMOVE); sinkEvents(Event.ONMOUSEOUT); } public EventInterface getEvent() { return iEvent; } public void addIcon(Widget image) { iHeaderPanel.add(image); } public void onBrowserEvent(Event event) { if (iDummy) return; com.google.gwt.user.client.Element target = DOM.eventGetTarget(event); boolean anchor = false; for (; target != null; target = DOM.getParent(target)) { String tag = DOM.getElementProperty(target, "tagName"); if (tag.equalsIgnoreCase("a")) { anchor = true; break; } else if (tag.equalsIgnoreCase("div")) { break; } } EventTarget related = event.getRelatedEventTarget(); switch (DOM.eventGetType(event)) { case Event.ONCLICK: setWidth(String.valueOf(iWidth)); DOM.setStyleAttribute(getElement(), "zIndex", ""); DOM.setStyleAttribute(getElement(), "left", String.valueOf(iLeft)); for (Meeting meeting: iMeetings) meeting.removeStyleName("meeting-selected"); if (!anchor) { MeetingClickEvent e = new MeetingClickEvent(Meeting.this); for (MeetingClickHandler h: iMeetingClickHandlers) h.onMeetingClick(e); } break; case Event.ONMOUSEOVER: if (related == null || !getElement().isOrHasChild((Element)related.cast())) { setWidth(String.valueOf(iCellWidth - 6)); getElement().getStyle().setZIndex(1000); DOM.setStyleAttribute(getElement(), "left", String.valueOf(4 + iCellWidth * iDay)); for (Meeting meeting: iMeetings) meeting.addStyleName("meeting-selected"); } break; case Event.ONMOUSEOUT: if (related == null || !getElement().isOrHasChild((Element)related.cast())) { setWidth(String.valueOf(iWidth)); DOM.setStyleAttribute(getElement(), "zIndex", ""); DOM.setStyleAttribute(getElement(), "left", String.valueOf(iLeft)); for (Meeting meeting: iMeetings) meeting.removeStyleName("meeting-selected"); } break; case Event.ONMOUSEMOVE: int relativeX = event.getClientX() - getElement().getAbsoluteLeft() + getElement().getScrollLeft() + getElement().getOwnerDocument().getScrollLeft(); if (relativeX < iLeft - 6 - iDay * iCellWidth || relativeX > iLeft - 2 - iDay * iCellWidth + iWidth) { setWidth(String.valueOf(iWidth)); DOM.setStyleAttribute(getElement(), "zIndex", ""); DOM.setStyleAttribute(getElement(), "left", String.valueOf(iLeft)); } break; } super.onBrowserEvent(event); } public void setNrColumns(int nrColumns) { if (nrColumns == iNrColumns) return; iNrColumns = nrColumns; move(); } public void move() { iWidth = (iCellWidth - 6) / iNrColumns + (iColumn + 1 != iNrColumns && iNrColumns > 1 ? -3 : 0); iLeft = 4 + iCellWidth * iDay + iColumn * (iCellWidth - 6) / iNrColumns; setWidth(String.valueOf(iWidth)); DOM.setStyleAttribute(getElement(), "left", String.valueOf(iLeft)); } public void setTitle(String title) { super.setTitle(title); } public int getColumn() { return iColumn; } public int getDay() { return iDay; } public int getNrColumns() { return iNrColumns; } public void add(Widget w) { super.add(w, getElement()); } public void setDummy() { iDummy = true; } } } |
