Author: sebawagner
Date: Sun Sep 9 15:55:45 2012
New Revision: 1382520
URL: http://svn.apache.org/viewvc?rev=1382520&view=rev
Log:
OPENMEETINGS-428 a couple of more fields
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/ServerDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java
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/app/data/basic/dao/ServerDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/ServerDaoImpl.java?rev=1382520&r1=1382519&r2=1382520&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/ServerDaoImpl.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/ServerDaoImpl.java
Sun Sep 9 15:55:45 2012
@@ -38,6 +38,14 @@ public class ServerDaoImpl {
@PersistenceContext
private EntityManager em;
+
+ public List<Server> getServerList() {
+ log.debug("getServerList enter");
+ TypedQuery<Server> q = em.createNamedQuery("getAllServers",
+ Server.class);
+ return q.getResultList();
+ }
+
public List<Server> getServerList(int start, int max) {
log.debug("getServerList enter");
@@ -48,7 +56,7 @@ public class ServerDaoImpl {
return q.getResultList();
}
-
+
public long getServerCount() {
log.debug("getServerCount enter");
TypedQuery<Long> q = em.createNamedQuery("getServerCount",
Long.class);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java?rev=1382520&r1=1382519&r2=1382520&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java
Sun Sep 9 15:55:45 2012
@@ -76,6 +76,10 @@ public class Organisation_Users implemen
@Element(data=true, required=false)
private Boolean isModerator;
+ public Organisation_Users(Organisation organisation) {
+ this.organisation = organisation;
+ }
+
public Organisation getOrganisation() {
return organisation;
}
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=1382520&r1=1382519&r2=1382520&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 15:55:45 2012
@@ -13,14 +13,21 @@ import org.apache.wicket.markup.html.for
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.ListMultipleChoice;
+import org.apache.wicket.markup.html.form.TextArea;
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.dao.OmTimeZoneDaoImpl;
+import org.openmeetings.app.data.basic.dao.ServerDaoImpl;
+import org.openmeetings.app.data.user.Organisationmanagement;
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.basic.Server;
+import org.openmeetings.app.persistence.beans.domain.Organisation;
+import org.openmeetings.app.persistence.beans.domain.Organisation_Users;
import org.openmeetings.app.persistence.beans.lang.FieldLanguage;
import org.openmeetings.app.persistence.beans.user.Salutations;
import org.openmeetings.app.persistence.beans.user.Users;
@@ -77,8 +84,6 @@ public class UserForm extends Form<Users
add(new TextField<String>("login"));
- // new ChoiceRenderer<Salutations>("label.value",
"salutations_id"))
-
add(new DropDownChoice<Long>("salutations_id",
getSalutationsIds(),
new IChoiceRenderer<Long>() {
private static final long
serialVersionUID = 1L;
@@ -191,6 +196,26 @@ public class UserForm extends Form<Users
}));
+ add(new TextArea<String>("adresses.comment"));
+
+ List<Organisation> orgList = Application.getBean(
+
Organisationmanagement.class).getOrganisations(3L);
+ List<Organisation_Users> orgUsers = new
ArrayList<Organisation_Users>(
+ orgList.size());
+ for (Organisation org : orgList) {
+ orgUsers.add(new Organisation_Users(org));
+ }
+ ListMultipleChoice<Organisation_Users> orgChoiceList = new
ListMultipleChoice<Organisation_Users>(
+ "organisation_users", orgUsers,
+ new
ChoiceRenderer<Organisation_Users>("organisation.name",
+
"organisation.organisation_id"));
+ orgChoiceList.setMaxRows(6);
+ add(orgChoiceList);
+
+ add(new DropDownChoice<Server>("server", Application.getBean(
+ ServerDaoImpl.class).getServerList(),
+ new ChoiceRenderer<Server>("name", "id")));
+
// add a button that can be used to submit the form via ajax
add(new AjaxButton("ajax-button", this) {
private static final long serialVersionUID =
839803820502260006L;
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=1382520&r1=1382519&r2=1382520&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 15:55:45 2012
@@ -78,6 +78,14 @@
<br/>
<wicket:ommessage key="169" />: <select
wicket:id="level_id"/>
<br/>
+ <wicket:ommessage key="142" />: <textarea
wicket:id="adresses.comment"/>
+ <br/>
+ <wicket:ommessage key="161" />: <select
wicket:id="organisation_users"/>
+ <br/>
+ <wicket:ommessage key="1502" />: <select
wicket:id="server"/>
+ <br/>
+ <wicket:ommessage key="1159" />
+ <br/>
<br/>
<input type="submit" value="submit via
ajax" wicket:id="ajax-button"/>
</form>
