[UniTime-cvs] UniTime/JavaSource/org/unitime/timetable/action/ajax ExamEditAjax.java, 1.3, 1.4 DistributionPrefsAjax.java, 1.7, 1.8 SectioningDemoAjax.java, 1.2, 1.3 PeopleLookupAjax.java, 1.3, 1.4

[Stephanie S. <say...@us...>]

Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/action/ajax
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13704/JavaSource/org/unitime/timetable/action/ajax

Modified Files:
	ExamEditAjax.java DistributionPrefsAjax.java 
	SectioningDemoAjax.java PeopleLookupAjax.java 
Log Message:
The user interfaces have been updated to allow a course number to be used multiple times within a single subject area if the tmtbl.courseNumber.unique parameter is set to false.

If you set tmtbl.courseNumber.unique to false you must removed the unique key UK_COURSE_OFFERING_SUBJ_CRS and its corresponding index in the 'course_offering' table.

tmtbl.courseNumber.unique defaults to true.


Index: PeopleLookupAjax.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/action/ajax/PeopleLookupAjax.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PeopleLookupAjax.java	5 Aug 2008 20:03:44 -0000	1.3
--- PeopleLookupAjax.java	23 Jan 2009 03:10:00 -0000	1.4
***************
*** 109,113 ****
      }
      
!     protected TreeSet<Person> findPeople(String query, String session) throws Exception {
          TreeSet<Person> people = new TreeSet();
          people.addAll(findPeopleFromStaff(query));
--- 109,113 ----
      }
      
!     public TreeSet<Person> findPeople(String query, String session) throws Exception {
          TreeSet<Person> people = new TreeSet();
          people.addAll(findPeopleFromStaff(query));

Index: SectioningDemoAjax.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/action/ajax/SectioningDemoAjax.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SectioningDemoAjax.java	17 Jun 2008 21:24:50 -0000	1.2
--- SectioningDemoAjax.java	23 Jan 2009 03:10:00 -0000	1.3
***************
*** 85,89 ****
              getSession().
              createQuery("select co from InstructionalOffering as io , CourseOffering co "+
!                     "where co.uniqueCourseNbr.subjectArea.uniqueId = :subjectAreaId "+
                      "and io.uniqueId = co.instructionalOffering.uniqueId "+
                      "and co.instructionalOffering.notOffered = false "+
--- 85,89 ----
              getSession().
              createQuery("select co from InstructionalOffering as io , CourseOffering co "+
!                     "where co.subjectArea.uniqueId = :subjectAreaId "+
                      "and io.uniqueId = co.instructionalOffering.uniqueId "+
                      "and co.instructionalOffering.notOffered = false "+
***************
*** 95,99 ****
          for (Iterator i=courseNumbers.iterator();i.hasNext();) {
              CourseOffering co = (CourseOffering)i.next();
!             print(out, co.getUniqueId().toString(), co.getCourseNbr());
          }
      }
--- 95,99 ----
          for (Iterator i=courseNumbers.iterator();i.hasNext();) {
              CourseOffering co = (CourseOffering)i.next();
!             print(out, co.getUniqueId().toString(), (co.getCourseNbr() + " - " + co.getTitle().replaceAll(">", "&gt;").replaceAll("<", "&lt;").replaceAll("'", "&quot;").replaceAll("&", "&amp;")));
          }
      }

Index: DistributionPrefsAjax.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/action/ajax/DistributionPrefsAjax.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DistributionPrefsAjax.java	17 Jun 2008 21:24:50 -0000	1.7
--- DistributionPrefsAjax.java	23 Jan 2009 03:10:00 -0000	1.8
***************
*** 125,130 ****
          List courseNumbers = new CourseOfferingDAO().
              getSession().
!             createQuery("select co.uniqueId, co.courseNbr from CourseOffering co "+
!                     "where co.uniqueCourseNbr.subjectArea.uniqueId = :subjectAreaId "+
                      "and co.instructionalOffering.notOffered = false and co.isControl = true " +
                      "order by co.courseNbr ").
--- 125,130 ----
          List courseNumbers = new CourseOfferingDAO().
              getSession().
!             createQuery("select co.uniqueId, co.courseNbr, co.title from CourseOffering co "+
!                     "where co.subjectArea.uniqueId = :subjectAreaId "+
                      "and co.instructionalOffering.notOffered = false and co.isControl = true " +
                      "order by co.courseNbr ").
***************
*** 135,139 ****
          for (Iterator i=courseNumbers.iterator();i.hasNext();) {
              Object[] o = (Object[])i.next();
!             print(out, o[0].toString(), o[1].toString());
          }
      }
--- 135,139 ----
          for (Iterator i=courseNumbers.iterator();i.hasNext();) {
              Object[] o = (Object[])i.next();
!             print(out, o[0].toString(), (o[1].toString() + " - " + o[2].toString().replaceAll(">", "&gt;").replaceAll("<", "&lt;").replaceAll("'", "&quot;").replaceAll("&", "&amp;")));
          }
      }

Index: ExamEditAjax.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/action/ajax/ExamEditAjax.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ExamEditAjax.java	17 Jun 2008 21:24:50 -0000	1.3
--- ExamEditAjax.java	23 Jan 2009 03:10:00 -0000	1.4
***************
*** 92,97 ****
          List courseNumbers = new CourseOfferingDAO().
              getSession().
!             createQuery("select co.uniqueId, co.courseNbr from CourseOffering co "+
!                     "where co.uniqueCourseNbr.subjectArea.uniqueId = :subjectAreaId "+
                      "and co.instructionalOffering.notOffered = false " +
                      "order by co.courseNbr ").
--- 92,97 ----
          List courseNumbers = new CourseOfferingDAO().
              getSession().
!             createQuery("select co.uniqueId, co.courseNbr, co.title from CourseOffering co "+
!                     "where co.subjectArea.uniqueId = :subjectAreaId "+
                      "and co.instructionalOffering.notOffered = false " +
                      "order by co.courseNbr ").
***************
*** 104,108 ****
          for (Iterator i=courseNumbers.iterator();i.hasNext();) {
              Object[] o = (Object[])i.next();
!             print(out, o[0].toString(), o[1].toString());
          }
      }
--- 104,108 ----
          for (Iterator i=courseNumbers.iterator();i.hasNext();) {
              Object[] o = (Object[])i.next();
!             print(out, o[0].toString(), (o[1].toString() + " - " + o[2].toString().replaceAll(">", "&gt;").replaceAll("<", "&lt;").replaceAll("'", "&quot;").replaceAll("&", "&amp;")));
          }
      }