DMC/scipro
7
0
Fork 0
Code Issues40 Pull Requests7 Actions Projects1 Releases Wiki Activity

changed from status to supervisor on author project ideas list

Browse Source
This commit is contained in:
Emil Siverhall 2012-03-20 09:36:14 +01:00
parent 15d0dcaa8d
commit 5fc001af9c
3 changed files with 14 additions and 3 deletions
src/main/java/se/su/dsv/scipro
data/dataobjects
Role.java
project/panels
MyProjectIdeasPanel.htmlMyProjectIdeasPanel.java

6
src/main/java/se/su/dsv/scipro/data/dataobjects/Role.java

@ -69,6 +69,12 @@ public abstract class Role extends LazyDeletableDomainObject implements Comparab
return str;
}
public String getEmailAsString(){
String str = "";
if(user.getEmailAddress()!=null)
str += user.getEmailAddress();
return str;
}
@Override
public int hashCode() {
final int prime = 31;

4
src/main/java/se/su/dsv/scipro/project/panels/MyProjectIdeasPanel.html

@ -12,7 +12,7 @@
<th>Project level</th>
<th>Title</th>
<th>Author(s)</th>
<th class="rounded-right-top">Status</th>
<th class="rounded-right-top">Supervisor</th>
</tr>
</thead>
<tfoot>
@ -28,7 +28,7 @@
<td wicket:id="level"></td>
<td><a href="#" wicket:id="ideaLink"><span wicket:id="title"></span></a></td>
<td wicket:id="authors"></td>
<td wicket:id="status"></td>
<td wicket:id="supervisor"></td>
</tr>
</tbody>

7
src/main/java/se/su/dsv/scipro/project/panels/MyProjectIdeasPanel.java

@ -16,6 +16,7 @@ import se.su.dsv.scipro.data.dataobjects.Student;
import se.su.dsv.scipro.data.dataobjects.User;
import se.su.dsv.scipro.match.dao.interfaces.AuthorDao;
import se.su.dsv.scipro.match.dao.interfaces.ProjectIdeaDao;
import se.su.dsv.scipro.match.dataobject.Match;
import se.su.dsv.scipro.match.dataobject.ProjectIdea;
import se.su.dsv.scipro.match.dataprovider.ProjectIdeaByUserDataProvider;
import se.su.dsv.scipro.project.pages.ProjectIdeaSubmissionPage;
@ -79,7 +80,11 @@ public class MyProjectIdeasPanel extends Panel {
item.add(new DateFormatter(DateFormatter.FORMAT.EXTENDED).createFormattedDateLabel("date", idea.getDateCreated()));
item.add(new Label("level", idea.getProjectClass().getName()));
item.add(new Label("authors", authorString));
item.add(new Label("status", idea.getStatus()));
String supervisorString = idea.getMatch().getSupervisor() != null && idea.getMatch().getStatus().equals(Match.Status.CONFIRMED) ?
idea.getMatch().getSupervisor().getNameAsString()+" ("+idea.getMatch().getSupervisor().getEmailAsString()+")" :
"Supervisor allocation in progress";
item.add(new Label("supervisor", supervisorString));
}