[UniTime-cvs] UniTime/JavaSource/org/unitime/timetable/gwt/server EventServlet.java, 1.3, 1.4

[Tomas M. <to...@us...>]

Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/server
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13474/JavaSource/org/unitime/timetable/gwt/server

Modified Files:
	EventServlet.java 
Log Message:
Room Timetable: Only show rooms that can be used for event management.

Index: EventServlet.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/server/EventServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EventServlet.java	17 Dec 2010 18:20:13 -0000	1.3
--- EventServlet.java	18 Jan 2011 23:12:19 -0000	1.4
***************
*** 182,188 ****
  				switch (type) {
  				case ROOM:
! 					List<Room> rooms = hibSession.createQuery("select r from Room r where r.session.uniqueId = :sessionId and (" +
  							"r.buildingAbbv || ' ' || r.roomNumber = :name or r.buildingAbbv || r.roomNumber = :name)")
! 							.setString("name", name).setLong("sessionId", academicSession.getUniqueId()).list();
  					if (!rooms.isEmpty()) {
  						Room room = rooms.get(0);
--- 182,193 ----
  				switch (type) {
  				case ROOM:
! 					List<Room> rooms = hibSession.createQuery("select distinct r from Room r " +
! 							"inner join r.roomDepts rd inner join rd.department.timetableManagers m inner join m.managerRoles mr " +
! 							"where r.session.uniqueId = :sessionId and rd.control=true and mr.role.reference=:eventMgr and (" +
  							"r.buildingAbbv || ' ' || r.roomNumber = :name or r.buildingAbbv || r.roomNumber = :name)")
! 							.setString("name", name)
! 							.setLong("sessionId", academicSession.getUniqueId())
! 							.setString("eventMgr", Roles.EVENT_MGR_ROLE)
! 							.list();
  					if (!rooms.isEmpty()) {
  						Room room = rooms.get(0);
***************
*** 196,202 ****
  						return ret;
  					}
! 					List<NonUniversityLocation> locations = hibSession.createQuery("select l from NonUniversityLocation l where " +
! 							"l.session.uniqueId = :sessionId and l.name = :name")
! 							.setString("name", name).setLong("sessionId", academicSession.getUniqueId()).list();
  					if (!locations.isEmpty()) {
  						NonUniversityLocation location = locations.get(0);
--- 201,213 ----
  						return ret;
  					}
! 					List<NonUniversityLocation> locations = hibSession.createQuery("select distinct l from NonUniversityLocation l " +
! 							"inner join l.roomDepts rd inner join rd.department.timetableManagers m inner join m.managerRoles mr " +
! 							"where l.session.uniqueId = :sessionId and l.name = :name and " + 
! 							"rd.control=true and mr.role.reference=:eventMgr"
! 							)
! 							.setString("name", name)
! 							.setLong("sessionId", academicSession.getUniqueId())
! 							.setString("eventMgr", Roles.EVENT_MGR_ROLE)
! 							.list();
  					if (!locations.isEmpty()) {
  						NonUniversityLocation location = locations.get(0);
***************
*** 863,871 ****
  				switch (type) {
  				case ROOM:
! 					List<Room> rooms = hibSession.createQuery("select r from Room r, RoomTypeOption o where r.session.uniqueId = :sessionId and " +
  							"o.status = 1 and o.roomType = r.roomType and o.session = r.session and (" +
  							"lower(r.roomNumber) like :name or lower(r.buildingAbbv || ' ' || r.roomNumber) like :name or lower(r.buildingAbbv || r.roomNumber) like :name) " +
  							"order by r.buildingAbbv, r.roomNumber")
! 							.setString("name", query.toLowerCase() + "%").setLong("sessionId", academicSession.getUniqueId()).setMaxResults(limit).list();
  					for (Room room: rooms) {
  						ResourceInterface ret = new ResourceInterface();
--- 874,888 ----
  				switch (type) {
  				case ROOM:
! 					List<Room> rooms = hibSession.createQuery("select distinct r from Room r " +
! 							"inner join r.roomDepts rd inner join rd.department.timetableManagers m inner join m.managerRoles mr, " +
! 							"RoomTypeOption o where r.session.uniqueId = :sessionId and " +
! 							"rd.control=true and mr.role.reference=:eventMgr and " + 
  							"o.status = 1 and o.roomType = r.roomType and o.session = r.session and (" +
  							"lower(r.roomNumber) like :name or lower(r.buildingAbbv || ' ' || r.roomNumber) like :name or lower(r.buildingAbbv || r.roomNumber) like :name) " +
  							"order by r.buildingAbbv, r.roomNumber")
! 							.setString("name", query.toLowerCase() + "%")
! 							.setLong("sessionId", academicSession.getUniqueId())
! 							.setString("eventMgr", Roles.EVENT_MGR_ROLE)
! 							.setMaxResults(limit).list();
  					for (Room room: rooms) {
  						ResourceInterface ret = new ResourceInterface();
***************
*** 883,890 ****
  						resources.add(ret);
  					}
! 					List<NonUniversityLocation> locations = hibSession.createQuery("select l from NonUniversityLocation l, RoomTypeOption o where " +
  							"l.session.uniqueId = :sessionId and o.status = 1 and o.roomType = l.roomType and o.session = l.session and lower(l.name) like :name " +
  							"order by l.name")
! 							.setString("name", query.toLowerCase() + "%").setLong("sessionId", academicSession.getUniqueId()).setMaxResults(limit).list();
  					for (NonUniversityLocation location: locations) {
  						ResourceInterface ret = new ResourceInterface();
--- 900,913 ----
  						resources.add(ret);
  					}
! 					List<NonUniversityLocation> locations = hibSession.createQuery("select distinct l from NonUniversityLocation l " +
! 							"inner join l.roomDepts rd inner join rd.department.timetableManagers m inner join m.managerRoles mr, " +
! 							"RoomTypeOption o where " +
! 							"rd.control=true and mr.role.reference=:eventMgr and " + 
  							"l.session.uniqueId = :sessionId and o.status = 1 and o.roomType = l.roomType and o.session = l.session and lower(l.name) like :name " +
  							"order by l.name")
! 							.setString("name", query.toLowerCase() + "%")
! 							.setLong("sessionId", academicSession.getUniqueId())
! 							.setString("eventMgr", Roles.EVENT_MGR_ROLE)
! 							.setMaxResults(limit).list();
  					for (NonUniversityLocation location: locations) {
  						ResourceInterface ret = new ResourceInterface();