DMC/scipro
7
0
Fork 0
Code Issues41 Pull Requests6 Actions Projects1 Releases Wiki Activity

fixed proper identifiers for exemption creation

Browse Source
This commit is contained in:
Fredrik Friis 2012-02-27 14:46:59 +09:00
parent 8337cf2b21
commit 45f487f790
3 changed files with 105 additions and 103 deletions
src/main/java/se/su/dsv/scipro
admin/pages/match
AdminExemptionPanel.htmlAdminExemptionPanel.java
components
StudentSelector.java

2
src/main/java/se/su/dsv/scipro/admin/pages/match/AdminExemptionPanel.html

@ -37,7 +37,7 @@
</tfoot>
<tbody>
<tr wicket:id="listView">
<td><span wicket:id="name"></span></td>
<td><span wicket:id="name"></span> <span wicket:id="mail"></span></td>
<td><span wicket:id="comment"></span></td>
<td><span wicket:id="level"></span></td>
<td><span wicket:id="grantedBy"></span></td>

6
src/main/java/se/su/dsv/scipro/admin/pages/match/AdminExemptionPanel.java

@ -1,6 +1,4 @@
/**
*
*/
package se.su.dsv.scipro.admin.pages.match;
import org.apache.wicket.ajax.AjaxRequestTarget;
@ -120,12 +118,14 @@ public class AdminExemptionPanel extends Panel {
final Exemption excemption = item.getModelObject();
item.add(new Label("name", excemption.getAuthor().getUser()
.getFullName()));
item.add(new Label("mail", excemption.getAuthor().getUser().getEmailAddress()));
item.add(new Label("level", excemption.getProjectClass()
.getName()));
item.add(new Label("comment", excemption.getComment()));
item.add(new Label("grantedBy", excemption.getGrantedBy()
.getFullName()));
AjaxLink<Void> removeLink = new AjaxLink<Void>("removeLink"){
private static final long serialVersionUID = 1L;

4
src/main/java/se/su/dsv/scipro/components/StudentSelector.java

@ -11,6 +11,7 @@ import org.wicketstuff.objectautocomplete.ObjectAutoCompleteRenderer;
import se.su.dsv.scipro.data.dao.interfaces.RoleDao;
import se.su.dsv.scipro.data.dataobjects.Student;
import se.su.dsv.scipro.util.AutoCompleteStringFormatter;
public class StudentSelector extends Panel {
@ -37,7 +38,8 @@ public class StudentSelector extends Panel {
@Override
protected String getTextValue(Student s){
return s.getUser().toString();
// return s.getUser().toString();
return AutoCompleteStringFormatter.formatString(s.getUser());
}
@Override
protected String getIdValue(Student s){