Author: sebawagner
Date: Sun Sep 9 11:21:23 2012
New Revision: 1382455
URL: http://svn.apache.org/viewvc?rev=1382455&view=rev
Log:
OPENMEETINGS-428 Refactor User administration to Wicket - some more fields
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UserForm.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UsersPanel.html
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UserForm.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UserForm.java?rev=1382455&r1=1382454&r2=1382455&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UserForm.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UserForm.java
Sun Sep 9 11:21:23 2012
@@ -1,5 +1,7 @@
package org.openmeetings.web.components.admin.user;
+import java.util.Arrays;
+
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.extensions.markup.html.form.DateTextField;
@@ -8,11 +10,15 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.CompoundPropertyModel;
import org.openmeetings.app.data.basic.FieldLanguageDaoImpl;
+import org.openmeetings.app.data.basic.Fieldmanagment;
import org.openmeetings.app.data.basic.dao.OmTimeZoneDaoImpl;
import org.openmeetings.app.data.user.Salutationmanagement;
+import org.openmeetings.app.data.user.Statemanagement;
+import org.openmeetings.app.persistence.beans.adresses.States;
import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
import org.openmeetings.app.persistence.beans.lang.FieldLanguage;
import org.openmeetings.app.persistence.beans.user.Salutations;
@@ -61,6 +67,77 @@ public class UserForm extends Form<Users
datePicker.setAutoHide(true);
age.add(datePicker);
add(age);
+ add(new TextField<String>("adresses.street"));
+ add(new TextField<String>("adresses.additionalname"));
+ add(new TextField<String>("adresses.zip"));
+ add(new TextField<String>("adresses.town"));
+ add(new DropDownChoice<States>("adresses.states",
Application.getBean(
+ Statemanagement.class).getStates(), new
ChoiceRenderer<States>(
+ "name", "state_id")));
+
+ final String field159 =
Application.getBean(Fieldmanagment.class)
+ .getFieldByIdAndLanguage(159L,
WebSession.getLanguage())
+ .getValue();
+ final String field160 =
Application.getBean(Fieldmanagment.class)
+ .getFieldByIdAndLanguage(160L,
WebSession.getLanguage())
+ .getValue();
+
+ add(new DropDownChoice<Integer>("status", Arrays.asList(0, 1),
+ new IChoiceRenderer<Integer>() {
+
+ private static final long
serialVersionUID = 1L;
+
+ public Object getDisplayValue(Integer
id) {
+ if (id.equals(0)) {
+ return field159;
+ } else if (id.equals(1)) {
+ return field160;
+ }
+ return null;
+ }
+
+ public String getIdValue(Integer id,
int index) {
+ return "" + id;
+ }
+
+ }));
+
+ final String field166 =
Application.getBean(Fieldmanagment.class)
+ .getFieldByIdAndLanguage(166L,
WebSession.getLanguage())
+ .getValue();
+ final String field167 =
Application.getBean(Fieldmanagment.class)
+ .getFieldByIdAndLanguage(167L,
WebSession.getLanguage())
+ .getValue();
+ final String field168 =
Application.getBean(Fieldmanagment.class)
+ .getFieldByIdAndLanguage(168L,
WebSession.getLanguage())
+ .getValue();
+ final String field1311 =
Application.getBean(Fieldmanagment.class)
+ .getFieldByIdAndLanguage(1311L,
WebSession.getLanguage())
+ .getValue();
+
+ add(new DropDownChoice<Long>("level_id", Arrays.asList(1L, 2L,
3L, 4L),
+ new IChoiceRenderer<Long>() {
+
+ private static final long
serialVersionUID = 1L;
+
+ public Object getDisplayValue(Long id) {
+ if (id.equals(1L)) {
+ return field166;
+ } else if (id.equals(2L)) {
+ return field167;
+ } else if (id.equals(3L)) {
+ return field168;
+ } else if (id.equals(4L)) {
+ return field1311;
+ }
+ return null;
+ }
+
+ public String getIdValue(Long id, int
index) {
+ return "" + id;
+ }
+
+ }));
// add a button that can be used to submit the form via ajax
add(new AjaxButton("ajax-button", this) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UsersPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UsersPanel.html?rev=1382455&r1=1382454&r2=1382455&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UsersPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/user/UsersPanel.html
Sun Sep 9 11:21:23 2012
@@ -68,6 +68,16 @@
<br/>
<wicket:ommessage key="138" />: <input
type="text" wicket:id="age"/>
<br/>
+ <wicket:ommessage key="139" />: <input
type="text" wicket:id="adresses.street"/> <input type="text"
wicket:id="adresses.additionalname"/>
+ <br/>
+ <wicket:ommessage key="140" />: <input
type="text" wicket:id="adresses.zip"/> <input type="text"
wicket:id="adresses.town"/>
+ <br/>
+ <wicket:ommessage key="141" />: <select
wicket:id="adresses.states"/>
+ <br/>
+ <wicket:ommessage key="158" />: <select
wicket:id="status"/>
+ <br/>
+ <wicket:ommessage key="169" />: <select
wicket:id="level_id"/>
+ <br/>
<br/>
<input type="submit" value="submit via
ajax" wicket:id="ajax-button"/>
</form>
