Author: solomax
Date: Wed Jan 21 08:43:23 2015
New Revision: 1653460
URL: http://svn.apache.org/r1653460
Log:
[OPENMEETINGS-1150] appointment room is opened as expected
Modified:
openmeetings/branches/3.0.x/WebContent/src/modules/conference/flexibleConferenceRoom/appointmentNotificationPopUp.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/conference/participants/participants.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
Modified:
openmeetings/branches/3.0.x/WebContent/src/modules/conference/flexibleConferenceRoom/appointmentNotificationPopUp.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/flexibleConferenceRoom/appointmentNotificationPopUp.lzx?rev=1653460&r1=1653459&r2=1653460&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/WebContent/src/modules/conference/flexibleConferenceRoom/appointmentNotificationPopUp.lzx
(original)
+++
openmeetings/branches/3.0.x/WebContent/src/modules/conference/flexibleConferenceRoom/appointmentNotificationPopUp.lzx
Wed Jan 21 08:43:23 2015
@@ -31,26 +31,24 @@
</handler>
<!-- Retrieving Appointmentdata for Meeting -->
- <netRemoteCallHib name="getAppointMentAndTimeZones"
remotecontext="$once{ canvas.thishib }"
- funcname="conferenceservice.getAppointMentAndTimeZones" >
+ <netRemoteCallHib name="getAppointMentAndTimeZones"
remotecontext="$once{ canvas.thishib }"
funcname="conferenceservice.getAppointMentDataForRoom" >
<netparam><method name="getValue">return
parent.parent.roomobj.rooms_id;</method></netparam>
<handler name="ondata" args="value">
- <![CDATA[
- if ($debug) Debug.write("getAppointMentAndTimeZones 1:
",parent.roomobj.rooms_id);
- if ($debug) Debug.write("getAppointMentAndTimeZones 2:
",value);
-
- if(value!=null){
-
-
parent._appstart.setAttribute('text',value.start);
- parent._append.setAttribute('text',value.end);
-
parent._timeZone.setAttribute('text',value.timeZone);
-
-
parent._appName.setAttribute('text',value.appointment.title);
-
parent._appDescr._appDescr.setAttribute('text',value.appointment.description);
-
-
parent._createdby.setAttribute('text',value.appointment.owner.firstname + ' ' +
value.appointment.owner.lastname );
- }
- ]]>
+ <![CDATA[
+ if ($debug) Debug.write("getAppointMentAndTimeZones 1:
",parent.roomobj.rooms_id);
+ if ($debug) Debug.write("getAppointMentAndTimeZones 2:
",value);
+
+ if (value != null) {
+ parent._appstart.setAttribute('text',
value.start);
+ parent._append.setAttribute('text', value.end);
+ parent._timeZone.setAttribute('text',
value.owner.timeZoneId);
+
+ parent._appName.setAttribute('text',
value.title);
+ parent._appDescr._appDescr.setAttribute('text',
value.description ? value.description : "");
+
+ parent._createdby.setAttribute('text',
value.owner.firstname + ' ' + value.owner.lastname );
+ }
+ ]]>
</handler>
</netRemoteCallHib>
Modified:
openmeetings/branches/3.0.x/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1653460&r1=1653459&r2=1653460&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
(original)
+++
openmeetings/branches/3.0.x/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
Wed Jan 21 08:43:23 2015
@@ -106,7 +106,7 @@
roomName:this.roomobj.name
});
if (roomobj.appointment) {
- canvas.appointmentNotificationPopUp = new
lz.appointmentNotificationPopUp(canvas.conferenceView,{name:'appDetail',
roomobj:this.roomobj });
+ canvas.appointmentNotificationPopUp = new
lz.appointmentNotificationPopUp(this,{name:'appDetail', roomobj:this.roomobj });
} else {
if ($debug) Debug.write("no appointed meeting");
}
Modified:
openmeetings/branches/3.0.x/WebContent/src/modules/conference/participants/participants.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/participants/participants.lzx?rev=1653460&r1=1653459&r2=1653460&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/WebContent/src/modules/conference/participants/participants.lzx
(original)
+++
openmeetings/branches/3.0.x/WebContent/src/modules/conference/participants/participants.lzx
Wed Jan 21 08:43:23 2015
@@ -40,9 +40,11 @@
if( $debug ) Debug.write("videoContainer: canvas.thishib:
",canvas.thishib.src,canvas.thishib);
if (canvas.thishib.src != src) {
+ if( $debug ) Debug.write("SRC is WRONG ");
canvas.thishib.setAttribute('src',src);
if (canvas.wicketsid == null){
+ if( $debug ) Debug.write("Going to reconnect ");
canvas.thishib.reconnectionAction = true;
canvas.thishib.reconnectObjRef = this;
canvas.thishib.disconnect();
Modified:
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/invitation/autoloaderBarOnly.lzx?rev=1653460&r1=1653459&r2=1653460&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
(original)
+++
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
Wed Jan 21 08:43:23 2015
@@ -67,43 +67,13 @@
this.doCall();
} else {
parent.setProgress();
- parent.getTimeZones.doCall();
+ canvas.thishib.getTimeZones.doCall();
parent.getUserSalutations.doCall();
}
]]>
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="getTimeZones" funcname="xmlcrm.getTimeZones">
- <attribute name="start" value="0" type="number" />
- <attribute name="step" value="100" type="number" />
- <netparam><method name="getValue">return
parent.start;</method></netparam>
- <netparam><method name="getValue">return
parent.step;</method></netparam>
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the
rtmpconnection
- if ($debug) Debug.write("getTimeZones count: ",
value.length);
- if (canvas.thishib.loaderVar != null) {
- canvas.thishib.loaderVar.setProgress();
- }
- if (start == 0) {
- canvas.timeZones = new Array();
- }
- for (var i = 0; i < value.length; ++i) {
- canvas.timeZones.push(value[i]);
- }
- if (value.length < step) {
- //if($debug) Debug.write("canvas.timeZones ==
", canvas.timeZones);
- canvas.inviteMainWindow = new
lz.inviteMainWindow(canvas);
- if($debug) Debug.write("create
invitationWindow: ",canvas.inviteMainWindow);
- } else {
- start += step;
- doCall();
- }
- ]]>
- </handler>
- </netRemoteCallHib>
-
<netRemoteCallHib name="getUserSalutations"
funcname="userservice.getUserSalutations"
remotecontext="$once{ canvas.thishib }" >
<netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java?rev=1653460&r1=1653459&r2=1653460&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
Wed Jan 21 08:43:23 2015
@@ -157,8 +157,7 @@ public class ConfigurationDao implements
query += " DESC";
}
- TypedQuery<Configuration> q = em.createQuery(query,
- Configuration.class);
+ TypedQuery<Configuration> q = em.createQuery(query,
Configuration.class);
q.setFirstResult(start);
q.setMaxResults(max);
return q.getResultList();
@@ -305,7 +304,7 @@ public class ConfigurationDao implements
* @param configurationDao
* @return
*/
- public final long getMaxUploadSize() {
+ public long getMaxUploadSize() {
try {
return getConfValue(CONFIG_MAX_UPLOAD_SIZE_KEY,
Long.class, "" + DEFAULT_MAX_UPLOAD_SIZE);
} catch (Exception e) {
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/calendar/Appointment.java?rev=1653460&r1=1653459&r2=1653460&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
Wed Jan 21 08:43:23 2015
@@ -95,7 +95,7 @@ import org.simpleframework.xml.Root;
)
, @NamedQuery(name="appointedRoomsInRangeByUser",
query="SELECT a.room FROM MeetingMember mm, IN(mm.appointment)
a "
- + "WHERE mm.deleted <> true AND mm.user.user_id <>
a.owner.user_id AND mm.user.user_id = :userId "
+ + "WHERE mm.deleted = false AND mm.user.user_id <>
a.owner.user_id AND mm.user.user_id = :userId "
+ " AND ( "
+ " (a.start BETWEEN :starttime AND
:endtime) "
+ " OR (a.end BETWEEN :starttime AND
:endtime) "
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Room.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1653460&r1=1653459&r2=1653460&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Room.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Room.java
Wed Jan 21 08:43:23 2015
@@ -59,13 +59,13 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "getRoomByOwnerAndTypeId", query = "select c from
Room as c "
+ "where c.ownerId = :ownerId "
+ "AND c.roomtype.roomtypes_id =
:roomtypesId "
- + "AND c.deleted <> :deleted"),
+ + "AND c.deleted = false"),
@NamedQuery(name = "selectMaxFromRooms", query = "select
count(c.rooms_id) from Room c "
- + "where c.deleted <> true AND c.name LIKE :search "),
+ + "where c.deleted = false AND c.name LIKE :search "),
@NamedQuery(name = "getRoomByExternalId", query = "select c from Room
as c JOIN c.roomtype as rt "
+ "where c.externalRoomId = :externalRoomId AND
c.externalRoomType = :externalRoomType "
- + "AND rt.roomtypes_id = :roomtypes_id AND c.deleted <>
:deleted"),
+ + "AND rt.roomtypes_id = :roomtypes_id AND c.deleted =
false"),
@NamedQuery(name = "getPublicRoomsOrdered", query = "SELECT r from Room
r WHERE r.ispublic= true AND r.deleted= false AND r.appointment = false ORDER
BY r.name ASC"),
@NamedQuery(name = "getRoomById", query = "SELECT r FROM Room r WHERE
r.deleted = false AND r.rooms_id = :id"),
@NamedQuery(name = "getSipRoomIdsByIds", query = "SELECT r.rooms_id
FROM Room r WHERE r.deleted = false AND r.sipEnabled = true AND r.rooms_id IN
:ids"),
@@ -79,7 +79,7 @@ import org.simpleframework.xml.Root;
@Table(name = "room")
@Root(name = "room")
public class Room implements Serializable, IDataProviderEntity {
- private static final long serialVersionUID = -2860312283159251568L;
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
@@ -144,7 +144,7 @@ public class Room implements Serializabl
// moderator to come into the room
@Column(name = "ismoderatedroom")
@Element(data = true, required = false)
- private Boolean isModeratedRoom;
+ private boolean isModeratedRoom;
@Column(name = "allow_user_questions")
@Element(data = true, required = false)
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java?rev=1653460&r1=1653459&r2=1653460&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java
(original)
+++
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java
Wed Jan 21 08:43:23 2015
@@ -97,7 +97,6 @@ public class RoomManager implements IRoo
query.setParameter("externalRoomId", externalRoomId);
query.setParameter("externalRoomType",
externalRoomType);
query.setParameter("roomtypes_id", roomtypes_id);
- query.setParameter("deleted", true);
List<?> ll = query.getResultList();
if (ll.size() > 0) {
return (Room) ll.get(0);
@@ -1040,7 +1039,6 @@ public class RoomManager implements IRoo
TypedQuery<Room> query =
em.createNamedQuery("getRoomByOwnerAndTypeId", Room.class);
query.setParameter("ownerId", ownerId);
query.setParameter("roomtypesId", roomtypesId);
- query.setParameter("deleted", true);
List<Room> ll = query.getResultList();
if (ll.size() > 0) {
room = ll.get(0);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java?rev=1653460&r1=1653459&r2=1653460&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
Wed Jan 21 08:43:23 2015
@@ -262,7 +262,7 @@ public class ConfigurationDao implements
* @param configurationDao
* @return
*/
- public final long getMaxUploadSize() {
+ public long getMaxUploadSize() {
try {
return getConfValue(CONFIG_MAX_UPLOAD_SIZE_KEY,
Long.class, "" + DEFAULT_MAX_UPLOAD_SIZE);
} catch (Exception e) {
