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

removed unused capabilities, wired userlinkpanel languages to the ones set by users in employee class

Browse Source
This commit is contained in:
fred-fri 2013-08-19 10:55:10 +09:00
parent 328f2788d0
commit a3948cdd77
3 changed files with 6 additions and 49 deletions
resources/db_update_scripts
current.sql
src/main/java/se/su/dsv/scipro
data/dataobjects
Employee.java
profile
DisplayUserProfilePanel.java

1
resources/db_update_scripts/current.sql

@ -0,0 +1 @@
DROP TABLE role_Language;

48
src/main/java/se/su/dsv/scipro/data/dataobjects/Employee.java

@ -25,6 +25,8 @@ import java.util.*;
@Cache(usage= CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) //Hibernate specific
public class Employee extends ProjectTeamMember {
private static final long serialVersionUID = -2570983581219033271L;
@ManyToMany
@JoinTable(name="Employee_Language")
private Set<Language> languages = new HashSet<Language>();
@ -48,18 +50,10 @@ public class Employee extends ProjectTeamMember {
this.targets = targets;
}
@Embedded
// @AssociationOverride(name="languages", joinTable=@JoinTable(name="Employee_Language"))
private Capabilities capabilities = new Capabilities();
@ManyToMany
@JoinTable(name="employee_researcharea")
private Set<ResearchArea> researchAreas = new HashSet<ResearchArea>();
public Capabilities getCapabilities() {
return capabilities;
}
@Override
public String toString() {
return getNameAsString();
@ -90,8 +84,6 @@ public class Employee extends ProjectTeamMember {
Employee employee = (Employee) o;
if (capabilities != null ? !capabilities.equals(employee.capabilities) : employee.capabilities != null)
return false;
if (languages != null ? !languages.equals(employee.languages) : employee.languages != null) return false;
if (researchAreas != null ? !researchAreas.equals(employee.researchAreas) : employee.researchAreas != null)
return false;
@ -105,43 +97,7 @@ public class Employee extends ProjectTeamMember {
int result = super.hashCode();
result = 31 * result + (languages != null ? languages.hashCode() : 0);
result = 31 * result + (targets != null ? targets.hashCode() : 0);
result = 31 * result + (capabilities != null ? capabilities.hashCode() : 0);
result = 31 * result + (researchAreas != null ? researchAreas.hashCode() : 0);
return result;
}
private static final long serialVersionUID = -2570983581219033271L;
@Embeddable
public static class Capabilities implements Serializable {
private static final long serialVersionUID = -3561755898522270150L;
@ManyToMany(fetch=FetchType.EAGER)
private Set<Language> languages = new HashSet<Language>();
public Set<Language> getLanguages() {
return languages;
}
public void setLanguages(Set<Language> languages) {
this.languages = languages;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Capabilities that = (Capabilities) o;
if (languages != null ? !languages.equals(that.languages) : that.languages != null) return false;
return true;
}
@Override
public int hashCode() {
return languages != null ? languages.hashCode() : 0;
}
}
}

6
src/main/java/se/su/dsv/scipro/profile/DisplayUserProfilePanel.java

@ -111,8 +111,8 @@ public class DisplayUserProfilePanel extends Panel {
});
ArrayList<Language> lalist = new ArrayList<Language>();
if (e!=null && e.getCapabilities()!=null && e.getCapabilities().getLanguages()!=null){
lalist.addAll(e.getCapabilities().getLanguages());
if (e!=null && e.getLanguages()!=null){
lalist.addAll(e.getLanguages());
}
ListView<Language> languages = new ListView<Language>(LANGUAGES, lalist) {
@Override
@ -129,7 +129,7 @@ public class DisplayUserProfilePanel extends Panel {
employeeWMC.add(new Label(NOLANGUAGES, "None"){
@Override
protected void onConfigure() {
setVisibilityAllowed(e.getCapabilities()==null || e.getCapabilities().getLanguages()==null || e.getCapabilities().getLanguages().isEmpty());
setVisibilityAllowed(e.getLanguages()==null || e.getLanguages().isEmpty());
}
});