DMC/scipro
7
0
Fork 0
Code Issues42 Pull Requests4 Actions Projects1 Releases Wiki Activity

Merge branch 'infoFix' into develop

Browse Source
This commit is contained in:
Emil Siverhall 2012-03-20 10:18:36 +01:00
commit 6748ce5c75
1 changed files with 9 additions and 4 deletions

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

@ -81,10 +81,15 @@ public class MyProjectIdeasPanel extends Panel {
item.add(new Label("level", idea.getProjectClass().getName()));
item.add(new Label("authors", authorString));
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));
String supervisor = "";
if(idea.getMatch().getSupervisor()!=null&&idea.getMatch().getStatus().equals(Match.Status.CONFIRMED))
supervisor = idea.getMatch().getSupervisor().getNameAsString()+" ("+idea.getMatch().getSupervisor().getEmailAsString()+")";
else if(idea.getMatch().getStatus().equals(Match.Status.REFUSED))
supervisor = "Project idea refused, needs to be rewritten";
else
supervisor = "Supervisor allocation in progress";
item.add(new Label("supervisor", supervisor));
}