Allows admins to manage grading report templates #14

Merged
niat8586 merged 41 commits from 3482-new-grading-criteria into develop 2024-10-30 10:05:23 +01:00
140 changed files with 161 additions and 184 deletions
Showing only changes of commit 42eb4d36d9 - Show all commits

View File

@ -1,6 +1,6 @@
package se.su.dsv.scipro.activityplan;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.checklist.Checklist;
import se.su.dsv.scipro.checklist.ChecklistTemplate;
import se.su.dsv.scipro.file.ProjectFileUpload;

View File

@ -4,7 +4,7 @@ import com.google.common.eventbus.EventBus;
import com.google.inject.persist.Transactional;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.checklist.Checklist;
import se.su.dsv.scipro.checklist.ChecklistAnswerEnum;
import se.su.dsv.scipro.checklist.ChecklistCategory;

View File

@ -2,7 +2,7 @@ package se.su.dsv.scipro.activityplan;
import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.Predicate;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.User;

View File

@ -1,8 +1,8 @@
package se.su.dsv.scipro.checklist;
import com.google.inject.persist.Transactional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
import se.su.dsv.scipro.system.JpaRepository;
import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
@Transactional

View File

@ -1,8 +1,8 @@
package se.su.dsv.scipro.checklist;
import com.google.inject.persist.Transactional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
import se.su.dsv.scipro.system.JpaRepository;
import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
@Transactional

View File

@ -2,7 +2,7 @@ package se.su.dsv.scipro.checklist;
import com.google.inject.persist.Transactional;
import com.querydsl.core.types.dsl.BooleanExpression;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.AbstractServiceImpl;

View File

@ -1,8 +1,8 @@
package se.su.dsv.scipro.file;
import com.google.inject.persist.Transactional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
import se.su.dsv.scipro.system.JpaRepository;
import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
@Transactional

View File

@ -1,8 +1,8 @@
package se.su.dsv.scipro.file;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.system.JpaRepository;
import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
import se.su.dsv.scipro.project.Project;
import java.util.*;

View File

@ -2,7 +2,7 @@ package se.su.dsv.scipro.file;
import com.querydsl.core.types.dsl.Expressions;
import com.querydsl.jpa.impl.JPAQuery;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.AbstractServiceImpl;

View File

@ -1,6 +1,6 @@
package se.su.dsv.scipro.file;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.project.Project;
import java.util.*;

View File

@ -1,7 +1,7 @@
package se.su.dsv.scipro.file;
import com.google.inject.persist.Transactional;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.project.Project;
import jakarta.inject.Inject;

View File

@ -1,8 +1,8 @@
package se.su.dsv.scipro.finalseminar;
import com.google.inject.persist.Transactional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
import se.su.dsv.scipro.system.JpaRepository;
import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;

View File

@ -1,7 +1,7 @@
package se.su.dsv.scipro.finalseminar;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.*;
import se.su.dsv.scipro.util.Either;

View File

@ -5,7 +5,7 @@ import com.google.inject.persist.Transactional;
import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.dsl.BooleanExpression;
import jakarta.persistence.EntityManager;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.file.FileReference;
import se.su.dsv.scipro.file.FileService;
import se.su.dsv.scipro.misc.DaysService;

View File

@ -5,7 +5,7 @@ import com.google.inject.persist.Transactional;
import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.Predicate;
import jakarta.persistence.EntityManager;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.file.FileDescription;
import se.su.dsv.scipro.file.FileReference;
import se.su.dsv.scipro.file.FileService;

View File

@ -1,7 +1,7 @@
package se.su.dsv.scipro.forum;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
import se.su.dsv.scipro.system.JpaRepository;
import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
import se.su.dsv.scipro.forum.dataobjects.ForumThread;
public interface AbstractThreadRepository extends JpaRepository<ForumThread, Long>, QueryDslPredicateExecutor<ForumThread> {

View File

@ -1,8 +1,8 @@
package se.su.dsv.scipro.forum;
import com.google.inject.persist.Transactional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
import se.su.dsv.scipro.system.JpaRepository;
import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
import se.su.dsv.scipro.forum.dataobjects.ForumPost;
import se.su.dsv.scipro.forum.dataobjects.ForumPostReadState;
import se.su.dsv.scipro.forum.dataobjects.ForumPostReadStateId;

View File

@ -1,8 +1,8 @@
package se.su.dsv.scipro.forum;
import com.google.inject.persist.Transactional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
import se.su.dsv.scipro.system.JpaRepository;
import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
import se.su.dsv.scipro.forum.dataobjects.ForumPost;
import se.su.dsv.scipro.forum.dataobjects.ForumThread;
import se.su.dsv.scipro.forum.dataobjects.ProjectThread;

View File

@ -1,8 +1,8 @@
package se.su.dsv.scipro.forum;
import com.google.inject.persist.Transactional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
import se.su.dsv.scipro.system.JpaRepository;
import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
import se.su.dsv.scipro.forum.dataobjects.GroupThread;
import se.su.dsv.scipro.group.Group;

View File

@ -1,8 +1,8 @@
package se.su.dsv.scipro.forum;
import com.google.inject.persist.Transactional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
import se.su.dsv.scipro.system.JpaRepository;
import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
import se.su.dsv.scipro.forum.dataobjects.ProjectThread;
import se.su.dsv.scipro.project.Project;

View File

@ -2,7 +2,7 @@ package se.su.dsv.scipro.group;
import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.dsl.BooleanExpression;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.FilteredService;

View File

@ -1,8 +1,8 @@
package se.su.dsv.scipro.integration.activityfinalseminar;
import com.google.inject.persist.Transactional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
import se.su.dsv.scipro.system.JpaRepository;
import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
import se.su.dsv.scipro.finalseminar.FinalSeminar;
import java.util.Optional;

View File

@ -2,7 +2,7 @@ package se.su.dsv.scipro.mail;
import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.Predicate;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.system.AbstractServiceImpl;
import jakarta.inject.Inject;

View File

@ -3,8 +3,8 @@ package se.su.dsv.scipro.match;
import com.google.inject.persist.Transactional;
import com.querydsl.core.types.dsl.BooleanExpression;
import com.querydsl.core.types.dsl.Expressions;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import se.su.dsv.scipro.system.PageRequest;
import se.su.dsv.scipro.system.Sort;
import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.DegreeType;
import se.su.dsv.scipro.system.ProjectType;

View File

@ -1,8 +1,8 @@
package se.su.dsv.scipro.match;
import com.google.inject.persist.Transactional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
import se.su.dsv.scipro.system.JpaRepository;
import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
@Transactional

View File

@ -1,6 +1,6 @@
package se.su.dsv.scipro.match;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;

View File

@ -1,6 +1,6 @@
package se.su.dsv.scipro.match;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.match.Idea.Status;
import se.su.dsv.scipro.match.Idea.Type;
import se.su.dsv.scipro.system.*;

View File

@ -9,7 +9,7 @@ import com.querydsl.core.types.dsl.DateTimeExpression;
import com.querydsl.jpa.JPAExpressions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.data.dataobjects.Member;
import se.su.dsv.scipro.generalsystemsettings.GeneralSystemSettings;
import se.su.dsv.scipro.generalsystemsettings.GeneralSystemSettingsService;

View File

@ -1,6 +1,6 @@
package se.su.dsv.scipro.match;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.system.GenericService;
import se.su.dsv.scipro.system.ResearchArea;

View File

@ -4,9 +4,9 @@ import com.google.inject.persist.Transactional;
import com.querydsl.core.types.dsl.BooleanExpression;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import se.su.dsv.scipro.system.PageRequest;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.system.Sort;
import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.ResearchArea;

View File

@ -1,6 +1,6 @@
package se.su.dsv.scipro.match;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.system.User;
import java.util.Set;

View File

@ -8,7 +8,7 @@ import com.querydsl.core.types.dsl.StringPath;
import com.querydsl.jpa.JPAExpressions;
import com.querydsl.jpa.JPQLQuery;
import com.querydsl.jpa.impl.JPAQuery;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.system.User;
import jakarta.inject.Inject;

View File

@ -1,6 +1,6 @@
package se.su.dsv.scipro.match;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.system.GenericService;
public interface MatchService extends GenericService<Match, Long> {

View File

@ -1,6 +1,6 @@
package se.su.dsv.scipro.match;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.system.AbstractServiceImpl;
import jakarta.inject.Inject;

View File

@ -2,8 +2,8 @@ package se.su.dsv.scipro.match;
import com.google.inject.persist.Transactional;
import com.querydsl.core.types.dsl.BooleanExpression;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import se.su.dsv.scipro.system.PageRequest;
import se.su.dsv.scipro.system.Sort;
import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.Program;
import se.su.dsv.scipro.system.QProgram;

View File

@ -1,8 +1,8 @@
package se.su.dsv.scipro.milestones;
import com.google.inject.persist.Transactional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
import se.su.dsv.scipro.system.JpaRepository;
import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate;
import se.su.dsv.scipro.milestones.dataobjects.MilestonePhaseTemplate;
import se.su.dsv.scipro.system.ProjectType;

View File

@ -1,6 +1,6 @@
package se.su.dsv.scipro.milestones.service;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.milestones.dataobjects.Milestone;
import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate;
import se.su.dsv.scipro.project.Project;

View File

@ -1,6 +1,6 @@
package se.su.dsv.scipro.milestones.service;
import org.springframework.data.domain.Sort;
import se.su.dsv.scipro.system.Sort;
import se.su.dsv.scipro.milestones.dataobjects.MilestonePhaseTemplate;
import se.su.dsv.scipro.springdata.SortOrderService;

View File

@ -1,6 +1,6 @@
package se.su.dsv.scipro.milestones.service;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.project.ProjectStatus;

View File

@ -1,7 +1,7 @@
package se.su.dsv.scipro.milestones.service.impl;
import com.google.inject.persist.Transactional;
import org.springframework.data.domain.Sort;
import se.su.dsv.scipro.system.Sort;
import se.su.dsv.scipro.milestones.dataobjects.MilestonePhaseTemplate;
import se.su.dsv.scipro.milestones.dataobjects.QMilestonePhaseTemplate;
import se.su.dsv.scipro.milestones.service.MilestonePhaseTemplateService;

View File

@ -4,7 +4,7 @@ import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.Predicate;
import com.querydsl.core.types.dsl.BooleanExpression;
import com.querydsl.jpa.impl.JPAQuery;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.milestones.dataobjects.Milestone;
import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate;
import se.su.dsv.scipro.milestones.dataobjects.QMilestone;

View File

@ -8,8 +8,8 @@ import com.querydsl.core.types.dsl.BooleanExpression;
import com.querydsl.core.types.dsl.Expressions;
import com.querydsl.core.types.dsl.StringPath;
import com.querydsl.jpa.impl.JPAQuery;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.system.Sort;
import se.su.dsv.scipro.milestones.dataobjects.Milestone;
import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate;
import se.su.dsv.scipro.milestones.dataobjects.QMilestone;

View File

@ -3,7 +3,7 @@ package se.su.dsv.scipro.notifications;
import com.google.inject.persist.Transactional;
import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.Predicate;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.notifications.dataobject.Notification;
import se.su.dsv.scipro.notifications.dataobject.NotificationEvent;
import se.su.dsv.scipro.notifications.dataobject.QNotification;

View File

@ -1,8 +1,8 @@
package se.su.dsv.scipro.peer;
import com.google.inject.persist.Transactional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
import se.su.dsv.scipro.system.JpaRepository;
import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
@Transactional

View File

@ -1,8 +1,8 @@
package se.su.dsv.scipro.peer;
import com.google.inject.persist.Transactional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
import se.su.dsv.scipro.system.JpaRepository;
import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
@Transactional
public interface PeerRequestRepository extends JpaRepository<PeerRequest, Long>, QueryDslPredicateExecutor<PeerRequest> {

View File

@ -1,6 +1,6 @@
package se.su.dsv.scipro.peer;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.*;

View File

@ -4,7 +4,7 @@ import com.google.common.eventbus.EventBus;
import com.google.inject.persist.Transactional;
import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.dsl.BooleanExpression;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.file.FileReference;
import se.su.dsv.scipro.file.FileService;
import se.su.dsv.scipro.project.Project;

View File

@ -1,7 +1,7 @@
package se.su.dsv.scipro.peer;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
import se.su.dsv.scipro.system.JpaRepository;
import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;

View File

@ -1,6 +1,6 @@
package se.su.dsv.scipro.peer;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.*;

View File

@ -3,7 +3,7 @@ package se.su.dsv.scipro.peer;
import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.Predicate;
import com.querydsl.core.types.dsl.BooleanExpression;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.Language;

View File

@ -1,6 +1,6 @@
package se.su.dsv.scipro.plagiarism;
import org.springframework.data.jpa.repository.JpaRepository;
import se.su.dsv.scipro.system.JpaRepository;
import se.su.dsv.scipro.file.FileDescription;
import java.util.Optional;

View File

@ -1,8 +1,8 @@
package se.su.dsv.scipro.project;
import com.google.inject.persist.Transactional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
import se.su.dsv.scipro.system.JpaRepository;
import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
import se.su.dsv.scipro.system.User;
import java.util.Collection;

View File

@ -5,7 +5,7 @@ import com.google.inject.persist.Transactional;
import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.Predicate;
import com.querydsl.core.types.dsl.BooleanExpression;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.data.dataobjects.Member;
import se.su.dsv.scipro.reusable.SciProUtilities;
import se.su.dsv.scipro.system.AbstractServiceImpl;

View File

@ -1,6 +1,6 @@
package se.su.dsv.scipro.projectpartner;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.match.ApplicationPeriod;
import se.su.dsv.scipro.system.GenericService;
import se.su.dsv.scipro.system.ProjectType;

View File

@ -3,7 +3,7 @@ package se.su.dsv.scipro.projectpartner;
import com.google.inject.persist.Transactional;
import com.querydsl.core.types.dsl.Expressions;
import com.querydsl.jpa.JPAExpressions;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.match.ApplicationPeriod;
import se.su.dsv.scipro.match.QIdea;
import se.su.dsv.scipro.match.QIdeaParticipation;

View File

@ -1,6 +1,6 @@
package se.su.dsv.scipro.report;
import org.springframework.data.jpa.repository.JpaRepository;
import se.su.dsv.scipro.system.JpaRepository;
import se.su.dsv.scipro.grading.GradingReportTemplateUpdate;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.ProjectType;

View File

@ -1,7 +1,7 @@
package se.su.dsv.scipro.report;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
import se.su.dsv.scipro.system.JpaRepository;
import se.su.dsv.scipro.system.QueryDslPredicateExecutor;
import se.su.dsv.scipro.finalseminar.FinalSeminarOpposition;
public interface OppositionReportRepo extends JpaRepository<OppositionReport, Long>, QueryDslPredicateExecutor<OppositionReport> {

View File

@ -1,6 +1,6 @@
package se.su.dsv.scipro.reviewing;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.project.ProjectStatus;
import se.su.dsv.scipro.system.GenericService;

View File

@ -7,7 +7,7 @@ import com.querydsl.core.types.dsl.Expressions;
import com.querydsl.core.types.dsl.StringPath;
import com.querydsl.jpa.JPAExpressions;
import com.querydsl.jpa.impl.JPAQuery;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.finalseminar.QFinalSeminar;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.project.ProjectStatus;

View File

@ -1,6 +1,6 @@
package se.su.dsv.scipro.reviewing;
import org.springframework.data.jpa.repository.JpaRepository;
import se.su.dsv.scipro.system.JpaRepository;
import se.su.dsv.scipro.forum.dataobjects.ReviewerThread;
import se.su.dsv.scipro.project.Project;

View File

@ -3,7 +3,7 @@ package se.su.dsv.scipro.springdata.serviceimpls;
import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.dsl.BooleanExpression;
import com.querydsl.jpa.JPAExpressions;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.match.ApplicationPeriod;
import se.su.dsv.scipro.match.QTarget;
import se.su.dsv.scipro.security.auth.roles.Roles;

View File

@ -1,6 +1,6 @@
package se.su.dsv.scipro.springdata.services;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.match.ApplicationPeriod;
import se.su.dsv.scipro.system.*;

View File

@ -1,6 +1,6 @@
package se.su.dsv.scipro.survey;
import org.springframework.data.jpa.repository.JpaRepository;
import se.su.dsv.scipro.system.JpaRepository;
public interface QuestionRepository extends JpaRepository<Question, Long> {
}

View File

@ -1,6 +1,6 @@
package se.su.dsv.scipro.survey;
import org.springframework.data.jpa.repository.JpaRepository;
import se.su.dsv.scipro.system.JpaRepository;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.User;

View File

@ -6,8 +6,6 @@ import com.querydsl.core.types.dsl.EntityPathBase;
import com.querydsl.core.types.dsl.Expressions;
import com.querydsl.core.types.dsl.StringPath;
import com.querydsl.jpa.impl.JPAQuery;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;

View File

@ -1,7 +1,5 @@
package se.su.dsv.scipro.system;
import org.springframework.data.domain.Pageable;
import java.io.Serializable;
import java.util.List;

View File

@ -1,8 +1,6 @@
package se.su.dsv.scipro.system;
import com.google.inject.persist.Transactional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
@Transactional
public interface FooterAddressRepo extends JpaRepository<FooterAddress, Long>, QueryDslPredicateExecutor<FooterAddress> {

View File

@ -1,8 +1,6 @@
package se.su.dsv.scipro.system;
import com.google.inject.persist.Transactional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
import java.util.List;
import java.util.Optional;

View File

@ -6,10 +6,6 @@ import com.querydsl.core.types.dsl.EntityPathBase;
import com.querydsl.core.types.dsl.Expressions;
import com.querydsl.core.types.dsl.StringPath;
import com.querydsl.jpa.impl.JPAQuery;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;

View File

@ -1,7 +1,6 @@
package se.su.dsv.scipro.system;
import com.querydsl.core.types.Predicate;
import org.springframework.data.domain.Pageable;
import java.io.Serializable;
import java.util.List;

View File

@ -1,4 +1,4 @@
package org.springframework.data.jpa.repository;
package se.su.dsv.scipro.system;
import java.io.Serializable;
import java.util.List;

View File

@ -1,6 +1,5 @@
package se.su.dsv.scipro.system;
import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.security.auth.roles.Roles;
import jakarta.inject.Inject;

View File

@ -1,4 +1,4 @@
package org.springframework.data.domain;
package se.su.dsv.scipro.system;
import java.util.Objects;

View File

@ -1,4 +1,4 @@
package org.springframework.data.domain;
package se.su.dsv.scipro.system;
public interface Pageable {
long getOffset();

View File

@ -1,8 +1,6 @@
package se.su.dsv.scipro.system;
import com.google.inject.persist.Transactional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
@Transactional

View File

@ -1,7 +1,6 @@
package org.springframework.data.querydsl;
package se.su.dsv.scipro.system;
import com.querydsl.core.types.Predicate;
import org.springframework.data.domain.Pageable;
import java.util.List;

View File

@ -1,4 +1,4 @@
package org.springframework.data.domain;
package se.su.dsv.scipro.system;
import java.util.Objects;

View File

@ -1,9 +1,6 @@
package se.su.dsv.scipro.system;
import com.google.inject.persist.Transactional;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
import se.su.dsv.scipro.security.auth.roles.Roles;
import java.util.Collection;

View File

@ -1,7 +1,6 @@
package se.su.dsv.scipro.system;
import com.querydsl.jpa.JPAExpressions;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.security.auth.roles.Roles;
import jakarta.inject.Inject;

View File

@ -2,7 +2,6 @@ package se.su.dsv.scipro.system;
import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.Predicate;
import org.springframework.data.domain.Pageable;
import jakarta.inject.Inject;
import jakarta.inject.Provider;

View File

@ -1,6 +1,6 @@
package se.su.dsv.scipro.workerthreads;
import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.system.PageRequest;
import se.su.dsv.scipro.finalseminar.FinalSeminar;
import se.su.dsv.scipro.finalseminar.FinalSeminarService;
import se.su.dsv.scipro.generalsystemsettings.GeneralSystemSettings;

View File

@ -4,8 +4,8 @@ import com.google.common.eventbus.EventBus;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.PageRequest;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.checklist.ChecklistTemplateService;
import se.su.dsv.scipro.file.FileDescription;
import se.su.dsv.scipro.file.FileReference;

View File

@ -2,7 +2,7 @@ package se.su.dsv.scipro.checklist;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.system.PageRequest;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.reusable.SciProUtilities;
import se.su.dsv.scipro.system.DegreeType;

View File

@ -3,7 +3,7 @@ package se.su.dsv.scipro.finalseminar;
import com.google.common.collect.Lists;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.system.PageRequest;
import se.su.dsv.scipro.file.FileDescription;
import se.su.dsv.scipro.file.FileReference;
import se.su.dsv.scipro.project.Project;

View File

@ -5,7 +5,7 @@ import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.system.PageRequest;
import se.su.dsv.scipro.file.FileReference;
import se.su.dsv.scipro.file.FileService;
import se.su.dsv.scipro.file.ProjectFileUpload;

View File

@ -6,8 +6,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.PageRequest;
import se.su.dsv.scipro.system.Pageable;
import se.su.dsv.scipro.system.DegreeType;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;

View File

@ -8,7 +8,7 @@ import org.hamcrest.core.Every;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.system.PageRequest;
import se.su.dsv.scipro.system.*;
import se.su.dsv.scipro.test.IntegrationTest;

View File

@ -6,8 +6,8 @@ import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import se.su.dsv.scipro.system.PageRequest;
import se.su.dsv.scipro.system.Sort;
import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.system.DegreeType;
import se.su.dsv.scipro.system.ProjectType;

View File

@ -2,7 +2,7 @@ package se.su.dsv.scipro.milestones.service.impl;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.data.domain.Sort;
import se.su.dsv.scipro.system.Sort;
import se.su.dsv.scipro.milestones.dataobjects.MilestonePhaseTemplate;
import se.su.dsv.scipro.test.IntegrationTest;

View File

@ -2,7 +2,7 @@ package se.su.dsv.scipro.milestones.service.impl;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.system.PageRequest;
import se.su.dsv.scipro.milestones.dataobjects.Milestone;
import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate;
import se.su.dsv.scipro.milestones.dataobjects.MilestonePhaseTemplate;

View File

@ -2,7 +2,7 @@ package se.su.dsv.scipro.milestones.service.impl;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.system.PageRequest;
import se.su.dsv.scipro.milestones.dataobjects.Milestone;
import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate;
import se.su.dsv.scipro.milestones.dataobjects.MilestonePhaseTemplate;

View File

@ -4,7 +4,7 @@ import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
import org.junit.jupiter.api.Test;
import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.system.PageRequest;
import se.su.dsv.scipro.notifications.dataobject.Notification;
import se.su.dsv.scipro.notifications.dataobject.ProjectEvent;
import se.su.dsv.scipro.project.Project;

View File

@ -2,7 +2,7 @@ package se.su.dsv.scipro.peer;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.system.PageRequest;
import se.su.dsv.scipro.file.FileDescription;
import se.su.dsv.scipro.file.FileReference;
import se.su.dsv.scipro.project.Project;

View File

@ -2,7 +2,7 @@ package se.su.dsv.scipro.peer;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.system.PageRequest;
import se.su.dsv.scipro.file.FileDescription;
import se.su.dsv.scipro.file.FileReference;
import se.su.dsv.scipro.project.Project;

View File

@ -2,7 +2,7 @@ package se.su.dsv.scipro.peer;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.system.PageRequest;
import se.su.dsv.scipro.file.FileDescription;
import se.su.dsv.scipro.file.FileReference;
import se.su.dsv.scipro.project.Project;

View File

@ -3,7 +3,7 @@ package se.su.dsv.scipro.peer;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.system.PageRequest;
import se.su.dsv.scipro.file.FileDescription;
import se.su.dsv.scipro.file.FileReference;
import se.su.dsv.scipro.project.Project;

View File

@ -2,7 +2,7 @@ package se.su.dsv.scipro.project;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.system.PageRequest;
import se.su.dsv.scipro.system.DegreeType;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.Unit;

View File

@ -2,7 +2,7 @@ package se.su.dsv.scipro.projectpartner;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.system.PageRequest;
import se.su.dsv.scipro.match.ApplicationPeriod;
import se.su.dsv.scipro.system.DegreeType;
import se.su.dsv.scipro.system.ProjectType;

View File

@ -2,7 +2,7 @@ package se.su.dsv.scipro.springdata.serviceimpls;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.system.PageRequest;
import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.springdata.services.SupervisorService;
import se.su.dsv.scipro.system.ResearchArea;

View File

@ -2,7 +2,6 @@ package se.su.dsv.scipro.system;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.test.IntegrationTest;

Some files were not shown because too many files have changed in this diff Show More