Author: sebawagner
Date: Sat Apr 21 06:57:38 2012
New Revision: 1328593
URL: http://svn.apache.org/viewvc?rev=1328593&view=rev
Log:
OPENMEETINGS-198 Password and dashboard calendar event list
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx?rev=1328593&r1=1328592&r2=1328593&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx
Sat Apr 21 06:57:38 2012
@@ -81,9 +81,7 @@
}
}
this.bdatum.setAttribute("visibility", "hidden");
- this.bzeit.setAttribute("visibility", "hidden");
this.edatum.setAttribute("visibility", "hidden");
- this.ezeit.setAttribute("visibility", "hidden");
this.l_bdatum.setAttribute("visibility", "hidden");
this.l_edatum.setAttribute("visibility", "hidden");
if (roomid > 0) {
@@ -103,16 +101,12 @@
if(value!=null){
if ($debug) Debug.write("Appointment Name : " +
value.appointmentName);
-
parent.bdatum.setAttribute('text',parseDateToString(value.appointmentStarttime));
-
parent.bzeit.setAttribute('text',parseDateToStringTimeOnly(value.appointmentStarttime));
-
parent.edatum.setAttribute('text',parseDateToString(value.appointmentEndtime));
-
parent.ezeit.setAttribute('text',parseDateToStringTimeOnly(value.appointmentEndtime));
+
parent.bdatum.setAttribute('text',""+value.appointmentStarttime);
+
parent.edatum.setAttribute('text',""+value.appointmentEndtime);
parent.bdatum.setAttribute("visibility","visible");
-
parent.bzeit.setAttribute("visibility","visible");
parent.edatum.setAttribute("visibility","visible");
-
parent.ezeit.setAttribute("visibility","visible");
parent.l_bdatum.setAttribute("visibility","visible");
parent.l_edatum.setAttribute("visibility","visible");
@@ -122,12 +116,10 @@
} else{
parent.bdatum.setAttribute('text','');
- parent.bzeit.setAttribute('text','');
+ parent.edatum.setAttribute('text','');
parent.bdatum.setAttribute("visibility",
"hidden");
- parent.bzeit.setAttribute("visibility",
"hidden");
parent.edatum.setAttribute("visibility",
"hidden");
- parent.ezeit.setAttribute("visibility",
"hidden");
parent.l_bdatum.setAttribute("visibility",
"hidden");
parent.l_edatum.setAttribute("visibility",
"hidden");
@@ -153,12 +145,10 @@
<labelText name="_roomname" labelid="406" y="20" width="200" />
<labelText name="l_bdatum" labelid="570" y="40" width="50"
visible="false" />
- <customEdittext name="bdatum" y="40" x="75" width="100" text=""
visible="false" />
- <customEdittext name="bzeit" x="200" y="40" width="50"
regexpType="time" visible="false" />
+ <labelText name="bdatum" y="40" x="75" width="100" text=""
visible="false" />
<labelText name="l_edatum" labelid="571" y="60" width="50"
visible="false" />
- <customEdittext name="edatum" y="60" x="75" width="100" text=""
visible="false" />
- <customEdittext name="ezeit" x="200" y="60" width="50"
regexpType="time" visible="false" />
+ <labelText name="edatum" y="60" x="75" width="100" text=""
visible="false" />
<labelText name="_roomcomment" x="75" y="${parent.l_edatum.y +
(parent.l_edatum.visible ? 30 : 0)}" width="100" text=""/>
<labelText labelid="270" y="${parent._roomcomment.y}" width="50" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx?rev=1328593&r1=1328592&r2=1328593&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
Sat Apr 21 06:57:38 2012
@@ -255,7 +255,7 @@
obj : value[eg],
ispublic : true,
roomid :
value[eg].rooms_id,
- starttime : time,
+ starttime :
value[eg].starttime,
roomname : value[eg].name
});
}
@@ -284,8 +284,8 @@
roomListDetails class are declared in
modules/conference/conference/roomListDetails.lzx.
Mar 24 2008 commented by [email protected]
-->
- <roomListDetails x="510" y="4" name="_roomlistdetails"
visibility="hidden"
- height="${ parent.height-4 }"
/>
+ <roomListDetails x="510" y="50" name="_roomlistdetails"
+ height="${ parent.height-54 }"
/>
</view>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx?rev=1328593&r1=1328592&r2=1328593&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx
Sat Apr 21 06:57:38 2012
@@ -181,6 +181,7 @@
<!-- label: enter -->
<simpleLabelButton name="connect" y="80" x="120" text="start"
- visibility="hidden"
labelid="228" width="170" height="20"
onclick="parent.getRoomClients.doCall();;" />
+ visibility="hidden"
labelid="228" width="170" height="20"
+
onclick="parent.isRoomFull.doCall();" />
</class>
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java?rev=1328593&r1=1328592&r2=1328593&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java
Sat Apr 21 06:57:38 2012
@@ -861,13 +861,15 @@ public class AppointmentDaoImpl {
+ "AND app.deleted <> :app_deleted " + "AND "
+ "app.appointmentStarttime between :starttime
" + "AND "
+ " :endtime";
+
+ TimeZone timeZone =
timezoneUtil.getTimezoneByUser(usersDao.getUser(userId));
- Calendar startCal = Calendar.getInstance();
+ Calendar startCal = Calendar.getInstance(timeZone);
startCal.set(Calendar.MINUTE, 0);
startCal.set(Calendar.HOUR, 0);
startCal.set(Calendar.SECOND, 1);
- Calendar endCal = Calendar.getInstance();
+ Calendar endCal = Calendar.getInstance(timeZone);
endCal.set(Calendar.MINUTE, 23);
endCal.set(Calendar.HOUR, 59);
endCal.set(Calendar.SECOND, 59);
