You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by vd...@apache.org on 2013/07/19 13:06:47 UTC

svn commit: r1504828 - in /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings: data/calendar/daos/ web/user/calendar/ web/util/

Author: vdegtyarev
Date: Fri Jul 19 11:06:46 2013
New Revision: 1504828

URL: http://svn.apache.org/r1504828
Log:
OPENMEETINGS-703 is fixed

Added:
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/MeetingMemberDialog.html
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/MeetingMemberDialog.java
Modified:
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
    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/util/UserAutoCompleteTextField.java

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=1504828&r1=1504827&r2=1504828&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 Fri Jul 19 11:06:46 2013
@@ -132,6 +132,7 @@ public class AppointmentDao {
 				appoint = query.getSingleResult();
 			} catch (NoResultException ex) {
 			}
+			appoint.setMeetingMember(meetingMemberDao.getMeetingMemberByAppointmentId(appointmentId));
 			return appoint;
 		} catch (Exception ex2) {
 			log.error("[getAppointmentById]: ", ex2);
@@ -266,7 +267,17 @@ public class AppointmentDao {
 			r.setNumberOfPartizipants(cfgDao.getConfValue("calendar.conference.rooms.default.size", Long.class, "50"));
 		}
 		roomDao.update(r, userId);
-		//FIXME meeting members
+		for (MeetingMember mm : a.getMeetingMember()){
+			if (mm.getMeetingMemberId() == null){
+				if (mm.getUserid().getUser_id() == null){
+					User u = mm.getUserid();
+					em.persist(u);
+				}
+				em.persist(mm);
+			} else {
+				em.merge(mm);
+			}
+		}
 		if (a.getAppointmentId() == null) {
 			a.setStarttime(new Date());
 			em.persist(a);

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=1504828&r1=1504827&r2=1504828&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 Fri Jul 19 11:06:46 2013
@@ -60,11 +60,27 @@
 				<tr>
 					<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><select wicket:id="meetingMember" ></select></td>
-				</tr -->
+					<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>
+					</td>
+				</tr>
 				<tr>
 					<td><wicket:ommessage key="569" /></td>
 					<td><input type="text" wicket:id="appointmentLocation" /></td>
@@ -75,5 +91,6 @@
 				</tr>
 			</table>
 		</form>
+		<div wicket:id="addAttendees"></div>
 	</wicket:panel>
 </html>

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=1504828&r1=1504827&r2=1504828&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 Fri Jul 19 11:06:46 2013
@@ -34,14 +34,18 @@ import org.apache.openmeetings.data.conf
 import org.apache.openmeetings.data.user.dao.UsersDao;
 import org.apache.openmeetings.persistence.beans.calendar.Appointment;
 import org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
+import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
 import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
 import org.apache.openmeetings.persistence.beans.room.Room;
 import org.apache.openmeetings.persistence.beans.room.RoomType;
 import org.apache.openmeetings.web.app.WebSession;
 import org.apache.openmeetings.web.util.RoomTypeDropDown;
+import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
 import org.apache.wicket.extensions.yui.calendar.DateTimeField;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.Form;
@@ -49,6 +53,8 @@ import org.apache.wicket.markup.html.for
 import org.apache.wicket.markup.html.form.RequiredTextField;
 import org.apache.wicket.markup.html.form.TextArea;
 import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.markup.html.panel.FeedbackPanel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
@@ -66,6 +72,7 @@ public class AppointmentDialog extends A
 	private DialogButton delete = new DialogButton(WebSession.getString(814));
 	private final CalendarPanel calendar;
 	protected final FeedbackPanel feedback;
+	final MeetingMemberDialog addAttendees;
 	
 	@Override
 	public int getWidth() {
@@ -85,6 +92,8 @@ public class AppointmentDialog extends A
 		feedback = new FeedbackPanel("feedback");
 		form = new AppointmentForm("appForm", model);
 		add(form);
+		addAttendees = new MeetingMemberDialog("addAttendees", WebSession.getString(812), getModel(), this);
+		add(addAttendees);
 	}
 
 	@Override
@@ -217,6 +226,41 @@ public class AppointmentDialog extends A
 					target.add(pwd);
 				}
 			});
+			
+			final WebMarkupContainer addMeetingMember = new WebMarkupContainer("addMeetingMember");
+			addMeetingMember.add(new AjaxEventBehavior("onclick") {
+				private static final long serialVersionUID = 7016550192188649714L;
+
+				protected void onEvent(AjaxRequestTarget target) {
+					addAttendees.open(target);
+	        	}
+	        });
+			add(addMeetingMember);
+			
+			final WebMarkupContainer attendeeContainer = new WebMarkupContainer("attendeeContainer");
+			attendeeContainer.add(new ListView<MeetingMember>("meetingMember"){
+
+				private static final long serialVersionUID = -2609044181991754097L;
+
+				@Override
+				protected void populateItem(final ListItem<MeetingMember> item) {
+					MeetingMember mm = item.getModelObject();
+					item.add(new Label("attendeeName", mm.getFirstname() + " " + mm.getLastname()));
+					item.add(new Label("attendeeEmail", mm.getEmail()));
+					item.add(new WebMarkupContainer("attendeeDelete").add(new AjaxEventBehavior("onclick"){
+						private static final long serialVersionUID = 1L;
+
+						@Override
+						protected void onEvent(AjaxRequestTarget target) {
+							MeetingMember mm = item.getModelObject();
+							AppointmentForm.this.getModelObject().getMeetingMember().remove(mm);
+							target.add(attendeeContainer);
+						}
+					})); 
+				}
+			});
+			add(attendeeContainer.setOutputMarkupId(true));
+
 		}
 		
 		private boolean isPwdProtected() {

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=1504828&r1=1504827&r2=1504828&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 Fri Jul 19 11:06:46 2013
@@ -81,25 +81,27 @@ public class CalendarPanel extends UserP
 		JSONArray shortMonthes = new JSONArray();
 		JSONArray days = new JSONArray();
 		JSONArray shortDays = new JSONArray();
-		for (int i=0; i < 12; i++){
-			try {
+		try {
+			// first week day must be Sunday
+			days.put(0, WebSession.getString(466));
+			shortDays.put(0, WebSession.getString(459));
+			for (int i=0; i < 12; i++){
 				monthes.put(i, WebSession.getString(469 + i));
 				shortMonthes.put(i, WebSession.getString(1556 + i));
-				if (i < 7){
-					days.put(i, WebSession.getString(460 + i));
-					shortDays.put(i, WebSession.getString(453 + i));					
+				if (i+1 < 7){
+					days.put(i+1, WebSession.getString(460 + i));
+					shortDays.put(i+1, WebSession.getString(453 + i));					
 				}
-			} catch (JSONException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
 			}
+		} catch (JSONException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
 		}
 		options.set("monthNames", monthes.toString());
 		options.set("monthNamesShort", shortMonthes.toString());
 		options.set("dayNames", days.toString());
 		options.set("dayNamesShort", shortDays.toString());
 		
-		
 		calendar = new Calendar("calendar", new AppointmentModel(), options) {
 			private static final long serialVersionUID = 8442068089963449950L;
 			

Added: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/MeetingMemberDialog.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/MeetingMemberDialog.html?rev=1504828&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/MeetingMemberDialog.html (added)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/MeetingMemberDialog.html Fri Jul 19 11:06:46 2013
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+  
+-->
+<html xmlns:wicket="http://wicket.apache.org">
+<wicket:head>
+	<style type="text/css">
+		.ui-autocomplete {
+			z-index: 999 !important;
+		}
+	</style>
+</wicket:head>
+<wicket:panel>
+	<form wicket:id="formUsers">
+		<table style="width: 100%">
+			<tr>
+				<td colspan="2" wicket:id="feedbackDialog"></td>
+			</tr>
+			<tr>
+				<td colspan="3"><wicket:ommessage key="181"/>&nbsp;
+				<input type="text" wicket:id="searchUser"/>&nbsp;
+				<input type="button" wicket:id="search"/>&nbsp;
+                 </td>
+                 <td>
+                 	<div wicket:id="addExtern" class="formNewButton" wicket:ommessage="title:812"><input /></div>
+                 </td>
+			</tr>
+			<tr>
+			</tr>
+			<tr>
+				<td><wicket:ommessage key="125" /></td>
+				<td></td>
+				<td><wicket:ommessage key="1342" /></td>
+			</tr>
+			<tr>
+				<td><select wicket:id="users" style="width: 200px; height: 300px;"></select></td>
+				<td rowspan="2"><input type="button" wicket:id="add"/><br>
+					<input type="button" wicket:id="remove"/>
+				</td>
+				<td><select wicket:id="attendees" style="width: 200px; height: 300px;"></select></td>
+			</tr>
+		</table>
+	</form>
+</wicket:panel>
+</html>
\ No newline at end of file

Added: 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=1504828&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/MeetingMemberDialog.java (added)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/MeetingMemberDialog.java Fri Jul 19 11:06:46 2013
@@ -0,0 +1,226 @@
+/*
+ * 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.
+ */
+package org.apache.openmeetings.web.user.calendar;
+
+import static org.apache.openmeetings.web.admin.groups.GroupUsersPanel.getUser;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.persistence.beans.calendar.Appointment;
+import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
+import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.persistence.beans.user.User.Type;
+import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.app.WebSession;
+import org.apache.openmeetings.web.util.UserAutoCompleteTextField;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.ListMultipleChoice;
+import org.apache.wicket.markup.html.panel.FeedbackPanel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
+
+import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
+import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
+
+public class MeetingMemberDialog extends AbstractFormDialog<Appointment> {
+
+	private static final long serialVersionUID = 4895460684702708401L;
+	private final Form<User> formUsers;
+	private FeedbackPanel feedbackDialog = new FeedbackPanel("feedbackDialog");
+	private UserAutoCompleteTextField searchUser;
+	private List<User> usersInList = new ArrayList<User>();
+	private final List<User> usersToAdd = new ArrayList<User>();
+	private final List<User> attendeesInList = new ArrayList<User>();
+	private final List<User> attendeesToRemove = new ArrayList<User>();
+	DialogButton send = new DialogButton(WebSession.getString(175));
+	private DialogButton cancel = new DialogButton(WebSession.getString(219));
+	private AppointmentDialog appDialog;
+	private User userBeingSearched = null;
+
+	@Override
+	public int getWidth() {
+		return 500;
+	}
+	
+	public MeetingMemberDialog(String id, String string, IModel<Appointment> model, AppointmentDialog appDialog ) {
+		super(id, string, model);
+		this.appDialog = appDialog;
+		formUsers = new Form<User>("formUsers");
+		formUsers.add(feedbackDialog.setOutputMarkupId(true));
+
+		IModel<List<User>> listUsersModel = new PropertyModel<List<User>>(MeetingMemberDialog.this, "usersInList");
+		IModel<List<User>> selectedUsersModel = new PropertyModel<List<User>>(MeetingMemberDialog.this, "usersToAdd");
+		final ListMultipleChoice<User> users = new ListMultipleChoice<User>("users"
+				, selectedUsersModel
+				, listUsersModel
+				, new IChoiceRenderer<User>() {
+			private static final long serialVersionUID = 1L;
+
+			public Object getDisplayValue(User object) {
+				return getUser(object);
+			}
+
+			public String getIdValue(User object, int index) {
+				return "" + object.getUser_id();
+			}
+		});
+		
+		formUsers.add(searchUser = new UserAutoCompleteTextField("searchUser", new PropertyModel<User>(this, "userBeingSearched")));
+		formUsers.add(new AjaxButton("search", Model.of(WebSession.getString(182L))) {
+			private static final long serialVersionUID = -4752180617634945030L;
+
+			protected void onAfterSubmit(AjaxRequestTarget target, Form<?> form) {
+				usersToAdd.clear();
+				usersInList.clear();
+				usersInList.addAll(Application.getBean(UsersDao.class).get(searchUser.inputToString()));
+				target.add(users);
+			}
+		});
+		formUsers.add(users.setOutputMarkupId(true));
+
+		IModel<List<User>> listAttendeesModel = new PropertyModel<List<User>>(MeetingMemberDialog.this, "attendeesInList");
+		IModel<List<User>> selectedAttendeesModel = new PropertyModel<List<User>>(MeetingMemberDialog.this, "attendeesToRemove");
+		final ListMultipleChoice<User> attendees = new ListMultipleChoice<User>("attendees"
+				, selectedAttendeesModel
+				, listAttendeesModel
+				, new IChoiceRenderer<User>() {
+			private static final long serialVersionUID = 1L;
+
+			public Object getDisplayValue(User object) {
+				return getUser(object);
+			}
+
+			public String getIdValue(User object, int index) {
+				return "" + object.getUser_id();
+			}
+		});
+		formUsers.add(attendees.setOutputMarkupId(true));
+
+		formUsers.add(new AjaxButton("add", Model.of(">>")){
+			private static final long serialVersionUID = 1L;
+			
+			@Override
+			protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+			{
+				for (User u : usersToAdd) {
+					if (!attendeesInList.contains(u)){
+						attendeesInList.add(u);
+					}
+				}
+				target.add(attendees);
+			}
+		});
+		
+		formUsers.add(new AjaxButton("remove", Model.of("<<")){
+			private static final long serialVersionUID = 1L;
+			
+			@Override
+			protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+			{
+				for (User u : attendeesToRemove) {
+					if (attendeesInList.contains(u)){
+						attendeesInList.remove(u);
+					}
+				}
+				target.add(attendees);
+			}
+		});
+
+		formUsers.add(new AjaxButton("addExtern"){
+			private static final long serialVersionUID = 1L;
+			
+			@Override
+			protected void onSubmit(AjaxRequestTarget target, Form<?> form)
+			{
+				User ex = searchUser.getModelObject();
+				if (ex != null &&  !attendeesInList.contains(ex)){
+					attendeesInList.add(ex);
+					target.add(attendees);
+					userBeingSearched = null; 
+				}
+			}
+		});
+		
+		add(formUsers.setOutputMarkupId(true));
+	}
+
+	@Override
+	protected List<DialogButton> getButtons() {
+		return Arrays.asList(send, cancel);
+	}
+	
+	@Override
+	protected DialogButton getSubmitButton() {
+		return send;
+	}
+
+	@Override
+	public Form<?> getForm() {
+		return formUsers;
+	}
+
+	@Override
+	protected void onError(AjaxRequestTarget target) {
+		target.add(feedbackDialog);
+		
+	}
+
+	@Override
+	protected void onSubmit(AjaxRequestTarget target) {
+		Appointment app = getModelObject();
+		final List<MeetingMember> meetingMembers = app.getMeetingMember() == null ? new ArrayList<MeetingMember>() : app.getMeetingMember();
+		for (User u : attendeesInList) {
+			boolean found = false;
+			for (MeetingMember m : meetingMembers){
+				if (u == m.getUserid()){
+					found = true;
+					break;
+				}
+			}
+			if (!found){
+				MeetingMember mm = new MeetingMember();
+				mm.setFirstname(u.getFirstname());
+				mm.setLastname(u.getLastname());
+				mm.setUserid(u);
+				mm.setEmail(u.getAdresses().getEmail());
+				mm.setPhone(u.getAdresses().getPhone());
+				mm.setDeleted(false);
+				if (u.getType() == Type.contact){
+					mm.setInvitor(false);
+				} else {
+					boolean invitor = (WebSession.getUserId() == u.getUser_id() ? true : false);
+					mm.setInvitor(invitor);
+				}
+				mm.setStarttime(app.getStarttime());
+				mm.setUpdatetime(app.getUpdatetime());
+				mm.setAppointment(app);
+				meetingMembers.add(mm);
+			}
+		}
+		app.setMeetingMember(meetingMembers);
+		target.add(appDialog.getForm());
+	}
+}

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/UserAutoCompleteTextField.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/UserAutoCompleteTextField.java?rev=1504828&r1=1504827&r2=1504828&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/UserAutoCompleteTextField.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/UserAutoCompleteTextField.java Fri Jul 19 11:06:46 2013
@@ -39,6 +39,7 @@ import com.googlecode.wicket.jquery.ui.f
 public class UserAutoCompleteTextField extends AutoCompleteTextField<User> {
 	private static final long serialVersionUID = 1L;
 	private UserTextRenderer renderer;
+	private String inputValue = null;
 	private IConverter<User> converter = new IConverter<User>() {
 		private static final long serialVersionUID = 1L;
 
@@ -80,7 +81,7 @@ public class UserAutoCompleteTextField e
 					u.setFirstname(fName);
 					u.setLastname(lName);
 					u.setAdresses(new Address());
-					u.getAdresses().setEmail(value);
+					u.getAdresses().setEmail(email);
 				} else {
 					for (IValidationError err : valEmail.getErrors()) {
 						UserAutoCompleteTextField.this.error(err);
@@ -93,6 +94,7 @@ public class UserAutoCompleteTextField e
 		public String convertToString(User value, Locale locale) {
 			return UserAutoCompleteTextField.this.renderer.getText(value);
 		}
+
 	};
 
 	public UserAutoCompleteTextField(String id, IModel<User> model) {
@@ -104,6 +106,10 @@ public class UserAutoCompleteTextField e
 		this(id, null);
 	}
 
+	public String inputToString() {
+		return inputValue;
+	}
+	
 	@SuppressWarnings("unchecked")
 	@Override
 	public <C> IConverter<C> getConverter(Class<C> type) {
@@ -116,6 +122,7 @@ public class UserAutoCompleteTextField e
 	
 	@Override
 	protected List<User> getChoices(String input) {
+		inputValue = input;
 		return getBean(UsersDao.class).get(input, 0, 10, null);
 	}