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

3122 TR Kortare (och tydligare) variabel-/metodnamn.

Browse Source
This commit is contained in:
nikos dimitrakas 2023-10-06 09:54:46 +02:00
parent 3a45f356eb
commit bfe9025dd2
3 changed files with 16 additions and 13 deletions
core/src/main/java/se/su/dsv/scipro/finalseminar
FinalSeminarService.javaFinalSeminarServiceImpl.java
view/src/main/java/se/su/dsv/scipro/finalseminar
ProjectOppositionPage.java

21
core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarService.java

@ -3,7 +3,10 @@ package se.su.dsv.scipro.finalseminar;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.*;
import se.su.dsv.scipro.system.DegreeType;
import se.su.dsv.scipro.system.FilteredService;
import se.su.dsv.scipro.system.GenericService;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.Either;
import java.io.Serializable;
@ -59,7 +62,7 @@ public interface FinalSeminarService extends GenericService<FinalSeminar, Long>,
private Boolean onlyActiveOrCompletedProjects;
private User headSupervisor;
private DegreeType degreeType;
private Boolean onlyNotHavingManualParticipants;
private Boolean onlyNonManualParticipants;
public Date getFromDate() {
return this.fromDate;
@ -125,12 +128,12 @@ public interface FinalSeminarService extends GenericService<FinalSeminar, Long>,
this.degreeType = degreeType;
}
public Boolean getOnlyNotHavingManualParticipants() {
return onlyNotHavingManualParticipants;
public Boolean getOnlyNonManualParticipants() {
return onlyNonManualParticipants;
}
public void setOnlyNotHavingManualParticipants(Boolean onlyNotHavingManualParticipants) {
this.onlyNotHavingManualParticipants = onlyNotHavingManualParticipants;
public void setOnlyNonManualParticipants(Boolean onlyNonManualParticipants) {
this.onlyNonManualParticipants = onlyNonManualParticipants;
}
@Override
@ -147,7 +150,7 @@ public interface FinalSeminarService extends GenericService<FinalSeminar, Long>,
&& Objects.equals(this.getOnlyActiveOrCompletedProjects(), other.getOnlyActiveOrCompletedProjects())
&& Objects.equals(this.getHeadSupervisor(), other.getHeadSupervisor())
&& Objects.equals(this.getDegreeType(), other.getDegreeType())
&& Objects.equals(this.onlyNotHavingManualParticipants, other.onlyNotHavingManualParticipants);
&& Objects.equals(this.onlyNonManualParticipants, other.onlyNonManualParticipants);
}
protected boolean canEqual(final Object other) {
@ -165,7 +168,7 @@ public interface FinalSeminarService extends GenericService<FinalSeminar, Long>,
this.getOnlyActiveOrCompletedProjects(),
this.getHeadSupervisor(),
this.getDegreeType(),
this.getOnlyNotHavingManualParticipants());
this.getOnlyNonManualParticipants());
}
@Override
@ -179,7 +182,7 @@ public interface FinalSeminarService extends GenericService<FinalSeminar, Long>,
+ ", onlyActiveOrCompletedProjects=" + this.getOnlyActiveOrCompletedProjects()
+ ", headSupervisor=" + this.getHeadSupervisor()
+ ", degreeType=" + this.getDegreeType()
+ ", onlyNotHavingManualParticipants=" + this.getOnlyNotHavingManualParticipants() + ")";
+ ", onlyNonManualParticipants=" + this.getOnlyNonManualParticipants() + ")";
}
}
}

6
core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarServiceImpl.java

@ -346,8 +346,8 @@ public class FinalSeminarServiceImpl extends AbstractServiceImpl<FinalSeminar, L
if (params.getOnlyActiveOrCompletedProjects() != null) {
bb.and(onlyActiveOrCompletedProjectsFilter());
}
if (params.getOnlyNotHavingManualParticipants() != null){
bb.and(onlyNotHavingManualParticipantsFilter());
if (params.getOnlyNonManualParticipants() != null){
bb.and(onlyNonManualParticipantsFilter());
}
if (params.getDegreeType() != null) {
bb.and(QFinalSeminar.finalSeminar.project.projectType.degreeType.eq(params.getDegreeType()));
@ -367,7 +367,7 @@ public class FinalSeminarServiceImpl extends AbstractServiceImpl<FinalSeminar, L
return QFinalSeminar.finalSeminar.project.projectStatus.eq(ProjectStatus.ACTIVE);
}
private BooleanExpression onlyNotHavingManualParticipantsFilter() {
private BooleanExpression onlyNonManualParticipantsFilter() {
return QFinalSeminar.finalSeminar.manualParticipants.isFalse();
}

2
view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectOppositionPage.java

@ -55,7 +55,7 @@ public class ProjectOppositionPage extends AbstractProjectDetailsPage implements
filter.setLazyDeleted(Boolean.FALSE);
filter.setDegreeType(getActiveProject().getProjectType().getDegreeType());
filter.setOnlyActiveProjects(Boolean.TRUE);
filter.setOnlyNotHavingManualParticipants(Boolean.TRUE);
filter.setOnlyNonManualParticipants(Boolean.TRUE);
add(new FeedbackPanel("feedback"));