RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improved pretty-print of resources for assignment

Browse source 
FEA: ItEr74S04BugFixing
This commit is contained in:
Lorenzo Tilve Álvaro 2011-05-09 02:22:17 +02:00
parent 78210d3240
commit 5b5c5cbf56
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java
View file

@ -112,7 +112,7 @@ public class Machine extends Resource {
}
public String getShortDescription() {
return getCode() + " :: " + name;
return name + " (" + getCode() + ")";
}
public void setDescription(String description) {

15
navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/VirtualWorker.java
View file

@ -38,7 +38,7 @@ public class VirtualWorker extends Worker {
public static VirtualWorker create() {
VirtualWorker virtualWorker = new VirtualWorker();
virtualWorker.setNewObject(true);
virtualWorker.setNif("[Virtual]");
virtualWorker.setNif("(Virtual)");
virtualWorker.setSurname("---");
virtualWorker.getCalendar();
return create(virtualWorker);
@ -47,7 +47,7 @@ public class VirtualWorker extends Worker {
public static VirtualWorker create(String code) {
VirtualWorker virtualWorker = new VirtualWorker();
virtualWorker.setNewObject(true);
virtualWorker.setNif("[Virtual]");
virtualWorker.setNif("(Virtual)");
virtualWorker.setSurname("---");
virtualWorker.getCalendar();
return create(virtualWorker, code);
@ -62,12 +62,17 @@ public class VirtualWorker extends Worker {
}
@Override
public String getDescription(){
return getFirstName()+" "+getSurname();
public String getDescription() {
return getFirstName();
}
@Override
public String getShortDescription() {
return getFirstName() + " " + getNif();
}
public String getName() {
return getFirstName() + " " + getSurname();
return getFirstName();
}
@Override

4
navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java
View file

@ -101,12 +101,12 @@ public class Worker extends Resource implements Comparable {
}
public String getDescription() {
return getFirstName() + " " + getSurname();
return getSurname() + "," + getFirstName();
}
@Override
public String getShortDescription() {
return getNif() + " :: " + getDescription();
return getDescription() + " (" + getNif() + ")";
}
@NotEmpty(message="worker's first name not specified")