We should test if a supervisor is deleted or not irrespectively if the supervisor is a student or not.
This commit is contained in:
parent
4bfdd1897b
commit
40c3aad331
@ -179,11 +179,11 @@ public class GreedyMatchingAlgorithm implements MatchingAlgorithm {
|
||||
if (s.getUser().equals(supervisor.getUser())){
|
||||
notSame = false;
|
||||
}
|
||||
if(supervisor.isDeleted()){
|
||||
active = false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if(supervisor.isDeleted()) {
|
||||
active = false;
|
||||
}
|
||||
return isCompatibleLanguage(projectIdea, supervisor) && isNotRejectedBySupervisor(projectIdea, supervisor) && notSame && active;
|
||||
}
|
||||
|
||||
@ -222,7 +222,7 @@ public class GreedyMatchingAlgorithm implements MatchingAlgorithm {
|
||||
for (Language projectIdeaLanguage : projectIdea.getLanguages()) {
|
||||
for (Language supervisorLanguage : supervisor.getCapabilities().getLanguages()) {
|
||||
if (projectIdeaLanguage.equals(supervisorLanguage)) {
|
||||
return true;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user