You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@openmeetings.apache.org by Maxim Solodovnik <so...@gmail.com> on 2013/07/21 06:51:05 UTC
Re: svn commit: r1505252 - in /openmeetings/trunk/singlewebapp:
WebContent/openmeetings/css/ src/org/apache/openmeetings/data/calendar/daos/
src/org/apache/openmeetings/web/pages/ src/org/apache/openmeetings/web/user/calendar/
+ private User userBeingSearched = null; //What is the meaning of
this variable? sebawagner (21-07-2013)
This variable is necessary to provide Model object for the
UserAutocompleteComponent being used :)
On Sun, Jul 21, 2013 at 9:08 AM, <se...@apache.org> wrote:
> Author: sebawagner
> Date: Sun Jul 21 02:08:17 2013
> New Revision: 1505252
>
> URL: http://svn.apache.org/r1505252
> Log:
> Fix OPENMEETINGS-707 - Some more needs to be done, but that should be
> covered in a new Jira
>
> Added:
>
> openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/calendar.css
> Modified:
>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
>
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/MeetingMemberDialog.java
>
> Added:
> openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/calendar.css
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/calendar.css?rev=1505252&view=auto
>
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/calendar.css
> (added)
> +++
> openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/calendar.css
> Sun Jul 21 02:08:17 2013
> @@ -0,0 +1,81 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under one
> + * or more contributor license agreements. See the NOTICE file
> + * distributed with this work for additional information
> + * regarding copyright ownership. The ASF licenses this file
> + * to you under the Apache License, Version 2.0 (the
> + * "License") + you may not use this file except in compliance
> + * with the License. You may obtain a copy of the License at
> + *
> + * http://www.apache.org/licenses/LICENSE-2.0
> + *
> + * Unless required by applicable law or agreed to in writing,
> + * software distributed under the License is distributed on an
> + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> + * KIND, either express or implied. See the License for the
> + * specific language governing permissions and limitations
> + * under the License.
> + */
> +#appointmentPopUp td {
> + vertical-align: top;
> +}
> +
> +#appointmentPopUp input[name="appointmentName"] {
> + width: 420px;
> +}
> +
> +#appointmentPopUp input[name="password"] {
> + width: 420px;
> +}
> +
> +#appointmentPopUp input[name="appointmentLocation"] {
> + width: 420px;
> +}
> +
> +#appointmentPopUp textarea[name="appointmentDescription"] {
> + width: 424px;
> + height: 80px;
> +}
> +
> +#appointmentPopUp select[name="remind"] {
> + width: 426px;
> +}
> +
> +#appointmentPopUp select[name="room.roomtype"] {
> + width: 426px;
> +}
> +
> +#appointmentPopUp select[name="room"] {
> + width: 426px;
> +}
> +
> +#appointmentPopUp .formNewButton {
> + float: left;
> +}
> +
> +#appointmentPopUp .attendeeContainer {
> + background-color: #FFFFFF;
> + border: solid 1px #aacfe4;
> + width: 424px;
> + height: 100px;
> + overflow-x: scroll;
> + float: left;
> +}
> +
> +#appointmentPopUp .attendeeContainer table td:FIRST-CHILD div {
> + width: 130px;
> + overflow: hidden;
> + text-overflow: ellipsis;
> + white-space: nowrap;
> +}
> +
> +#appointmentPopUp .attendeeContainer table td:nth-child(2) div {
> + width: 260px;
> + overflow: hidden;
> + text-overflow: ellipsis;
> + white-space: nowrap;
> +}
> +
> +#appointmentPopUp .attendeeContainer table td:nth-child(3) div {
> + width: 20px;
> +}
> \ No newline at end of file
>
> Modified:
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java?rev=1505252&r1=1505251&r2=1505252&view=diff
>
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
> Sun Jul 21 02:08:17 2013
> @@ -70,7 +70,7 @@ public class AppointmentDao {
> @Autowired
> private AppointmentCategoryDao appointmentCategoryDaoImpl;
> @Autowired
> - private AppointmentReminderTypDao appointmentReminderTypDaoImpl;
> + private AppointmentReminderTypDao appointmentReminderTypDao;
> @Autowired
> private MeetingMemberDao meetingMemberDao;
> @Autowired
> @@ -218,7 +218,7 @@ public class AppointmentDao {
> ap.setAppointmentStarttime(appointmentstart);
> ap.setAppointmentEndtime(appointmentend);
>
> ap.setAppointmentDescription(appointmentDescription);
> - ap.setRemind(appointmentReminderTypDaoImpl
> + ap.setRemind(appointmentReminderTypDao
>
> .getAppointmentReminderTypById(remind));
> ap.setStarttime(new Date());
> ap.setIsReminderEmailSend(false);
> @@ -452,7 +452,7 @@ public class AppointmentDao {
>
> Appointment ap =
> this.getAppointmentById(appointmentId);
>
> - AppointmentReminderTyps appointmentReminderTyps =
> appointmentReminderTypDaoImpl
> + AppointmentReminderTyps appointmentReminderTyps =
> appointmentReminderTypDao
>
> .getAppointmentReminderTypById(remind);
> AppointmentCategory appointmentCategory =
> appointmentCategoryDaoImpl
>
> .getAppointmentCategoryById(categoryId);
>
> Modified:
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html?rev=1505252&r1=1505251&r2=1505252&view=diff
>
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
> (original)
> +++
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
> Sun Jul 21 02:08:17 2013
> @@ -26,6 +26,7 @@
> <link media="screen" type="text/css" rel="stylesheet"
> href="css/jquery-ui-1.10.3.custom.min.css"/>
> <link rel="stylesheet" type="text/css"
> href="css/openmeetings-forms.css"/>
> <link media="screen" type="text/css" rel="stylesheet"
> href="css/theme.css"/>
> + <link media="screen" type="text/css" rel="stylesheet"
> href="css/calendar.css"/>
> </head>
> <body>
> <div wicket:id="header"></div>
>
> Modified:
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html?rev=1505252&r1=1505251&r2=1505252&view=diff
>
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
> (original)
> +++
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
> Sun Jul 21 02:08:17 2013
> @@ -61,23 +61,21 @@
> <td colspan="2" style="font-size:
> smaller;"><wicket:ommessage key="1445" /></td>
> </tr>
> <tr>
> - <td>
> - <div wicket:id="addMeetingMember"
> class="formNewButton" wicket:ommessage="title:812"><input/></div>
> - </td>
> - </tr>
> - <tr>
> <td><wicket:ommessage key="803"
> /></td>
> <td >
> - <div
> style="background-color: #FFFFFF; border: solid 1px #aacfe4; width: 350px;
> height: 150px; overflow-x: scroll">
> - <table>
> - <tbody
> wicket:id="attendeeContainer">
> - <tr
> wicket:id="meetingMember">
> -
> <td style="width: 100px;" ><div style="width: 150px;"><span
> wicket:id="attendeeName"></span></div></td>
> -
> <td style="width: 100px;"><div style="width: 150px;"><span
> wicket:id="attendeeEmail"></span></div></td>
> -
> <td style="width: 20px;"><div class="formCancelButton"
> wicket:id="attendeeDelete" wicket:ommessage="title:814"><input/></div></td>
> -
> </tr>
> - </tbody>
> - </table>
> + <div
> class="attendeesComponentWrapper">
> + <div
> class="attendeeContainer">
> + <table>
> +
> <tbody wicket:id="attendeeContainer">
> +
> <tr wicket:id="meetingMember">
> +
> <td><div><span wicket:id="attendeeName"></span></div></td>
> +
> <td><div><span wicket:id="attendeeEmail"></span></div></td>
> +
> <td><div class="formCancelButton" wicket:id="attendeeDelete"
> wicket:ommessage="title:814"><input/></div></td>
> +
> </tr>
> +
> </tbody>
> + </table>
> + </div>
> + <div
> wicket:id="addMeetingMember" class="formNewButton"
> wicket:ommessage="title:812"><input/></div>
> </div>
> </td>
> </tr>
>
> Modified:
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1505252&r1=1505251&r2=1505252&view=diff
>
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
> Sun Jul 21 02:08:17 2013
> @@ -75,7 +75,7 @@ public class AppointmentDialog extends A
>
> @Override
> public int getWidth() {
> - return 550;
> + return 650;
> }
>
> @Override
> @@ -175,6 +175,8 @@ public class AppointmentDialog extends A
> public AppointmentForm(String id, IModel<Appointment>
> model) {
> super(id, model);
> setOutputMarkupId(true);
> + //this will only work if there is only a single
> instance of this element on the screen! (sebawagner, 21-07-2013)
> + setMarkupId("appointmentPopUp");
>
> add(feedback.setOutputMarkupId(true));
> add(new
> RequiredTextField<String>("appointmentName").setLabel(Model.of(WebSession.getString(572))));
>
> Modified:
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1505252&r1=1505251&r2=1505252&view=diff
>
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
> Sun Jul 21 02:08:17 2013
> @@ -21,6 +21,7 @@ package org.apache.openmeetings.web.user
> import java.util.Date;
>
> import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
> +import
> org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDao;
> import org.apache.openmeetings.persistence.beans.calendar.Appointment;
> import org.apache.openmeetings.web.app.Application;
> import org.apache.openmeetings.web.app.WebSession;
> @@ -38,7 +39,9 @@ import com.googlecode.wicket.jquery.ui.c
> import com.googlecode.wicket.jquery.ui.calendar.CalendarView;
>
> public class CalendarPanel extends UserPanel {
> +
> private static final long serialVersionUID = -6536379497642291437L;
> +
> private Calendar calendar;
>
> @Override
> @@ -49,6 +52,10 @@ public class CalendarPanel extends UserP
> return Application.getBean(AppointmentDao.class);
> }
>
> + private AppointmentReminderTypDao getAppointmentReminderTypDao() {
> + return
> Application.getBean(AppointmentReminderTypDao.class);
> + }
> +
> public void refresh(AjaxRequestTarget target) {
> calendar.refresh(target);
> }
> @@ -60,7 +67,7 @@ public class CalendarPanel extends UserP
> add(form);
>
> final AppointmentDialog dialog = new
> AppointmentDialog("appointment", WebSession.getString(815)
> - , this, new
> CompoundPropertyModel<Appointment>(new Appointment()));
> + , this, new
> CompoundPropertyModel<Appointment>(getDefault()));
> add(dialog);
>
> Options options = new Options();
> @@ -135,8 +142,7 @@ public class CalendarPanel extends UserP
>
> @Override
> public void onSelect(AjaxRequestTarget target,
> CalendarView view, Date start, Date end, boolean allDay) {
> - Appointment a = new Appointment();
> -
> a.setAppointmentName(WebSession.getString(1444));
> + Appointment a = getDefault();
> if (CalendarView.month == view &&
> start.equals(end)) {
> java.util.Calendar now =
> WebSession.getCalendar();
> java.util.Calendar cal =
> WebSession.getCalendar();
> @@ -206,4 +212,12 @@ public class CalendarPanel extends UserP
> }
> });
> }
> +
> + private Appointment getDefault() {
> + Appointment a = new Appointment();
> + a.setRemind(getAppointmentReminderTypDao()
> + .getAppointmentReminderTypById(3L));
> //TODO: Make configurable
> + a.setAppointmentName(WebSession.getString(1444));
> + return a;
> + }
> }
>
> Modified:
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/MeetingMemberDialog.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/MeetingMemberDialog.java?rev=1505252&r1=1505251&r2=1505252&view=diff
>
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/MeetingMemberDialog.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/MeetingMemberDialog.java
> Sun Jul 21 02:08:17 2013
> @@ -58,7 +58,7 @@ public class MeetingMemberDialog extends
> DialogButton send = new DialogButton(WebSession.getString(175));
> private DialogButton cancel = new
> DialogButton(WebSession.getString(219));
> private AppointmentDialog appDialog;
> - private User userBeingSearched = null;
> + private User userBeingSearched = null; //What is the meaning of
> this variable? sebawagner (21-07-2013)
>
> @Override
> public int getWidth() {
>
>
>
--
WBR
Maxim aka solomax