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
|
|
From: Tomas M. <to...@us...> - 2011-01-08 10:18:18
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/dataexchange In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19847/JavaSource/org/unitime/timetable/dataexchange Modified Files: CourseTimetableExport.java Log Message: Course Timetable export - if there is a cross-list, export each class under all the course names (not just the controlling one) Index: CourseTimetableExport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/dataexchange/CourseTimetableExport.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CourseTimetableExport.java 15 Dec 2010 13:34:38 -0000 1.3 --- CourseTimetableExport.java 8 Jan 2011 10:18:11 -0000 1.4 *************** *** 33,36 **** --- 33,38 ---- import org.unitime.timetable.model.Class_; import org.unitime.timetable.model.CourseOffering; + import org.unitime.timetable.model.InstrOfferingConfig; + import org.unitime.timetable.model.SchedulingSubpart; import org.unitime.timetable.model.Session; *************** *** 49,60 **** root.addAttribute("action", "update"); ! List classes = getHibSession().createQuery( ! "select distinct c from Class_ as c where " + ! "c.schedulingSubpart.instrOfferingConfig.instructionalOffering.session.uniqueId=:sessionId and c.parentClass is null"). setLong("sessionId",session.getUniqueId().longValue()). setFetchSize(1000).list(); ! for (Iterator i=classes.iterator();i.hasNext();) ! exportClass(root.addElement("class"), (Class_)i.next(), session); commitTransaction(); --- 51,71 ---- root.addAttribute("action", "update"); ! List<CourseOffering> courses = (List<CourseOffering>)getHibSession().createQuery( ! "select c from CourseOffering as c where " + ! "c.subjectArea.session.uniqueId=:sessionId " + ! "order by c.subjectArea.subjectAreaAbbreviation, c.courseNbr"). setLong("sessionId",session.getUniqueId().longValue()). setFetchSize(1000).list(); ! for (CourseOffering course: courses) { ! for (InstrOfferingConfig config: course.getInstructionalOffering().getInstrOfferingConfigs()) { ! for (SchedulingSubpart subpart: config.getSchedulingSubparts()) { ! if (subpart.getParentSubpart() != null) continue; ! for (Class_ clazz: subpart.getClasses()) { ! exportClass(root.addElement("class"), clazz, course, session); ! } ! } ! } ! } commitTransaction(); *************** *** 65,72 **** } ! protected void exportClass(Element classElement, Class_ clazz, Session session) { classElement.addAttribute("id", clazz.getUniqueId().toString()); ! CourseOffering course = clazz.getSchedulingSubpart().getInstrOfferingConfig().getInstructionalOffering().getControllingCourseOffering(); ! classElement.addAttribute("subject", course.getSubjectAreaAbbv()); classElement.addAttribute("courseNbr", course.getCourseNbr()); classElement.addAttribute("type", clazz.getItypeDesc().trim()); --- 76,82 ---- } ! protected void exportClass(Element classElement, Class_ clazz, CourseOffering course, Session session) { classElement.addAttribute("id", clazz.getUniqueId().toString()); ! classElement.addAttribute("subject", course.getSubjectArea().getSubjectAreaAbbreviation()); classElement.addAttribute("courseNbr", course.getCourseNbr()); classElement.addAttribute("type", clazz.getItypeDesc().trim()); *************** *** 74,78 **** for (Iterator i=clazz.getChildClasses().iterator();i.hasNext();) { Class_ childClazz = (Class_)i.next(); ! exportClass(classElement.addElement("class"), childClazz, session); } if (clazz.getCommittedAssignment()!=null) --- 84,88 ---- for (Iterator i=clazz.getChildClasses().iterator();i.hasNext();) { Class_ childClazz = (Class_)i.next(); ! exportClass(classElement.addElement("class"), childClazz, course, session); } if (clazz.getCommittedAssignment()!=null) |
|
From: Nightly B. <no...@un...> - 2011-01-05 23:50:20
|
Download the resultant file at http://www.unitime.org/uct_builds.php, see the attached build and change logs for more details. |
|
From: Tomas M. <to...@us...> - 2011-01-05 18:11:42
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv14966/JavaSource/org/unitime/timetable/solver/ui Modified Files: AssignmentPreferenceInfo.java Log Message: room unique ids are longs Index: AssignmentPreferenceInfo.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui/AssignmentPreferenceInfo.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AssignmentPreferenceInfo.java 1 Dec 2010 11:10:38 -0000 1.3 --- AssignmentPreferenceInfo.java 5 Jan 2011 18:11:33 -0000 1.4 *************** *** 252,256 **** for (Iterator i=root.elementIterator("roomPref");i.hasNext();) { Element e = (Element)i.next(); ! iRoomPreference.put(Integer.valueOf(e.attributeValue("id")),Integer.valueOf(e.getText())); } iBestRoomPreference = Integer.parseInt(root.elementText("bestRoomPref")); --- 252,256 ---- for (Iterator i=root.elementIterator("roomPref");i.hasNext();) { Element e = (Element)i.next(); ! iRoomPreference.put(Long.valueOf(e.attributeValue("id")),Integer.valueOf(e.getText())); } iBestRoomPreference = Integer.parseInt(root.elementText("bestRoomPref")); |
|
From: Nightly B. <no...@un...> - 2011-01-04 23:51:25
|
Download the resultant file at http://www.unitime.org/uct_builds.php, see the attached build and change logs for more details. |
|
From: Tomas M. <to...@us...> - 2011-01-04 20:17:34
|
Update of /cvsroot/unitime/UniTimeBannerAddOn In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv9437 Modified Files: .classpath Log Message: Minor technology update - GWT updated to version 2.1.1 (was 2.1.0) - iText updated to version 5.0.5 (was 5.0.2) - Hibernate updated to 3.5.6 (was 3.5.3) - Log4j updated to 1.2.16 (was 1.2.15) - MySQL Connector/J updated to 5.1.14 (was 5.1.11) Index: .classpath =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/.classpath,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .classpath 1 Dec 2010 17:34:11 -0000 1.2 --- .classpath 4 Jan 2011 20:17:26 -0000 1.3 *************** *** 10,14 **** <classpathentry kind="lib" path="/UniTime/WebContent/WEB-INF/lib/dom4j-1.6.1.jar"/> <classpathentry kind="lib" path="/UniTime/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar"/> ! <classpathentry kind="lib" path="/UniTime/WebContent/WEB-INF/lib/iText-5.0.2.jar"/> <classpathentry kind="lib" path="/UniTime/3rd_party/ant.jar"/> <classpathentry kind="src" path="/UniTime"/> --- 10,14 ---- <classpathentry kind="lib" path="/UniTime/WebContent/WEB-INF/lib/dom4j-1.6.1.jar"/> <classpathentry kind="lib" path="/UniTime/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar"/> ! <classpathentry kind="lib" path="/UniTime/WebContent/WEB-INF/lib/iText-5.0.5.jar"/> <classpathentry kind="lib" path="/UniTime/3rd_party/ant.jar"/> <classpathentry kind="src" path="/UniTime"/> |
|
From: Tomas M. <to...@us...> - 2011-01-04 20:16:07
|
Update of /cvsroot/unitime/UniTime/3rd_party In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7833/3rd_party Modified Files: gwt-dev.jar gwt-user.jar Log Message: Minor technology update - GWT updated to version 2.1.1 (was 2.1.0) - iText updated to version 5.0.5 (was 5.0.2) - Hibernate updated to 3.5.6 (was 3.5.3) - Log4j updated to 1.2.16 (was 1.2.15) - MySQL Connector/J updated to 5.1.14 (was 5.1.11) Index: gwt-dev.jar =================================================================== RCS file: /cvsroot/unitime/UniTime/3rd_party/gwt-dev.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsHJML2f and /tmp/cvsIKrjxz differ Index: gwt-user.jar =================================================================== RCS file: /cvsroot/unitime/UniTime/3rd_party/gwt-user.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsqSnH4F and /tmp/cvsenBLk1 differ |
|
From: Tomas M. <to...@us...> - 2011-01-04 20:15:38
|
Update of /cvsroot/unitime/UniTime/Documentation/License In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7833/Documentation/License Modified Files: dependencies.txt Log Message: Minor technology update - GWT updated to version 2.1.1 (was 2.1.0) - iText updated to version 5.0.5 (was 5.0.2) - Hibernate updated to 3.5.6 (was 3.5.3) - Log4j updated to 1.2.16 (was 1.2.15) - MySQL Connector/J updated to 5.1.14 (was 5.1.11) Index: dependencies.txt =================================================================== RCS file: /cvsroot/unitime/UniTime/Documentation/License/dependencies.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dependencies.txt 1 Dec 2010 11:10:54 -0000 1.2 --- dependencies.txt 4 Jan 2011 20:15:30 -0000 1.3 *************** *** 75,84 **** 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/ --- 75,84 ---- hibernate3.jar ! Hibernate 3.5.6 URL: http://www.hibernate.org/ Copyright: (c) 2008, Adam Warski, JBoss Inc. License: GNU Lesser General Public License, Version 2.1 ! iText-5.0.6.jar iText is a library that allows you to create and manipulate PDF documents URL: http://itextpdf.com/ *************** *** 105,109 **** 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/ --- 105,109 ---- see https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewLicense-Start ! log4j-1.2.16.jar Apache Logging Service URL: http://logging.apache.org/log4j/1.2/ *************** *** 118,122 **** License: GNU General Public License (GPL) version 2 ! mysql-connector-java-5.1.11-bin.jar MySQL Connector/J Copyright: (C) 2010 Oracle Corp. --- 118,122 ---- License: GNU General Public License (GPL) version 2 ! mysql-connector-java-5.1.14-bin.jar MySQL Connector/J Copyright: (C) 2010 Oracle Corp. |
|
From: Tomas M. <to...@us...> - 2011-01-04 20:15:38
|
Update of /cvsroot/unitime/UniTime In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7833 Modified Files: .classpath Log Message: Minor technology update - GWT updated to version 2.1.1 (was 2.1.0) - iText updated to version 5.0.5 (was 5.0.2) - Hibernate updated to 3.5.6 (was 3.5.3) - Log4j updated to 1.2.16 (was 1.2.15) - MySQL Connector/J updated to 5.1.14 (was 5.1.11) Index: .classpath =================================================================== RCS file: /cvsroot/unitime/UniTime/.classpath,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** .classpath 1 Dec 2010 11:10:50 -0000 1.7 --- .classpath 4 Jan 2011 20:15:30 -0000 1.8 *************** *** 2,6 **** <classpath> <classpathentry kind="src" path="JavaSource"/> ! <classpathentry kind="lib" path="WebContent/WEB-INF/lib/hibernate3.jar" sourcepath="/3rd_party/hibernate-3.5.3"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/> --- 2,6 ---- <classpath> <classpathentry kind="src" path="JavaSource"/> ! <classpathentry kind="lib" path="WebContent/WEB-INF/lib/hibernate3.jar" sourcepath="/3rd_party/hibernate-3.5.6"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/> *************** *** 23,28 **** <classpathentry kind="lib" path="WebContent/WEB-INF/lib/jstl-1.0.2.jar"/> <classpathentry kind="lib" path="WebContent/WEB-INF/lib/jta-1.1.jar"/> ! <classpathentry kind="lib" path="WebContent/WEB-INF/lib/log4j-1.2.15.jar"/> ! <classpathentry kind="lib" path="WebContent/WEB-INF/lib/mysql-connector-java-5.1.11-bin.jar"/> <classpathentry kind="lib" path="3rd_party/ojdbc6.jar"/> <classpathentry kind="lib" path="WebContent/WEB-INF/lib/oro-2.0.8.jar"/> --- 23,28 ---- <classpathentry kind="lib" path="WebContent/WEB-INF/lib/jstl-1.0.2.jar"/> <classpathentry kind="lib" path="WebContent/WEB-INF/lib/jta-1.1.jar"/> ! <classpathentry kind="lib" path="WebContent/WEB-INF/lib/log4j-1.2.16.jar"/> ! <classpathentry kind="lib" path="WebContent/WEB-INF/lib/mysql-connector-java-5.1.14-bin.jar"/> <classpathentry kind="lib" path="3rd_party/ojdbc6.jar"/> <classpathentry kind="lib" path="WebContent/WEB-INF/lib/oro-2.0.8.jar"/> *************** *** 41,45 **** <classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-logging-1.1.1.jar"/> <classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-pool-1.5.4.jar"/> ! <classpathentry kind="lib" path="WebContent/WEB-INF/lib/iText-5.0.2.jar" sourcepath="/3rd_party/iText-5.0.2"/> <classpathentry kind="lib" path="WebContent/WEB-INF/lib/Struts-Layout-1.3.jar" sourcepath="/3rd_party/struts-layout-1.3"/> <classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-configuration-1.6.jar"/> --- 41,45 ---- <classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-logging-1.1.1.jar"/> <classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-pool-1.5.4.jar"/> ! <classpathentry kind="lib" path="WebContent/WEB-INF/lib/iText-5.0.5.jar" sourcepath="/3rd_party/iText-5.0.5"/> <classpathentry kind="lib" path="WebContent/WEB-INF/lib/Struts-Layout-1.3.jar" sourcepath="/3rd_party/struts-layout-1.3"/> <classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-configuration-1.6.jar"/> |
|
From: Tomas M. <to...@us...> - 2011-01-04 20:15:38
|
Update of /cvsroot/unitime/UniTime/WebContent/WEB-INF/lib In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7833/WebContent/WEB-INF/lib Modified Files: hibernate3.jar gwt-servlet.jar Added Files: mysql-connector-java-5.1.14-bin.jar log4j-1.2.16.jar iText-5.0.5.jar Removed Files: log4j-1.2.15.jar mysql-connector-java-5.1.11-bin.jar iText-5.0.2.jar Log Message: Minor technology update - GWT updated to version 2.1.1 (was 2.1.0) - iText updated to version 5.0.5 (was 5.0.2) - Hibernate updated to 3.5.6 (was 3.5.3) - Log4j updated to 1.2.16 (was 1.2.15) - MySQL Connector/J updated to 5.1.14 (was 5.1.11) --- iText-5.0.2.jar DELETED --- --- log4j-1.2.15.jar DELETED --- Index: hibernate3.jar =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/WEB-INF/lib/hibernate3.jar,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvsYokIBA and /tmp/cvsEIO9HJ differ --- NEW FILE: mysql-connector-java-5.1.14-bin.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: log4j-1.2.16.jar --- (This appears to be a binary file; contents omitted.) Index: gwt-servlet.jar =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/WEB-INF/lib/gwt-servlet.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsAWhUdK and /tmp/cvsi5RKET differ --- NEW FILE: iText-5.0.5.jar --- (This appears to be a binary file; contents omitted.) --- mysql-connector-java-5.1.11-bin.jar DELETED --- |
|
From: Tomas M. <to...@us...> - 2011-01-04 20:15:38
|
Update of /cvsroot/unitime/UniTime/WebContent/help In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7833/WebContent/help Modified Files: Release-Notes.xml Log Message: Minor technology update - GWT updated to version 2.1.1 (was 2.1.0) - iText updated to version 5.0.5 (was 5.0.2) - Hibernate updated to 3.5.6 (was 3.5.3) - Log4j updated to 1.2.16 (was 1.2.15) - MySQL Connector/J updated to 5.1.14 (was 5.1.11) Index: Release-Notes.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/help/Release-Notes.xml,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** Release-Notes.xml 3 Jan 2011 15:08:22 -0000 1.77 --- Release-Notes.xml 4 Jan 2011 20:15:30 -0000 1.78 *************** *** 38,41 **** --- 38,51 ---- </description> </item> + <item> + <name>Minor technology update</name> + <description> + <line>GWT updated to version 2.1.1 (was 2.1.0)</line> + <line>iText updated to version 5.0.5 (was 5.0.2)</line> + <line>Hibernate updated to 3.5.6 (was 3.5.3)</line> + <line>Log4j updated to 1.2.16 (was 1.2.15)</line> + <line>MySQL Connector/J updated to 5.1.14 (was 5.1.11)</line> + </description> + </item> </category> </release> |
|
From: Nightly B. <no...@un...> - 2011-01-03 23:51:13
|
Download the resultant file at http://www.unitime.org/uct_builds.php, see the attached build and change logs for more details. |
|
From: Tomas M. <to...@us...> - 2011-01-03 15:08:30
|
Update of /cvsroot/unitime/UniTime/WebContent/help In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv3655/WebContent/help Modified Files: Release-Notes.xml Log Message: added recent change Index: Release-Notes.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/help/Release-Notes.xml,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** Release-Notes.xml 22 Dec 2010 13:50:07 -0000 1.76 --- Release-Notes.xml 3 Jan 2011 15:08:22 -0000 1.77 *************** *** 30,33 **** --- 30,50 ---- <title>User interface</title> <item> + <name>Buildings -- Update Rooms</name> + <description> + <line>Only update rooms and buildings that have external ids</line> + <line>Ensure that Room.permanentId attribute is set for a newly created room + <line>This fixes a bug introduced in 3.2.101</line> + </line> + </description> + </item> + </category> + </release> + + <release> + <version>3.2.107</version> + <release-date>Thu, 23 Dec 2010</release-date> + <category> + <title>User interface</title> + <item> <name>Instructional Offering Cross Lists</name> <description> |
|
From: Tomas M. <to...@us...> - 2011-01-03 15:02:49
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv2337/JavaSource/org/unitime/timetable/model Modified Files: Room.java Log Message: Buildings -- Update Data - only update rooms and buildings that have external ids - ensure that Room.permanentId attribute is set for a newly created room Index: Room.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/Room.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Room.java 13 Dec 2010 21:36:48 -0000 1.10 --- Room.java 3 Jan 2011 15:02:40 -0000 1.11 *************** *** 31,34 **** --- 31,35 ---- import org.unitime.timetable.model.dao.RoomDAO; import org.unitime.timetable.model.dao.RoomDeptDAO; + import org.unitime.timetable.util.LocationPermIdGenerator; *************** *** 140,147 **** public static void addNewExternalRoomsToSession(Session session) { ! String query = "from ExternalRoom er where er.building.session.uniqueId=:sessionId"; boolean updateExistingRooms = "true".equalsIgnoreCase(ApplicationProperties.getProperty("unitime.external.room.update.existing", "false")); if (!updateExistingRooms) ! query += " and er.externalUniqueId not in (select r.externalUniqueId from Room r where r.session.uniqueId =:sessionId)"; boolean resetRoomFeatures = "true".equalsIgnoreCase(ApplicationProperties.getProperty("unitime.external.room.update.existing.features", "false")); boolean resetRoomDepartments = "true".equalsIgnoreCase(ApplicationProperties.getProperty("unitime.external.room.update.existing.departments", "false")); --- 141,149 ---- public static void addNewExternalRoomsToSession(Session session) { ! String query = "from ExternalRoom er where er.building.session.uniqueId=:sessionId and er.building.externalUniqueId is not null and er.externalUniqueId is not null"; boolean updateExistingRooms = "true".equalsIgnoreCase(ApplicationProperties.getProperty("unitime.external.room.update.existing", "false")); if (!updateExistingRooms) ! query += " and er.externalUniqueId not in (select r.externalUniqueId from Room r where r.session.uniqueId =:sessionId " + ! "and r.externalUniqueId is not null)"; boolean resetRoomFeatures = "true".equalsIgnoreCase(ApplicationProperties.getProperty("unitime.external.room.update.existing.features", "false")); boolean resetRoomDepartments = "true".equalsIgnoreCase(ApplicationProperties.getProperty("unitime.external.room.update.existing.departments", "false")); *************** *** 206,209 **** --- 208,212 ---- for (ExternalRoomDepartment erd: er.getRoomDepartments()) r.addExternalRoomDept(erd, er.getRoomDepartments()); + LocationPermIdGenerator.setPermanentId(r); hibSession.saveOrUpdate(r); } else if (updateExistingRooms) { |
|
From: Tomas M. <to...@us...> - 2010-12-23 08:43:33
|
Update of /cvsroot/unitime/UniTime In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv30135 Modified Files: build.number Log Message: UniTime 3.2 build 107 released Index: build.number =================================================================== RCS file: /cvsroot/unitime/UniTime/build.number,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** build.number 1 Dec 2010 11:10:50 -0000 1.28 --- build.number 23 Dec 2010 08:43:24 -0000 1.29 *************** *** 1,3 **** #Build Number for ANT. Do not edit! ! #Wed Dec 01 00:30:35 CET 2010 ! build.number=94 --- 1,3 ---- #Build Number for ANT. Do not edit! ! #Thu Dec 23 00:30:54 CET 2010 ! build.number=108 |
|
From: Nightly B. <no...@un...> - 2010-12-22 23:50:05
|
Download the resultant file at http://www.unitime.org/uct_builds.php, see the attached build and change logs for more details. |
|
From: Tomas M. <to...@us...> - 2010-12-22 13:50:16
|
Update of /cvsroot/unitime/UniTime/WebContent/help In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22647/WebContent/help Modified Files: Release-Notes.xml Log Message: added recent changes Index: Release-Notes.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/help/Release-Notes.xml,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** Release-Notes.xml 15 Dec 2010 19:34:12 -0000 1.75 --- Release-Notes.xml 22 Dec 2010 13:50:07 -0000 1.76 *************** *** 54,57 **** --- 54,71 ---- </item> <item> + <name>Event Timetable</name> + <description> + <line>Added ability to display a simplified version of the page (gwt.jsp?page=roomtable) that only allows to display room timetable (and no other resource type)</line> + </description> + </item> + <item> + <name>(Course Timetabling) Changes</name> + <description> + <line>Check both assignments for rooms + <line>This fixes the problem when selected solution had no room assigned (no room change was shown even when the new solution had a room assigned)</line> + </line> + </description> + </item> + <item> <name>Other</name> <description> *************** *** 79,82 **** --- 93,104 ---- </description> </item> + <item> + <name>iCalendar export</name> + <description> + <line>Ensure that the exported calendar is in UTF-8.</line> + <line>Avoid ArrayIndexOutOfBounds exception when there are two or more instructors with empty emails</line> + <line>If parameter encryption fails, fall back to no encryption</line> + </description> + </item> </category> <category> |
|
From: Nightly B. <no...@un...> - 2010-12-20 23:51:17
|
Download the resultant file at http://www.unitime.org/uct_builds.php, see the attached build and change logs for more details. |
|
From: Tomas M. <to...@us...> - 2010-12-20 23:29:46
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/client/events In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv10562/JavaSource/org/unitime/timetable/gwt/client/events Modified Files: EventResourceTimetable.java Log Message: Event Timetable - added ability to display a simplified version of the page (page=roomtable) that only allows to display room timetable (and no other resource type) Index: EventResourceTimetable.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/client/events/EventResourceTimetable.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EventResourceTimetable.java 1 Dec 2010 11:10:54 -0000 1.2 --- EventResourceTimetable.java 20 Dec 2010 22:07:19 -0000 1.3 *************** *** 99,103 **** private final EventServiceAsync iEventService = GWT.create(EventService.class); ! public EventResourceTimetable() { sInstance = this; --- 99,103 ---- private final EventServiceAsync iEventService = GWT.create(EventService.class); ! public EventResourceTimetable(String type) { sInstance = this; *************** *** 168,171 **** --- 168,174 ---- }); iFilter.addRow("Resoure Type:", iResourceTypes); + if (type != null) + iFilter.getRowFormatter().setVisible(iFilter.getRowCount() - 1, false); + iResources = new SuggestBox(new SuggestOracle() { @Override *************** *** 213,217 **** iResourceTypes.setSelectedIndex(ResourceType.PERSON.ordinal()); ! String typeString = Window.Location.getParameter("type"); if (typeString != null) for (int idx = 0; idx < iResourceTypes.getItemCount(); idx ++) { --- 216,220 ---- iResourceTypes.setSelectedIndex(ResourceType.PERSON.ordinal()); ! String typeString = (type != null ? type : Window.Location.getParameter("type")); if (typeString != null) for (int idx = 0; idx < iResourceTypes.getItemCount(); idx ++) { *************** *** 391,395 **** iData = result; if (iResource.getType() != ResourceType.PERSON) ! changeUrl(iResource.getSessionAbbv(), iResource.getType().toString().toLowerCase(), iResource.getAbbreviation(), null); LoadingWidget.getInstance().hide(); if (iData.isEmpty()) { --- 394,398 ---- iData = result; if (iResource.getType() != ResourceType.PERSON) ! changeUrl(Window.Location.getParameter("page"), iResource.getSessionAbbv(), iResource.getType().toString().toLowerCase(), iResource.getAbbreviation(), null); LoadingWidget.getInstance().hide(); if (iData.isEmpty()) { *************** *** 516,520 **** 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()); --- 519,523 ---- if (iWeek.getSelectedIndex() <= 0) { if (iResource.getType() != ResourceType.PERSON) ! changeUrl(Window.Location.getParameter("page"), 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()); *************** *** 532,536 **** } if (iResource.getType() != ResourceType.PERSON && week != null) ! changeUrl(iResource.getSessionAbbv(), iResource.getType().toString().toLowerCase(), iResource.getAbbreviation(), --- 535,539 ---- } if (iResource.getType() != ResourceType.PERSON && week != null) ! changeUrl(Window.Location.getParameter("page"), iResource.getSessionAbbv(), iResource.getType().toString().toLowerCase(), iResource.getAbbreviation(), *************** *** 922,929 **** }-*/; ! 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) { } --- 925,932 ---- }-*/; ! private native static void changeUrl(String page, 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=" + page + "&" + state); } catch (err) { } |
|
From: Tomas M. <to...@us...> - 2010-12-20 22:07:27
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/client In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv10562/JavaSource/org/unitime/timetable/gwt/client Modified Files: Pages.java Log Message: Event Timetable - added ability to display a simplified version of the page (page=roomtable) that only allows to display room timetable (and no other resource type) Index: Pages.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/client/Pages.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Pages.java 1 Dec 2010 11:10:48 -0000 1.2 --- Pages.java 20 Dec 2010 22:07:19 -0000 1.3 *************** *** 39,43 **** requests("Student Course Requests", new PageFactory() { public Widget create() { return new StudentSectioningPage(StudentSectioningPage.Mode.REQUESTS); } }), admin("Administration", new PageFactory() { public Widget create() { return new SimpleEditPage(); } }), ! timetable("Event Timetable", new PageFactory() { public Widget create() { return new EventResourceTimetable(); } }); private String iTitle; --- 39,44 ---- requests("Student Course Requests", new PageFactory() { public Widget create() { return new StudentSectioningPage(StudentSectioningPage.Mode.REQUESTS); } }), admin("Administration", new PageFactory() { public Widget create() { return new SimpleEditPage(); } }), ! timetable("Event Timetable", new PageFactory() { public Widget create() { return new EventResourceTimetable(null); } }), ! roomtable("Room Timetable", new PageFactory() { public Widget create() { return new EventResourceTimetable("room"); } }); private String iTitle; |
|
From: Nightly B. <no...@un...> - 2010-12-17 23:50:05
|
Download the resultant file at http://www.unitime.org/uct_builds.php, see the attached build and change logs for more details. |
|
From: Tomas M. <to...@us...> - 2010-12-17 19:20:10
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/server In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15833/JavaSource/org/unitime/timetable/gwt/server Modified Files: CalendarServlet.java Log Message: Calendar exports - if parameter encryption fails, fall back to no encryption Index: CalendarServlet.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/server/CalendarServlet.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CalendarServlet.java 17 Dec 2010 18:20:13 -0000 1.4 --- CalendarServlet.java 17 Dec 2010 19:20:02 -0000 1.5 *************** *** 22,27 **** --- 22,30 ---- import java.io.IOException; import java.io.PrintWriter; + import java.io.UnsupportedEncodingException; import java.math.BigInteger; import java.net.URL; + import java.net.URLDecoder; + import java.net.URLEncoder; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; *************** *** 52,55 **** --- 55,59 ---- import javax.servlet.http.HttpServletResponse; + import org.apache.log4j.Logger; import org.unitime.commons.User; import org.unitime.commons.web.Web; *************** *** 92,95 **** --- 96,100 ---- public class CalendarServlet extends HttpServlet { private static final long serialVersionUID = 1L; + private static Logger sLog = Logger.getLogger(CalendarServlet.class); public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { *************** *** 994,998 **** return new BigInteger(cipher.doFinal(text.getBytes())).toString(36); } catch (Exception e) { ! return null; } } --- 999,1008 ---- return new BigInteger(cipher.doFinal(text.getBytes())).toString(36); } catch (Exception e) { ! sLog.warn("Encoding failed: " + e.getMessage()); ! try { ! return URLEncoder.encode(text, "ISO-8859-1"); ! } catch (UnsupportedEncodingException x) { ! return null; ! } } } *************** *** 1005,1009 **** return new String(cipher.doFinal(new BigInteger(text, 36).toByteArray())); } catch (Exception e) { ! return null; } } --- 1015,1024 ---- return new String(cipher.doFinal(new BigInteger(text, 36).toByteArray())); } catch (Exception e) { ! sLog.warn("Decoding failed: " + e.getMessage()); ! try { ! return URLDecoder.decode(text, "ISO-8859-1"); ! } catch (UnsupportedEncodingException x) { ! return null; ! } } } |
|
From: Tomas M. <to...@us...> - 2010-12-17 18:20:21
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/server In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5297/JavaSource/org/unitime/timetable/gwt/server Modified Files: CalendarServlet.java EventServlet.java Log Message: Event Timetable -- export to calendar - avoid ArrayIndexOutOfBounds exception when there are two or more instructors with empty emails - "||".split("\\|") does not return an array with two empty strings as expected, but just one empty string - no email expressed by "-" (dash), instead of "" (empty string) Index: CalendarServlet.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/server/CalendarServlet.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CalendarServlet.java 17 Dec 2010 14:04:35 -0000 1.3 --- CalendarServlet.java 17 Dec 2010 18:20:13 -0000 1.4 *************** *** 345,349 **** String[] email = event.getEmail().split("\\|"); for (int i = 0; i < instructor.length; i++) { ! out.println((i == 0 ? "ORGANIZER" : "ATTENDEE") + ";ROLE=CHAIR;CN=\"" + instructor[i].trim() + "\":MAILTO:" + email[i].trim()); } } else if (event.hasSponsor()) { --- 345,349 ---- String[] email = event.getEmail().split("\\|"); for (int i = 0; i < instructor.length; i++) { ! out.println((i == 0 ? "ORGANIZER" : "ATTENDEE") + ";ROLE=CHAIR;CN=\"" + instructor[i].trim() + "\":MAILTO:" + ("-".equals(email[i]) ? "" : email[i])); } } else if (event.hasSponsor()) { Index: EventServlet.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/server/EventServlet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EventServlet.java 1 Dec 2010 11:10:49 -0000 1.2 --- EventServlet.java 17 Dec 2010 18:20:13 -0000 1.3 *************** *** 665,669 **** if (!instructor.isEmpty()) { instructor += "|"; email += "|"; } instructor += Constants.toInitialCase(i.nameLastNameFirst()); ! email += (i.getInstructor().getEmail() == null ? "" : i.getInstructor().getEmail()); } event.setInstructor(instructor); --- 665,669 ---- if (!instructor.isEmpty()) { instructor += "|"; email += "|"; } instructor += Constants.toInitialCase(i.nameLastNameFirst()); ! email += (i.getInstructor().getEmail() == null ? "-" : i.getInstructor().getEmail()); } event.setInstructor(instructor); |
|
From: Tomas M. <to...@us...> - 2010-12-17 14:04:46
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/server In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv2664/JavaSource/org/unitime/timetable/gwt/server Modified Files: CalendarServlet.java Log Message: Ensure that the exported calendar is in UTF-8. Index: CalendarServlet.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/server/CalendarServlet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CalendarServlet.java 1 Dec 2010 11:10:49 -0000 1.2 --- CalendarServlet.java 17 Dec 2010 14:04:35 -0000 1.3 *************** *** 21,24 **** --- 21,25 ---- import java.io.IOException; + import java.io.PrintWriter; import java.math.BigInteger; import java.net.URL; *************** *** 47,51 **** import javax.crypto.spec.SecretKeySpec; import javax.servlet.ServletException; - import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; --- 48,51 ---- *************** *** 142,149 **** String id = params.get("id"); ! response.setContentType("text/calendar"); response.setHeader( "Content-Disposition", "attachment; filename=\"schedule.ics\"" ); ! ServletOutputStream out = response.getOutputStream(); org.hibernate.Session hibSession = CurriculumDAO.getInstance().getSession(); try { --- 142,150 ---- String id = params.get("id"); ! response.setContentType("text/calendar; charset=UTF-8"); ! response.setCharacterEncoding("UTF-8"); response.setHeader( "Content-Disposition", "attachment; filename=\"schedule.ics\"" ); ! PrintWriter out = response.getWriter(); org.hibernate.Session hibSession = CurriculumDAO.getInstance().getSession(); try { *************** *** 294,298 **** } ! private void printEvent(EventInterface event, ServletOutputStream out) throws IOException { SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd"); df.setTimeZone(TimeZone.getTimeZone("UTC")); --- 295,299 ---- } ! private void printEvent(EventInterface event, PrintWriter out) throws IOException { SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd"); df.setTimeZone(TimeZone.getTimeZone("UTC")); *************** *** 344,348 **** String[] email = event.getEmail().split("\\|"); for (int i = 0; i < instructor.length; i++) { ! out.println((i == 0 ? "ORGANIZER" : "ATTENDEE") + ";ROLE=CHAIR;CN=\"" + instructor[i] + "\":MAILTO:" + email[i]); } } else if (event.hasSponsor()) { --- 345,349 ---- String[] email = event.getEmail().split("\\|"); for (int i = 0; i < instructor.length; i++) { ! out.println((i == 0 ? "ORGANIZER" : "ATTENDEE") + ";ROLE=CHAIR;CN=\"" + instructor[i].trim() + "\":MAILTO:" + email[i].trim()); } } else if (event.hasSponsor()) { *************** *** 353,357 **** } ! private void printEvent(Event event, Collection<Meeting> meetings, ServletOutputStream out) throws IOException { if (meetings == null) meetings = event.getMeetings(); --- 354,358 ---- } ! private void printEvent(Event event, Collection<Meeting> meetings, PrintWriter out) throws IOException { if (meetings == null) meetings = event.getMeetings(); *************** *** 408,412 **** } ! private void printExam(Exam exam, ServletOutputStream out) throws IOException { if (exam.getAssignedPeriod() == null) return; --- 409,413 ---- } ! private void printExam(Exam exam, PrintWriter out) throws IOException { if (exam.getAssignedPeriod() == null) return; *************** *** 437,441 **** } ! private void printClass(CourseOffering course, Class_ clazz, ServletOutputStream out) throws IOException { Assignment assignment = clazz.getCommittedAssignment(); if (assignment == null) return; --- 438,442 ---- } ! private void printClass(CourseOffering course, Class_ clazz, PrintWriter out) throws IOException { Assignment assignment = clazz.getCommittedAssignment(); if (assignment == null) return; *************** *** 605,609 **** } ! private void printClassRest(CourseOffering course, Class_ clazz, Assignment assignment, ServletOutputStream out) throws IOException { out.println("UID:" + clazz.getUniqueId()); out.println("SEQUENCE:0"); --- 606,610 ---- } ! private void printClassRest(CourseOffering course, Class_ clazz, Assignment assignment, PrintWriter out) throws IOException { out.println("UID:" + clazz.getUniqueId()); out.println("SEQUENCE:0"); *************** *** 636,640 **** } ! private void printSection(SectioningServer server, CourseInfo course, Section section, ServletOutputStream out) throws IOException { TimeLocation time = section.getTime(); if (time == null || time.getWeekCode().isEmpty()) return; --- 637,641 ---- } ! private void printSection(SectioningServer server, CourseInfo course, Section section, PrintWriter out) throws IOException { TimeLocation time = section.getTime(); if (time == null || time.getWeekCode().isEmpty()) return; *************** *** 802,806 **** @SuppressWarnings("unchecked") ! private void printMeetingRest(SectioningServer server, CourseInfo course, Section section, ServletOutputStream out) throws IOException { out.println("UID:" + section.getId()); out.println("SEQUENCE:0"); --- 803,807 ---- @SuppressWarnings("unchecked") ! private void printMeetingRest(SectioningServer server, CourseInfo course, Section section, PrintWriter out) throws IOException { out.println("UID:" + section.getId()); out.println("SEQUENCE:0"); *************** *** 843,847 **** } ! private void printFreeTime(Date dpFirstDate, BitSet weekCode, String days, int start, int len, ServletOutputStream out) throws IOException { SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd"); df.setTimeZone(TimeZone.getTimeZone("UTC")); --- 844,848 ---- } ! private void printFreeTime(Date dpFirstDate, BitSet weekCode, String days, int start, int len, PrintWriter out) throws IOException { SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd"); df.setTimeZone(TimeZone.getTimeZone("UTC")); |
|
From: Nightly B. <no...@un...> - 2010-12-16 23:51:10
|
Download the resultant file at http://www.unitime.org/uct_builds.php, see the attached build and change logs for more details. |
|
From: Tomas M. <to...@us...> - 2010-12-16 01:37:11
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19190/JavaSource/org/unitime/timetable/model Modified Files: TimePatternModel.java Log Message: undoing the last change - after running some tests, it did not help that much, and may disbalance the existing weightings - a better approach seems to be to set normalization decrease factor to 1.0 in a solver configuration (and alter the other time preference weights accordingly) Index: TimePatternModel.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/TimePatternModel.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TimePatternModel.java 15 Dec 2010 23:31:39 -0000 1.7 --- TimePatternModel.java 16 Dec 2010 01:37:03 -0000 1.8 *************** *** 344,355 **** for (int i = 0; i < iDays.length; i++) { double nrOfPreferencesThisDay = 0; - boolean prohibitedDay = true; for (int j = 0; j < iMinutes.length; j++) { String p = iPreferences[i][j]; if (PreferenceLevel.sRequired.equalsIgnoreCase(p)) continue; - if (!PreferenceLevel.sProhibited.equalsIgnoreCase(p)) prohibitedDay = false; if (PreferenceLevel.sProhibited.equalsIgnoreCase(p) || Integer.parseInt(p)!=0) nrOfPreferencesThisDay+=increment; } - if (prohibitedDay) continue; nrOfPreferences = Math.max(nrOfPreferences,nrOfPreferencesThisDay); } --- 344,352 ---- |
